Merge branch 'dev'

Author: wenjianzhang

package.json

@@ -1,6 +1,6 @@
 {
   "name": "go-admin",
-  "version": "1.3.3",
+  "version": "2.0.0",
   "description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features",
   "author": "https://github.com/wenjianzhang",
   "license": "MIT",
@@ -72,7 +72,6 @@
     "showdown": "^1.9.1",
     "solarlunar": "^2.0.7",
     "sortablejs": "^1.10.2",
-    "tui-editor": "1.4.10",
     "uuid": "^8.3.0",
     "viser-vue": "^2.4.8",
     "vue": "2.6.11",
@@ -108,6 +107,7 @@
     "connect": "3.7.0",
     "eslint": "7.6.0",
     "eslint-plugin-vue": "6.2.2",
+    "form-gen-parser": "^1.0.3",
     "html-webpack-plugin": "4.3.0",
     "husky": "4.2.5",
     "lint-staged": "10.2.11",

src/App.vue

@@ -19,11 +19,3 @@ var _hmt = _hmt || [];
 })();
 </script>
 
-<style lang="scss">
-  // .el-dialog__wrapper{
-  //   display: flex;
-  //   justify-content: center;
-  //   align-items: center;
-  // }
-</style>
-

src/api/system/dict/data.js renamed to src/api/admin/dict/data.js

@@ -20,7 +20,7 @@ export function getData(dictCode) {
 // 根据字典类型查询字典数据信息
 export function getDicts(dictType) {
   return request({
-    url: '/api/v1/dict/data-all?dictType=' + dictType,
+    url: '/api/v1/dict-data/option-select?dictType=' + dictType,
     method: 'get'
   })
 }

src/api/system/dict/type.js renamed to src/api/admin/dict/type.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询SysApi列表
+export function listSysApi(query) {
+  return request({
+    url: '/api/v1/sys-api',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询SysApi详细
+export function getSysApi(id) {
+  return request({
+    url: '/api/v1/sys-api/' + id,
+    method: 'get'
+  })
+}
+
+// 新增SysApi
+export function addSysApi(data) {
+  return request({
+    url: '/api/v1/sys-api',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改SysApi
+export function updateSysApi(data) {
+  return request({
+    url: '/api/v1/sys-api/' + data.id,
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除SysApi
+export function delSysApi(data) {
+  return request({
+    url: '/api/v1/sys-api',
+    method: 'delete',
+    data: data
+  })
+}
+

src/api/admin/sys-api.js

@@ -52,3 +52,17 @@ export function delConfig(data) {
   })
 }
 
+export function getSetConfig(query) {
+  return request({
+    url: '/api/v1/set-config',
+    method: 'get'
+  })
+}
+
+export function updateSetConfig(data) {
+  return request({
+    url: '/api/v1/set-config',
+    method: 'put',
+    data: data
+  })
+}

src/api/system/config.js renamed to src/api/admin/sys-config.js

@@ -18,12 +18,12 @@ export function getMenu(menuId) {
 }
 
 // 查询菜单下拉树结构
-export function treeselect() {
-  return request({
-    url: '/api/v1/menuTreeselect',
-    method: 'get'
-  })
-}
+// export function treeselect() {
+//   return request({
+//     url: '/api/v1/menuTreeselect',
+//     method: 'get'
+//   })
+// }
 
 // 根据角色ID查询菜单下拉树结构
 export function roleMenuTreeselect(roleId) {
@@ -52,9 +52,10 @@ export function updateMenu(data, id) {
 }
 
 // 删除菜单
-export function delMenu(menuId) {
+export function delMenu(data) {
   return request({
-    url: '/api/v1/menu/' + menuId,
-    method: 'delete'
+    url: '/api/v1/menu',
+    method: 'delete',
+    data: data
   })
 }