Merge branch 'dev' of https://github.com/wenjianzhang/go-admin-ui into dev

Author: bing127

.npmrc

@@ -0,0 +1,4 @@
+sass_binary_site=https://npm.taobao.org/mirrors/node-sass/
+phantomjs_cdnurl=https://npm.taobao.org/mirrors/phantomjs/
+electron_mirror=https://npm.taobao.org/mirrors/electron/
+registry=https://registry.npm.taobao.org

package.json

@@ -44,6 +44,7 @@
   },
   "dependencies": {
     "@riophae/vue-treeselect": "0.4.0",
+    "awe-dnd": "^0.3.4",
     "axios": "0.19.2",
     "clipboard": "2.0.6",
     "codemirror": "5.56.0",
@@ -62,12 +63,14 @@
     "normalize.css": "8.0.1",
     "nprogress": "0.2.0",
     "path-to-regexp": "6.1.0",
+    "remixicon": "^2.5.0",
     "sass-resources-loader": "^2.0.3",
     "screenfull": "5.0.2",
     "showdown": "^1.9.1",
     "solarlunar": "^2.0.7",
-    "sortablejs": "1.10.2",
+    "sortablejs": "^1.10.2",
     "tui-editor": "1.4.10",
+    "uuid": "^8.3.0",
     "viser-vue": "^2.4.8",
     "vue": "2.6.11",
     "vue-count-to": "1.0.13",
@@ -112,7 +115,7 @@
     "script-ext-html-webpack-plugin": "2.1.4",
     "script-loader": "0.7.2",
     "serve-static": "^1.14.1",
-    "svg-sprite-loader": "5.0.0",
+    "svg-sprite-loader": "^5.0.0",
     "svgo": "1.3.2",
     "vue-template-compiler": "2.6.11"
   },

src/api/file.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+import { data } from 'autoprefixer'
+
+export const sysfiledirList = data => request({
+  url: '/api/v1/sysfiledirList',
+  method: 'GET',
+  data
+})
+
+export const sysfiledirAcionAdd = data => request({
+  url: '/api/v1/sysfiledir',
+  method: 'POST',
+  data
+})
+
+export const sysfiledirAcionEdit = data => request({
+  url: '/api/v1/sysfiledir',
+  method: 'PUT',
+  data
+})
+
+export const sysfiledirAcionDel = data => request({
+  url: '/api/v1/sysfiledir/' + data,
+  method: 'DELETE'
+})
+
+export const sysfileinfoList = data => request({
+  url: `/api/v1/sysfileinfoList?pId=${data.pId}&pageSize=${data.pageSize}&pageIndex=${data.pageIndex}`,
+  method: 'GET',
+  data
+})
+
+export const sysfileinfo = id => request({
+  url: '/api/v1/sysfileinfo/' + id,
+  method: 'GET'
+})
+
+export const sysfileinfoAdd = data => request({
+  url: '/api/v1/sysfileinfo',
+  method: 'POST',
+  data
+})
+
+export const sysfileinfoEdit = data => request({
+  url: '/api/v1/sysfileinfo',
+  method: 'put',
+  data
+})
+
+export const sysfileinfoDelete = id => request({
+  url: '/api/v1/sysfileinfo/' + id,
+  method: 'DELETE',
+  data
+})

src/api/syscategory.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+// 查询SysCategory列表
+export function listSysCategory(query) {
+  return request({
+    url: '/api/v1/syscategoryList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询SysCategory详细
+export function getSysCategory(id) {
+  return request({
+    url: '/api/v1/syscategory/' + id,
+    method: 'get'
+  })
+}
+
+// 新增SysCategory
+export function addSysCategory(data) {
+  return request({
+    url: '/api/v1/syscategory',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改SysCategory
+export function updateSysCategory(data) {
+  return request({
+    url: '/api/v1/syscategory',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除SysCategory
+export function delSysCategory(id) {
+  return request({
+    url: '/api/v1/syscategory/' + id,
+    method: 'delete'
+  })
+}
+

src/api/syscontent.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询SysContent列表
+export function listSysContent(query) {
+return request({
+url: '/api/v1/syscontentList',
+method: 'get',
+params: query
+})
+}
+
+// 查询SysContent详细
+export function getSysContent (id) {
+return request({
+url: '/api/v1/syscontent/' + id,
+method: 'get'
+})
+}
+
+
+// 新增SysContent
+export function addSysContent(data) {
+return request({
+url: '/api/v1/syscontent',
+method: 'post',
+data: data
+})
+}
+
+// 修改SysContent
+export function updateSysContent(data) {
+return request({
+url: '/api/v1/syscontent',
+method: 'put',
+data: data
+})
+}
+
+// 删除SysContent
+export function delSysContent(id) {
+return request({
+url: '/api/v1/syscontent/' + id,
+method: 'delete'
+})
+}
+

src/api/sysjob.js

@@ -36,10 +36,11 @@ export function updateSysJob(data) {
 }
 
 // 删除SysJob
-export function delSysJob(jobId) {
+export function delSysJob(jobId, data) {
   return request({
     url: '/api/v1/sysjob/' + jobId,
-    method: 'delete'
+    method: 'delete',
+    data: data
   })
 }
 

src/api/table.js

@@ -0,0 +1,20 @@
+// 查询列表
+export function getItems(f, query) {
+  query = query || { pageSize: 10000 }
+  return f(query)
+}
+
+export function setItems(response, k, v) {
+  const data = []
+  k = k || 'id'
+  v = v || 'name'
+  if (response.data && response.data.list && response.data.list.length > 0) {
+    response.data.list.forEach(e => {
+      data.push({
+        key: e[k].toString(),
+        value: e[v].toString()
+      })
+    })
+    return data
+  }
+}

src/api/tools/gen.js

@@ -25,6 +25,13 @@ export function getGenTable(tableId) {
   })
 }
 
+export function getGenTableInfo(tablename) {
+  return request({
+    url: '/api/v1/sys/tables?tableName=' + tablename,
+    method: 'get'
+  })
+}
+
 // 修改代码生成信息
 export function updateGenTable(data) {
   return request({
@@ -79,3 +86,10 @@ export function toDBTable(tableId) {
     method: 'get'
   })
 }
+
+export function getTableTree() {
+  return request({
+    url: '/api/v1/gen/tabletree',
+    method: 'get'
+  })
+}

src/api/ws.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 查询SysJob列表
+export function unWsLogout(id, group) {
+  return request({
+    url: '/wslogout/' + id + '/' + group,
+    method: 'get'
+  })
+}

src/assets/icons/12-01.png

@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import pathToRegexp from 'path-to-regexp'
+import { compile } from 'path-to-regexp'
 
 export default {
   data() {
@@ -52,7 +52,7 @@ export default {
     pathCompile(path) {
       // To solve this problem https://github.com/PanJiaChen/vue-element-admin/issues/561
       const { params } = this.$route
-      var toPath = pathToRegexp.compile(path)
+      var toPath = compile(path)
       return toPath(params)
     },
     handleLink(item) {