From 345be40c7a823c096ef13129d0b78feb5c6704c0 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sun, 8 Jan 2023 22:42:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?style=20=E6=B7=BB=E5=8A=A0loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/global.less                    |  2 +-
 .../demo/data/perm/DataPermDemoEdit.vue       | 47 ++++++++++---------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/assets/css/global.less b/src/assets/css/global.less
index f3cf585..3943ade 100644
--- a/src/assets/css/global.less
+++ b/src/assets/css/global.less
@@ -19,8 +19,8 @@ canvas {
   display: block;
 }
 
+// 滚动条样式优化
 html{
-  // 滚动条样式优化
   ::-webkit-scrollbar
   {
     width: 5px;
diff --git a/src/views/modules/demo/data/perm/DataPermDemoEdit.vue b/src/views/modules/demo/data/perm/DataPermDemoEdit.vue
index 852fb21..c85f465 100644
--- a/src/views/modules/demo/data/perm/DataPermDemoEdit.vue
+++ b/src/views/modules/demo/data/perm/DataPermDemoEdit.vue
@@ -7,30 +7,31 @@
     :maskClosable="false"
     @cancel="handleCancel"
   >
-    <a-form-model
-      ref="form"
-      :model="form"
-      :rules="rules"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol"
-    >
-      <a-form-model-item label="主键" prop="id" hidden="true" >
-        <a-input v-model="form.id" :disabled="showable"/>
-      </a-form-model-item>
-      <a-form-model-item
-        label="名称"
-        prop="name"
+    <a-spin :spinning="confirmLoading">
+      <a-form-model
+        ref="form"
+        :model="form"
+        :rules="rules"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol"
       >
-        <a-input v-model="form.name" :disabled="showable"/>
-      </a-form-model-item>
-      <a-form-model-item
-        label="备注"
-        prop="remark"
-      >
-        <a-input v-model="form.remark" :disabled="showable"/>
-      </a-form-model-item>
-    </a-form-model>
-
+        <a-form-model-item label="主键" prop="id" hidden="true" >
+          <a-input v-model="form.id" :disabled="showable"/>
+        </a-form-model-item>
+        <a-form-model-item
+          label="名称"
+          prop="name"
+        >
+          <a-input v-model="form.name" :disabled="showable"/>
+        </a-form-model-item>
+        <a-form-model-item
+          label="备注"
+          prop="remark"
+        >
+          <a-input v-model="form.remark" :disabled="showable"/>
+        </a-form-model-item>
+      </a-form-model>
+    </a-spin>
     <template #footer>
       <a-button key="cancel" @click="handleCancel">取消</a-button>
       <a-button v-if="!showable" key="forward" :loading="confirmLoading" type="primary" @click="handleOk">保存</a-button>
-- 
Gitee


From 6b2a58498b1b8cff287698f13cb5c0ccc3fd7e20 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 23 Jan 2023 22:06:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?dev=20=E2=86=92=20origin/dev?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/permMenu.js                    |   6 +
 .../demo/data/perm/DataPermDemoList.vue       |   2 +-
 src/views/modules/system/menu/MenuList.vue    | 117 +++++++++++-------
 .../modules/system/menu/ResourcePermEdit.vue  |   6 +-
 .../modules/system/menu/ResourcePermList.vue  |   4 +-
 5 files changed, 85 insertions(+), 50 deletions(-)

diff --git a/src/api/system/permMenu.js b/src/api/system/permMenu.js
index c41065e..85e69f8 100644
--- a/src/api/system/permMenu.js
+++ b/src/api/system/permMenu.js
@@ -1,5 +1,8 @@
 import { axios } from '@/utils/request'
 
+/**
+ * 菜单树
+ */
 export function menuTree (clientCode) {
   return axios({
     url: '/perm/menu/menuTree',
@@ -8,6 +11,9 @@ export function menuTree (clientCode) {
   })
 }
 
+/**
+ * 菜单和权限码树
+ */
 export function allTree (clientCode) {
   return axios({
     url: '/perm/menu/allTree',
diff --git a/src/views/modules/demo/data/perm/DataPermDemoList.vue b/src/views/modules/demo/data/perm/DataPermDemoList.vue
index 7cb6c53..f7531e8 100644
--- a/src/views/modules/demo/data/perm/DataPermDemoList.vue
+++ b/src/views/modules/demo/data/perm/DataPermDemoList.vue
@@ -28,7 +28,7 @@
     >
       <vxe-column type="seq" title="序号" width="60" />
       <vxe-column field="name" title="名称" />
-      <vxe-column field="creatorName" title="创建人" />
+      <vxe-column field="creatorName" title="创建人" v-if="$auth('123')"123/>
       <vxe-column field="remark" title="备注" />
       <vxe-column field="createTime" title="创建时间" />
       <vxe-column fixed="right" width="150" :showOverflow="false" title="操作">
diff --git a/src/views/modules/system/menu/MenuList.vue b/src/views/modules/system/menu/MenuList.vue
index 9cf820e..ec049f7 100644
--- a/src/views/modules/system/menu/MenuList.vue
+++ b/src/views/modules/system/menu/MenuList.vue
@@ -3,7 +3,7 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline">
         <a-row :gutter="10">
-          <a-col :md="8" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-item label="终端">
               <a-select
                 v-model="clientCode"
@@ -15,11 +15,22 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :md="8" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-item label="查询">
               <a-input-search v-model="searchName" @search="search" @keyup.enter="search" allow-clear placeholder="请输入菜单名称、路由名称、请求路径或组件名称"/>
             </a-form-item>
           </a-col>
+          <a-col :md="4" :sm="24">
+            <a-form-item label="同时显示权限码">
+              <a-radio-group v-model="showPermCode">
+                <a-radio :value="true">是</a-radio>
+                <a-radio :value="false">否</a-radio>
+              </a-radio-group>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="init">查询</a-button>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -67,51 +78,55 @@
           </div>
         </template>
       </vxe-column>
-      <vxe-column title="操作" fixed="right" width="240" :showOverflow="false" >
+      <vxe-column title="操作" fixed="right" width="220" :showOverflow="false" >
         <template v-slot="{row}">
-          <a href="javascript:" @click="show(row.id)">查看</a>
-          <a-divider type="vertical" />
-          <a href="javascript:" :disabled="row.admin" @click="edit(row.id)">编辑</a>
-          <a-divider type="vertical" />
-          <a href="javascript:" @click="resourceList(row)">权限资源</a>
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              更多 <a-icon type="down" />
-            </a>
-            <template #overlay>
-              <a-menu>
-                <a-menu-item>
-                  <a @click="addChildren(row)">添加下级</a>
-                </a-menu-item>
-                <a-menu-item>
-                  <a @click="copy(row.id)">复制</a>
-                </a-menu-item>
-                <a-menu-item>
-                  <a-popconfirm
-                    title="是否删除菜单或权限"
-                    @confirm="remove(row)"
-                    okText="是"
-                    cancelText="否">
-                    <a href="javascript:" v-if="!row.admin" style="color: red">删除</a>
-                    <a href="javascript:" v-else disabled>删除</a>
-                  </a-popconfirm>
-                </a-menu-item>
-              </a-menu>
-            </template>
-          </a-dropdown>
+          <a href="javascript:" @click="show(row)">查看</a>
+          <template v-if="String(row.menuType) !== '2'">
+            <a-divider type="vertical" />
+            <a href="javascript:" :disabled="row.admin" @click="edit(row)">编辑</a>
+            <a-divider type="vertical" />
+            <a href="javascript:" @click="resourceList(row)">权限码</a>
+            <a-divider type="vertical" />
+            <a-dropdown>
+              <a class="ant-dropdown-link">
+                更多 <a-icon type="down" />
+              </a>
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item>
+                    <a @click="addChildren(row)">添加菜单</a>
+                  </a-menu-item>
+                  <a-menu-item>
+                    <a @click="copy(row.id)">复制</a>
+                  </a-menu-item>
+                  <a-menu-item>
+                    <a-popconfirm
+                      title="是否删除菜单"
+                      @confirm="remove(row)"
+                      okText="是"
+                      cancelText="否">
+                      <a href="javascript:" v-if="!row.admin" style="color: red">删除</a>
+                      <a href="javascript:" v-else disabled>删除</a>
+                    </a-popconfirm>
+                  </a-menu-item>
+                </a-menu>
+              </template>
+            </a-dropdown>
+          </template>
         </template>
       </vxe-column>
     </vxe-table>
     <menu-edit ref="menuEdit" @ok="handleOk"/>
     <resource-perm-list ref="resourcePermList"/>
+    <resource-perm-edit ref="resourcePermEdit"/>
   </a-card>
 </template>
 
 <script>
-import { menuTree, del } from '@/api/system/permMenu'
+import { menuTree, del, allTree } from '@/api/system/permMenu'
 import MenuEdit from './MenuEdit'
 import ResourcePermList from './ResourcePermList'
+import ResourcePermEdit from './ResourcePermEdit'
 import { TableMixin } from '@/mixins/TableMixin'
 import XEUtils from 'xe-utils'
 import { findAll } from '@/api/system/client'
@@ -120,7 +135,8 @@ export default {
   name: 'MenuList',
   components: {
     MenuEdit,
-    ResourcePermList
+    ResourcePermList,
+    ResourcePermEdit
   },
   mixins: [TableMixin],
   data () {
@@ -130,19 +146,24 @@ export default {
       // 终端列表
       clients: [],
       searchName: '',
+      showPermCode: false,
       // 默认树关闭
       treeExpand: false,
       remoteTableData: []
     }
   },
   methods: {
-    init () {
+    async init () {
       this.loading = true
-      menuTree(this.clientCode).then(res => {
-        this.remoteTableData = res.data
-        this.search()
-        this.loading = false
-      })
+      if (this.showPermCode) {
+        const { data } = await allTree(this.clientCode)
+        this.remoteTableData = data
+      } else {
+        const { data } = await menuTree(this.clientCode)
+        this.remoteTableData = data
+      }
+      this.search()
+      this.loading = false
     },
     add () {
       this.$refs.menuEdit.init('', 'add', null, this.clientCode)
@@ -153,11 +174,15 @@ export default {
     copy (id) {
       this.$refs.menuEdit.init(id, 'copy', null, this.clientCode)
     },
-    edit (id) {
-      this.$refs.menuEdit.init(id, 'edit', null, this.clientCode)
+    edit (row) {
+      this.$refs.menuEdit.init(row.id, 'edit', null, this.clientCode)
     },
-    show (id) {
-      this.$refs.menuEdit.init(id, 'show', null, this.clientCode)
+    show (row) {
+      if (String(row.menuType) === '2') {
+        this.$refs.resourcePermEdit.init(row, 'show')
+      } else {
+        this.$refs.menuEdit.init(row.id, 'show', null, this.clientCode)
+      }
     },
     remove (record) {
       del(record.id).then(_ => {
diff --git a/src/views/modules/system/menu/ResourcePermEdit.vue b/src/views/modules/system/menu/ResourcePermEdit.vue
index 0e0d496..f60911e 100644
--- a/src/views/modules/system/menu/ResourcePermEdit.vue
+++ b/src/views/modules/system/menu/ResourcePermEdit.vue
@@ -75,8 +75,11 @@ export default {
     return {
       form: {
         id: null,
+        parentId: null,
         title: '',
+        clientCode: '',
         permCode: '',
+        sortNo: 0,
         effect: true,
         menuType: 2,
         remark: ''
@@ -93,7 +96,7 @@ export default {
     }
   },
   methods: {
-    edit (record, type) {
+    edit (record, type, clientCode) {
       if (['edit', 'show'].includes(type)) {
         this.confirmLoading = true
         findById(record.id).then(res => {
@@ -104,6 +107,7 @@ export default {
         this.confirmLoading = false
         this.$nextTick(() => {
           this.form.parentId = record.id
+          this.form.clientCode = clientCode
         })
       }
     },
diff --git a/src/views/modules/system/menu/ResourcePermList.vue b/src/views/modules/system/menu/ResourcePermList.vue
index 89ba5b2..e231d8d 100644
--- a/src/views/modules/system/menu/ResourcePermList.vue
+++ b/src/views/modules/system/menu/ResourcePermList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-drawer
-    title="权限资源列表"
+    title="权限码列表"
     :visible="visible"
     :maskClosable="true"
     :width="1000"
@@ -83,7 +83,7 @@ export default {
       })
     },
     add () {
-      this.$refs.resourcePermEdit.init(this.menu, 'add')
+      this.$refs.resourcePermEdit.init(this.menu, 'add', this.menu.clientCode)
     },
     edit (record) {
       this.$refs.resourcePermEdit.init(record, 'edit')
-- 
Gitee


From 669d7b148c3c53526a8227628d4f56e3d6887a53 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Tue, 24 Jan 2023 20:57:22 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat=20=E8=B6=85=E7=BA=A7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=99=A8list=E5=88=97=E8=A1=A8=E5=8F=82=E6=95=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Bootx/SuperQuery/QueryItem.vue             | 2 +-
 src/components/Bootx/SuperQuery/README.md                 | 1 -
 src/views/modules/demo/query/SuperQueryDemoList.vue       | 2 +-
 src/views/modules/notice/site/receive/SiteMessageList.vue | 2 +-
 src/views/modules/notice/site/sender/SiteMessageList.vue  | 4 ++--
 src/views/modules/payment/notify/PayNotifyRecordList.vue  | 4 ++--
 src/views/modules/payment/order/payment/PaymentList.vue   | 4 ++--
 src/views/modules/starter/quartz/QuartzJobLogList.vue     | 2 +-
 8 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 src/components/Bootx/SuperQuery/README.md

diff --git a/src/components/Bootx/SuperQuery/QueryItem.vue b/src/components/Bootx/SuperQuery/QueryItem.vue
index 51253ad..d6a86a8 100644
--- a/src/components/Bootx/SuperQuery/QueryItem.vue
+++ b/src/components/Bootx/SuperQuery/QueryItem.vue
@@ -28,7 +28,7 @@
         v-else-if="field.type === LIST"
         :placeholder="field.placeholder?field.placeholder:'请选择查询值'"
         v-model="queryParam[field.field]"
-        :options="field.list">
+        :options="field.selectList">
       </a-select>
       <!-- 日期 -->
       <a-date-picker
diff --git a/src/components/Bootx/SuperQuery/README.md b/src/components/Bootx/SuperQuery/README.md
deleted file mode 100644
index c924f95..0000000
--- a/src/components/Bootx/SuperQuery/README.md
+++ /dev/null
@@ -1 +0,0 @@
-文档地址: [https://www.yuque.com/bootx/bootx-platform/lbiwqg](https://www.yuque.com/bootx/bootx-platform/lbiwqg)
\ No newline at end of file
diff --git a/src/views/modules/demo/query/SuperQueryDemoList.vue b/src/views/modules/demo/query/SuperQueryDemoList.vue
index 93620f2..9899310 100644
--- a/src/views/modules/demo/query/SuperQueryDemoList.vue
+++ b/src/views/modules/demo/query/SuperQueryDemoList.vue
@@ -104,7 +104,7 @@ export default {
         { field: 'birthday', name: '生日', type: DATE },
         { field: 'workTime', name: '上班时间', type: TIME },
         { field: 'registrationTime', name: '注册时间', type: DATE_TIME },
-        { field: 'political', name: '政治面貌', type: LIST, list: this.politicalList }
+        { field: 'political', name: '政治面貌', type: LIST, selectList: this.politicalList }
       ]
     }
   },
diff --git a/src/views/modules/notice/site/receive/SiteMessageList.vue b/src/views/modules/notice/site/receive/SiteMessageList.vue
index 5751bcd..87c2ef6 100644
--- a/src/views/modules/notice/site/receive/SiteMessageList.vue
+++ b/src/views/modules/notice/site/receive/SiteMessageList.vue
@@ -74,7 +74,7 @@ export default {
           type: LIST,
           name: '是否已读',
           placeholder: '请选择是否已读',
-          list: [{ label: '已读', value: 'true' }, { label: '未读', value: 'false' }]
+          selectList: [{ label: '已读', value: 'true' }, { label: '未读', value: 'false' }]
         }
       ],
       queryParam: {
diff --git a/src/views/modules/notice/site/sender/SiteMessageList.vue b/src/views/modules/notice/site/sender/SiteMessageList.vue
index 9082e1b..aea04d9 100644
--- a/src/views/modules/notice/site/sender/SiteMessageList.vue
+++ b/src/views/modules/notice/site/sender/SiteMessageList.vue
@@ -114,8 +114,8 @@ export default {
     fields () {
       return [
         { field: 'title', type: STRING, name: '标题', placeholder: '请输入标题' },
-        { field: 'receiveType', type: LIST, name: '接收类型', placeholder: '请选择接收类型', list: this.receiveTypeList },
-        { field: 'sendState', type: LIST, name: '发送状态', placeholder: '请选择发送状态', list: this.sendStateList }
+        { field: 'receiveType', type: LIST, name: '接收类型', placeholder: '请选择接收类型', selectList: this.receiveTypeList },
+        { field: 'sendState', type: LIST, name: '发送状态', placeholder: '请选择发送状态', selectList: this.sendStateList }
       ]
     }
   },
diff --git a/src/views/modules/payment/notify/PayNotifyRecordList.vue b/src/views/modules/payment/notify/PayNotifyRecordList.vue
index 4d37834..7052d6c 100644
--- a/src/views/modules/payment/notify/PayNotifyRecordList.vue
+++ b/src/views/modules/payment/notify/PayNotifyRecordList.vue
@@ -85,14 +85,14 @@ export default {
           type: LIST,
           name: '支付通道',
           placeholder: '请选择支付通道',
-          list: this.asyncPayChannel
+          selectList: this.asyncPayChannel
         },
         {
           field: 'status',
           type: LIST,
           name: '处理状态',
           placeholder: '请选择消息处理状态',
-          list: this.payNotifyProcess
+          selectList: this.payNotifyProcess
         }
       ]
     }
diff --git a/src/views/modules/payment/order/payment/PaymentList.vue b/src/views/modules/payment/order/payment/PaymentList.vue
index 32bb696..e422369 100644
--- a/src/views/modules/payment/order/payment/PaymentList.vue
+++ b/src/views/modules/payment/order/payment/PaymentList.vue
@@ -144,9 +144,9 @@ export default {
         { field: 'amount', name: '金额', type: NUMBER, precision: 2 },
         { field: 'errorCode', name: '错误码', type: STRING },
         { field: 'asyncPayMode', name: '异步支付', type: BOOLEAN },
-        { field: 'asyncPayChannel', name: '异步支付方式', type: LIST, list: this.syncPayChannelList },
+        { field: 'asyncPayChannel', name: '异步支付方式', type: LIST, selectList: this.syncPayChannelList },
         { field: 'payTime', name: '支付时间', type: DATE_TIME },
-        { field: 'payStatus', name: '支付状态', type: LIST, list: this.payStatusList }
+        { field: 'payStatus', name: '支付状态', type: LIST, selectList: this.payStatusList }
       ]
     }
   },
diff --git a/src/views/modules/starter/quartz/QuartzJobLogList.vue b/src/views/modules/starter/quartz/QuartzJobLogList.vue
index 15cf074..127fd6d 100644
--- a/src/views/modules/starter/quartz/QuartzJobLogList.vue
+++ b/src/views/modules/starter/quartz/QuartzJobLogList.vue
@@ -72,7 +72,7 @@ export default {
         success: undefined
       },
       fields: [
-      { field: 'success', type: LIST, name: '执行状态', placeholder: '请选择执行状态', list: [{ label: '成功', value: 'true' }, { label: '失败', value: 'false' }] }
+      { field: 'success', type: LIST, name: '执行状态', placeholder: '请选择执行状态', selectList: [{ label: '成功', value: 'true' }, { label: '失败', value: 'false' }] }
     ],
       visible: false,
       className: ''
-- 
Gitee