From 4d769af631f1fdcf4bb9c00bbe130b4c6064d96b Mon Sep 17 00:00:00 2001
From: mjh <741600436@qq.com>
Date: Thu, 12 May 2022 20:46:32 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=85=A8=E5=B1=80=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/crud/core/init.ts                       | 2 +-
 src/views/tool/datasource/modal.vue         | 2 +-
 src/views/tool/tpl/modal/settings/index.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/crud/core/init.ts b/src/crud/core/init.ts
index 62f8448..8776774 100644
--- a/src/crud/core/init.ts
+++ b/src/crud/core/init.ts
@@ -52,7 +52,7 @@ const CRUD = (options) => {
       detailAPI: null,
     },
     /* 成功的状态码 */
-    successResCode: [0],
+    successResCode: [200],
     /* 自定义属性 */
     props: {},
   };
diff --git a/src/views/tool/datasource/modal.vue b/src/views/tool/datasource/modal.vue
index cbabdab..51d3836 100644
--- a/src/views/tool/datasource/modal.vue
+++ b/src/views/tool/datasource/modal.vue
@@ -55,7 +55,7 @@
             else {
               _API.testAPI(values).then((res: any) => {
                 const { code } = res.data;
-                if (code !== 0) {
+                if (code !== 200) {
                   message.error(res.data.message || '连接失败！');
                 } else {
                   message.success('连接成功！');
diff --git a/src/views/tool/tpl/modal/settings/index.vue b/src/views/tool/tpl/modal/settings/index.vue
index dab9465..12af933 100644
--- a/src/views/tool/tpl/modal/settings/index.vue
+++ b/src/views/tool/tpl/modal/settings/index.vue
@@ -54,7 +54,7 @@
           setModalProps({ confirmLoading: true });
           _API.saveSettingsAPI({ ...crud.useForm.formMethods.getFieldsValue() }).then((res: any) => {
             const { code } = res.data;
-            if (code == 0) {
+            if (code == 200) {
               emit('success');
               setTimeout(() => {
                 closeModal();
-- 
Gitee


From 0c449de8d541c6e70941fff4ea759b1dcb126ce4 Mon Sep 17 00:00:00 2001
From: mjh <741600436@qq.com>
Date: Thu, 12 May 2022 21:06:04 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=85=A8=E5=B1=80=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=A0=81+1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/_util.ts                      | 2 +-
 src/enums/httpEnum.ts              | 2 +-
 src/utils/http/axios/checkCodes.ts | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mock/_util.ts b/mock/_util.ts
index 97c8756..324bdfb 100644
--- a/mock/_util.ts
+++ b/mock/_util.ts
@@ -2,7 +2,7 @@
 
 export function resultSuccess<T = Recordable>(result: T, { message = 'ok' } = {}) {
   return {
-    code: 0,
+    code: 200,
     result,
     message,
     type: 'success',
diff --git a/src/enums/httpEnum.ts b/src/enums/httpEnum.ts
index 61a944a..b48c5e5 100644
--- a/src/enums/httpEnum.ts
+++ b/src/enums/httpEnum.ts
@@ -2,7 +2,7 @@
  * @description: Request result set
  */
 export enum ResultEnum {
-  SUCCESS = 0,
+  SUCCESS = 200,
   ERROR = 1,
   TIMEOUT = 401,
   TYPE = 'success',
diff --git a/src/utils/http/axios/checkCodes.ts b/src/utils/http/axios/checkCodes.ts
index 41578e7..d2e1a82 100644
--- a/src/utils/http/axios/checkCodes.ts
+++ b/src/utils/http/axios/checkCodes.ts
@@ -25,11 +25,11 @@ export function checkCodes(code: number, msg: string, messageMode: ErrorMessageM
   let successMessage = ''; // 成功消息
 
   switch (code) {
-    case 0:
+    case 200:
       successMessage = `${msg || '操作成功'}`;
       break;
     case 500:
-      errMessage = `${msg || '操作成功'}`;
+      errMessage = `${msg || '操作失败'}`;
       break;
   }
 
-- 
Gitee


From 602cdbee5d096083ae5584450dc1095a44da30f2 Mon Sep 17 00:00:00 2001
From: mjh <741600436@qq.com>
Date: Fri, 27 May 2022 09:58:15 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                          |  6 ------
 src/views/tool/gen/modal/preview/index.vue | 21 ++++++++++++++++++++-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0525630..9df9e85 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13716,12 +13716,6 @@
         }
       }
     },
-    "vite-plugin-monaco-editor-nls": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/vite-plugin-monaco-editor-nls/-/vite-plugin-monaco-editor-nls-1.0.8.tgz",
-      "integrity": "sha512-5mwbwrTYUPvhlWuZLUkFOEV7C9Q47gbtAghl3rKAkhs+Ed4n9Bo8rOK8vAID8ZBKO8eUhqiCypXKCNuoTHXyGQ==",
-      "dev": true
-    },
     "vite-plugin-purge-icons": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/vite-plugin-purge-icons/-/vite-plugin-purge-icons-0.8.1.tgz",
diff --git a/src/views/tool/gen/modal/preview/index.vue b/src/views/tool/gen/modal/preview/index.vue
index 35bc1d8..9f7074b 100644
--- a/src/views/tool/gen/modal/preview/index.vue
+++ b/src/views/tool/gen/modal/preview/index.vue
@@ -100,12 +100,31 @@
           range.selectNodeContents(element);
           selection.removeAllRanges();
           selection.addRange(range);
-          navigator.clipboard.writeText(selection.focusNode?.textContent || '');
+          Clipboard(selection.focusNode?.textContent || '');
           createMessage.success('复制成功');
         } else {
           createMessage.error('操作失败');
         }
       };
+      const Clipboard = (textToCopy) => {
+        if (navigator.clipboard && window.isSecureContext) {
+          return navigator.clipboard.writeText(textToCopy);
+        } else {
+          let textArea = document.createElement('textarea');
+          textArea.value = textToCopy;
+          textArea.style.position = 'absolute';
+          textArea.style.opacity = '0';
+          textArea.style.left = '-999999px';
+          textArea.style.top = '-999999px';
+          document.body.appendChild(textArea);
+          textArea.focus();
+          textArea.select();
+          return new Promise((resolve, reject) => {
+            document.execCommand('copy') ? resolve(true) : reject();
+            textArea.remove();
+          });
+        }
+      };
       const handleChange = (event) => {
         previewCode.data.clear();
         activeKey.value = '';
-- 
Gitee


From 1a161eac27cbb4cc7943dc456eafdf0d11b176c2 Mon Sep 17 00:00:00 2001
From: mjh <741600436@qq.com>
Date: Wed, 15 Jun 2022 17:17:50 +0800
Subject: [PATCH 4/5] =?UTF-8?q?test=E6=BC=94=E7=A4=BA=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=AF=B9=E6=95=B0=E6=8D=AE=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/datasource/index.vue | 11 +++++++----
 src/views/tool/gen/index.vue        | 12 ++++++++----
 src/views/tool/tpl/config.ts        |  3 ++-
 src/views/tool/tpl/index.vue        |  7 +++++--
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/views/tool/datasource/index.vue b/src/views/tool/datasource/index.vue
index b24685f..5ab500d 100644
--- a/src/views/tool/datasource/index.vue
+++ b/src/views/tool/datasource/index.vue
@@ -5,9 +5,9 @@
         <TableSelect :selectRows="getSelectRows()" @clear="clearSelectedRowKeys()" />
       </template>
       <template #toolbar>
-        <a-button type="primary" @click="handleAdd"><Icon icon="ant-design:appstore-add-outlined"></Icon> 创建</a-button>
-        <a-button type="primary" @click="handleEdit(getSelectRows()[0])" :disabled="getSelectRows().length !== 1"><Icon icon="ant-design:edit-outlined"></Icon> 编辑</a-button>
-        <a-button type="primary" @click="handleDelete(null, true)" :disabled="getSelectRows().length < 1"><Icon icon="ant-design:delete-outlined"></Icon> 删除</a-button>
+        <a-button type="primary" :disabled="!isSuper" @click="handleAdd"><Icon icon="ant-design:appstore-add-outlined"></Icon> 创建</a-button>
+        <a-button type="primary" @click="handleEdit(getSelectRows()[0])" :disabled="getSelectRows().length !== 1 && !isSuper"><Icon icon="ant-design:edit-outlined"></Icon> 编辑</a-button>
+        <a-button type="primary" @click="handleDelete(null, true)" :disabled="getSelectRows().length < 1 && !isSuper"><Icon icon="ant-design:delete-outlined"></Icon> 删除</a-button>
       </template>
       <template #action="{ record }">
         <TableAction
@@ -34,10 +34,11 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent } from 'vue';
+  import { defineComponent, ref, computed } from 'vue';
   import { BasicTable, TableAction, useTable } from '/@/components/Table';
   import { getBasicColumns, getFormConfig } from './config';
   import { useModal } from '/@/components/Modal';
+  import { useUserStore } from '/@/store/modules/user';
   import DataSourceModal from './modal.vue';
   import { Icon } from '/@/components/Icon';
   import * as _API from './api';
@@ -47,6 +48,7 @@
     name: 'DataSource',
     components: { Icon, BasicTable, DataSourceModal, TableAction, TableSelect },
     setup() {
+      const getRoleList = computed(() => useUserStore().getRoleList);
       const crud = CRUD({ title: '数据源', crudMethod: { ..._API } }); // 初始化crud
       const [registerModal, { openModal }] = useModal();
       const [registerTable, { reload, getSelectRowKeys, getSelectRows, clearSelectedRowKeys }] = useTable({
@@ -109,6 +111,7 @@
       return {
         registerTable,
         registerModal,
+        isSuper: getRoleList.value[0] == 'super',
         getSelectRows,
         handleAdd,
         handleEdit,
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index c62b85e..5f41021 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -9,15 +9,15 @@
           <Icon icon="ant-design:download-outlined"></Icon>
           生成
         </a-button>
-        <a-button type="primary" @click="openCreateModal(true)">
+        <a-button type="primary" @click="openCreateModal(true)" :disabled="!isSuper">
           <Icon icon="ant-design:appstore-add-outlined"></Icon>
           创建
         </a-button>
-        <a-button type="primary" @click="openImportModal(true)">
+        <a-button type="primary" @click="openImportModal(true)" :disabled="!isSuper">
           <Icon icon="ant-design:import-outlined"></Icon>
           导入
         </a-button>
-        <a-button type="primary" @click="handleDelete(null, true)" :disabled="getSelectRows().length < 1">
+        <a-button type="primary" @click="handleDelete(null, true)" :disabled="getSelectRows().length < 1 && !isSuper">
           <Icon icon="ant-design:delete-outlined"></Icon>
           删除
         </a-button>
@@ -60,11 +60,12 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent } from 'vue';
+  import { defineComponent, computed } from 'vue';
   import { useGo } from '/@/hooks/web/usePage';
   import { BasicTable, TableAction, useTable } from '/@/components/Table';
   import { getBasicColumns, getFormConfig } from './config';
   import { useModal } from '/@/components/Modal';
+  import { useUserStore } from '/@/store/modules/user';
   import { Loading, useLoading } from '/@/components/Loading';
   import { Icon } from '/@/components/Icon';
   import { PageEnum } from '/@/enums/pageEnum';
@@ -92,6 +93,8 @@
     },
     setup() {
       const go = useGo();
+      const userStore = useUserStore();
+      const getRoleList = computed(() => userStore.getRoleList);
       const crud = CRUD({ title: '代码生成器', crudMethod: { ..._API } });
       const [openFullLoading, closeFullLoading] = useLoading({ tip: '加载中...' });
       const [registerCreateModal, { openModal: openCreateModal }] = useModal(); // 创表 modal
@@ -192,6 +195,7 @@
         handleDelete,
         handleGenCode,
         reload,
+        isSuper: getRoleList.value[0] == 'super',
         getSelectRows, // 获取选中
         clearSelectedRowKeys, // 清空选中
         openFnFullLoading,
diff --git a/src/views/tool/tpl/config.ts b/src/views/tool/tpl/config.ts
index 561f2bc..11abb68 100644
--- a/src/views/tool/tpl/config.ts
+++ b/src/views/tool/tpl/config.ts
@@ -16,7 +16,7 @@ export const columns = [
 ];
 
 // 右键
-export const contextMenu = (xTable) => {
+export const contextMenu = (xTable, isSuper: Boolean) => {
   return {
     className: 'contextMenu',
     body: {
@@ -36,6 +36,7 @@ export const contextMenu = (xTable) => {
     },
     visibleMethod({ row, type, options }) {
       const $table = xTable.value;
+      if (!isSuper) return;
       if (type === 'body') {
         options.forEach((list) => {
           list.forEach((item) => {
diff --git a/src/views/tool/tpl/index.vue b/src/views/tool/tpl/index.vue
index bc28148..1710c84 100644
--- a/src/views/tool/tpl/index.vue
+++ b/src/views/tool/tpl/index.vue
@@ -9,7 +9,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, onMounted, ref } from 'vue';
+  import { defineComponent, onMounted, ref, computed } from 'vue';
   import { useModal } from '/@/components/Modal';
 
   import CRUD from '/@/crud/core/init';
@@ -19,10 +19,13 @@
   import formModal from './modal/edit/index.vue';
   import editorModal from './modal/editor/index.vue';
   import settingsModal from './modal/settings/index.vue';
+  import { useUserStore } from '/@/store/modules/user';
   export default defineComponent({
     name: 'MenuManagement',
     components: { formModal, editorModal, settingsModal },
     setup() {
+      const userStore = useUserStore();
+      const getRoleList = computed(() => userStore.getRoleList);
       const crud = CRUD({ title: '生成模板', crudMethod: { ..._API } }); // 初始化crud
       const xTable = ref({} as VxeGridInstance);
       crud.grids.grid = {
@@ -30,7 +33,7 @@
         data: [],
         height: '100%',
         treeConfig: { rowField: 'name' },
-        menuConfig: contextMenu(xTable),
+        menuConfig: contextMenu(xTable, getRoleList.value[0] == 'super'),
       } as VxeGridProps;
       onMounted(() => crud.toQuery());
       const [formRegisterModal, formModalMethods] = useModal();
-- 
Gitee


From f3c84fc7fddbc2fa136828d2d51aaeedc678a59f Mon Sep 17 00:00:00 2001
From: mjh <741600436@qq.com>
Date: Tue, 27 Sep 2022 14:19:14 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/datasource/api/index.ts |  2 +-
 src/views/tool/datasource/modal.vue    | 44 ++++++++++++--------------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/views/tool/datasource/api/index.ts b/src/views/tool/datasource/api/index.ts
index 4d8a318..542c44e 100644
--- a/src/views/tool/datasource/api/index.ts
+++ b/src/views/tool/datasource/api/index.ts
@@ -91,7 +91,7 @@ export function delAPI(params: delParamsInter) {
 export function testAPI(params: itemInter) {
   return defHttp.post<string>(
     {
-      url: '/tool/db/test',
+      url: '/tool/db/edit/test',
       params,
     },
     {
diff --git a/src/views/tool/datasource/modal.vue b/src/views/tool/datasource/modal.vue
index 51d3836..a60ca83 100644
--- a/src/views/tool/datasource/modal.vue
+++ b/src/views/tool/datasource/modal.vue
@@ -45,37 +45,35 @@
       });
 
       const getTitle = computed(() => (!unref(isUpdate) ? '新增数据源' : '编辑数据源'));
-      async function handleSubmit(isTest = false) {
-        if (isTest) btnLoading.value = true;
+      async function handleSubmit(isTest: boolean = false) {
+        // 测试链接
+        const connectMysql = (values): void => {
+          btnLoading.value = true;
+          _API.testAPI(values).then((res: any) => {
+            const { code } = res.data;
+            if (code !== 200) {
+              message.error(res.data.message || '连接失败！');
+            } else {
+              message.success('连接成功！');
+            }
+            setTimeout(() => (btnLoading.value = false), 1000);
+          });
+        };
+        if (isTest == true) return connectMysql(getFieldsValue());
         try {
           const values = await validate();
           setModalProps({ confirmLoading: true });
           if (!isUpdate.value) {
-            if (!isTest) await _API.addAPI(values);
-            else {
-              _API.testAPI(values).then((res: any) => {
-                const { code } = res.data;
-                if (code !== 200) {
-                  message.error(res.data.message || '连接失败！');
-                } else {
-                  message.success('连接成功！');
-                }
-                setTimeout(() => {
-                  btnLoading.value = false;
-                }, 1000);
-              });
-            }
+            // 新增
+            await _API.addAPI(values);
           } else {
+            // 编辑
             await _API.editAPI(getFieldsValue());
           }
-          if (!isTest) {
-            closeModal();
-            emit('success');
-          }
+          closeModal();
+          emit('success');
         } finally {
-          setTimeout(() => {
-            btnLoading.value = false;
-          }, 5000);
+          setTimeout(() => (btnLoading.value = false), 5000);
           setModalProps({ confirmLoading: false });
         }
       }
-- 
Gitee