From 8d32aff7cf40fbf766f41c6efadc1bb3db6a20ba Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Tue, 18 Oct 2022 17:42:04 +0800
Subject: [PATCH 01/16] =?UTF-8?q?pref=20=E7=BB=84=E4=BB=B6=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/office/mytodo/MyTodoList.vue      |  2 +-
 .../modules/system/menu/ResourcePermEdit.vue  |  1 -
 src/views/modules/system/role/RoleList.vue    | 33 +++++++------------
 3 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/office/mytodo/MyTodoList.vue b/src/views/modules/office/mytodo/MyTodoList.vue
index 4853bb7..9c2037a 100644
--- a/src/views/modules/office/mytodo/MyTodoList.vue
+++ b/src/views/modules/office/mytodo/MyTodoList.vue
@@ -71,7 +71,7 @@ export default {
       assigneeTaskId: '',
       fields: [
         { field: 'code', type: STRING, name: '流程编号', placeholder: '请输入流程编号' },
-        { field: 'code', type: STRING, name: '流程名称', placeholder: '请输入流程名称' }
+        { field: 'name', type: STRING, name: '流程名称', placeholder: '请输入流程名称' }
       ]
     }
   },
diff --git a/src/views/modules/system/menu/ResourcePermEdit.vue b/src/views/modules/system/menu/ResourcePermEdit.vue
index ce85631..f6c5d02 100644
--- a/src/views/modules/system/menu/ResourcePermEdit.vue
+++ b/src/views/modules/system/menu/ResourcePermEdit.vue
@@ -80,7 +80,6 @@ export default {
         permCode: '',
         effect: true,
         menuType: 2,
-        sortNo: 0,
         remark: ''
       },
       rules: {
diff --git a/src/views/modules/system/role/RoleList.vue b/src/views/modules/system/role/RoleList.vue
index 949a9f4..de8c7e8 100644
--- a/src/views/modules/system/role/RoleList.vue
+++ b/src/views/modules/system/role/RoleList.vue
@@ -1,25 +1,11 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="角色代码">
-              <a-input v-model="queryParam.code" placeholder="请输入角色代码" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-form-item label="角色名称">
-              <a-input v-model="queryParam.name" placeholder="请输入角色名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-button type="primary" @click="query">查询</a-button>
-            <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="8"
+      @query="query"
+      @reset="() => queryParam = {}"/>
     <vxe-toolbar
       custom
       zoom
@@ -106,6 +92,7 @@ import RoleMenuModal from './RoleMenuModal'
 import RolePathModal from './RolePathModal'
 import { del, page } from '@/api/system/role'
 import { TableMixin } from '@/mixins/TableMixin'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 export default {
   name: 'RoleList',
   components: {
@@ -120,7 +107,11 @@ export default {
       queryParam: {
         code: '',
         name: ''
-      }
+      },
+      fields: [
+        { field: 'code', type: STRING, name: '角色编号', placeholder: '请输入角色编码' },
+        { field: 'name', type: STRING, name: '角色名称', placeholder: '请输入角色名称' }
+      ]
     }
   },
   methods: {
-- 
Gitee


From b30759ebc405d3706f8f117982077a521289c385 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Tue, 18 Oct 2022 23:44:12 +0800
Subject: [PATCH 02/16] =?UTF-8?q?perf=20=E7=BB=84=E4=BB=B6=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/system/path/PathList.vue    | 57 +++++++------------
 .../modules/system/scope/DataScopeList.vue    | 35 +++++-------
 2 files changed, 36 insertions(+), 56 deletions(-)

diff --git a/src/views/modules/system/path/PathList.vue b/src/views/modules/system/path/PathList.vue
index 678dea7..2a90d1b 100644
--- a/src/views/modules/system/path/PathList.vue
+++ b/src/views/modules/system/path/PathList.vue
@@ -1,35 +1,13 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="权限路径">
-              <a-input v-model="queryParam.path" placeholder="请输入要查询的权限路径"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="权限标识">
-              <a-input v-model="queryParam.code" placeholder="请输入要查询的权限标识"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="权限名称">
-              <a-input v-model="queryParam.name" placeholder="请输入要查询的权限名称"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="权限分组">
-              <a-input v-model="queryParam.groupName" placeholder="请输入要查询的权限分组"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="query">查询</a-button>
-            <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      query-param="queryParam"
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="6"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -49,7 +27,7 @@
                   <a @click="batchUpdateEnable(false)">批量停用</a>
                 </a-menu-item>
                 <a-menu-item>
-                  <a @click="assignDataScopeBatch()">批量删除</a>
+                  <a @click="removeDataScopeBatch()">批量删除</a>
                 </a-menu-item>
               </a-menu>
             </template>
@@ -72,7 +50,7 @@
       :loading="loading"
       :data="tableData"
     >
-      <vxe-column type="checkbox" width="40"/>
+      <vxe-table-column type="checkbox" width="40"/>
       <vxe-table-column field="path" title="请求路径" />
       <vxe-table-column field="name" title="权限名称" />
       <vxe-table-column field="code" title="权限标识" />
@@ -127,6 +105,7 @@
 import { batchUpdateEnable, del, delBatch, page, syncSystem } from '@/api/system/permPath'
 import PathEdit from './PathEdit'
 import { TableMixin } from '@/mixins/TableMixin'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 export default {
   name: 'PathList',
   components: {
@@ -136,9 +115,17 @@ export default {
   data () {
     return {
       queryParam: {
+        path: '',
         code: '',
-        name: ''
-      }
+        name: '',
+        groupName: ''
+      },
+      fields: [
+        { field: 'path', type: STRING, name: '权限路径', placeholder: '请输入权限路径' },
+        { field: 'code', type: STRING, name: '权限标识', placeholder: '请输入流程标识' },
+        { field: 'name', type: STRING, name: '权限名称', placeholder: '请输入权限名称' },
+        { field: 'groupName', type: STRING, name: '权限分组', placeholder: '请输入权限分组' }
+      ]
     }
   },
   methods: {
@@ -169,7 +156,7 @@ export default {
       })
     },
     // 批量删除
-    assignDataScopeBatch () {
+    removeDataScopeBatch () {
       const ids = this.$refs.table.getCheckboxRecords().map(o => o.id)
       const that = this
       this.$confirm({
diff --git a/src/views/modules/system/scope/DataScopeList.vue b/src/views/modules/system/scope/DataScopeList.vue
index 1c08062..f24059c 100644
--- a/src/views/modules/system/scope/DataScopeList.vue
+++ b/src/views/modules/system/scope/DataScopeList.vue
@@ -1,25 +1,13 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="编码">
-              <a-input v-model="queryParam.code" placeholder="" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-form-item label="名称">
-              <a-input v-model="queryParam.name" placeholder="" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-button type="primary" @click="query">查询</a-button>
-            <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      query-param="queryParam"
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="6"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       :refresh="{query: init}"
@@ -104,6 +92,7 @@ import { del, page } from '@/api/system/dataScope'
 import DataScopeEdit from './DataScopeEdit'
 import DeptScopeModal from './DeptScopeModal'
 import UserScopeModal from './UserScopeModal'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'DataScopeList',
@@ -119,7 +108,11 @@ export default {
       queryParam: {
         code: '',
         name: ''
-      }
+      },
+      fields: [
+        { field: 'code', type: STRING, name: '编码', placeholder: '请输入权限编码' },
+        { field: 'name', type: STRING, name: '名称', placeholder: '请输入权限名称' }
+      ]
     }
   },
   methods: {
-- 
Gitee


From 43219bfbed9d5519a1eb92367579b3c80d576338 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Wed, 19 Oct 2022 23:58:30 +0800
Subject: [PATCH 03/16] =?UTF-8?q?perf=20=E7=BB=84=E4=BB=B6=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/system/dict/DictList.vue    | 41 +++++++------------
 .../modules/system/param/SystemParamList.vue  | 34 ++++++---------
 .../modules/system/scope/DataScopeList.vue    |  1 -
 3 files changed, 27 insertions(+), 49 deletions(-)

diff --git a/src/views/modules/system/dict/DictList.vue b/src/views/modules/system/dict/DictList.vue
index 89b233f..a5dbf3f 100644
--- a/src/views/modules/system/dict/DictList.vue
+++ b/src/views/modules/system/dict/DictList.vue
@@ -1,31 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="字典编码">
-              <a-input v-model="queryParam.code" placeholder="请输入字典编码" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="字典名称">
-              <a-input v-model="queryParam.name" placeholder="请输入字典名称"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="分组标签">
-              <a-input v-model="queryParam.groupTag" placeholder="请输入分组标签" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="query">查询</a-button>
-            <a-button style="margin-left: 8px" @click="() => this.queryParam = {}">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="6"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -90,6 +71,7 @@ import { page, del } from '@/api/system/dict'
 import DictEdit from './DictEdit'
 import DictItemList from './DictItemList'
 import { TableMixin } from '@/mixins/TableMixin'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 export default {
   name: 'DictList',
   components: {
@@ -103,7 +85,12 @@ export default {
         code: '',
         name: '',
         groupTag: ''
-      }
+      },
+      fields: [
+        { field: 'code', type: STRING, name: '字典编码', placeholder: '请输入字典编码' },
+        { field: 'name', type: STRING, name: '字典名称', placeholder: '请输入字典名称' },
+        { field: 'groupTag', type: STRING, name: '分组标签', placeholder: '请输入分组标签' }
+      ]
     }
   },
   methods: {
diff --git a/src/views/modules/system/param/SystemParamList.vue b/src/views/modules/system/param/SystemParamList.vue
index 12cf12d..221d8c0 100644
--- a/src/views/modules/system/param/SystemParamList.vue
+++ b/src/views/modules/system/param/SystemParamList.vue
@@ -1,25 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form-model layout="inline">
-        <a-row :gutter="24">
-          <a-col :md="8" :sm="24">
-            <a-form-model-item label="参数名称">
-              <a-input v-model="queryParam.name" placeholder=""/>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-form-model-item label="参数键名">
-              <a-input v-model="queryParam.paramKey" placeholder=""/>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-button type="primary" @click="query">查询</a-button>
-            <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="6"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -87,6 +74,7 @@
 import { TableMixin } from '@/mixins/TableMixin'
 import SystemParamEdit from './SystemParamEdit'
 import { page, del } from '@/api/system/param'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'SystemParamList',
@@ -100,7 +88,11 @@ export default {
       queryParam: {
         paramKey: '',
         name: ''
-      }
+      },
+      fields: [
+        { field: 'name', type: STRING, name: '参数名称', placeholder: '请输入字典名称' },
+        { field: 'paramKey', type: STRING, name: '分组标签', placeholder: '请输入分组标签' }
+      ]
     }
   },
   methods: {
diff --git a/src/views/modules/system/scope/DataScopeList.vue b/src/views/modules/system/scope/DataScopeList.vue
index f24059c..299e01f 100644
--- a/src/views/modules/system/scope/DataScopeList.vue
+++ b/src/views/modules/system/scope/DataScopeList.vue
@@ -1,7 +1,6 @@
 <template>
   <a-card :bordered="false">
     <b-query
-      query-param="queryParam"
       v-model="queryParam"
       :fields="fields"
       :default-item-md="6"
-- 
Gitee


From 1d2550aad06a38bb1f4fd6e2defbfabf0351d153 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Thu, 20 Oct 2022 10:24:19 +0800
Subject: [PATCH 04/16] =?UTF-8?q?feat=20=E5=A2=9E=E5=8A=A0=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=96=87=E4=BB=B6mixin,=E6=9F=A5=E8=AF=A2=E5=99=A8?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=9B=9E=E8=BD=A6=E8=A7=A6=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Bootx/SuperQuery/BQuery.vue    |  1 +
 src/components/Bootx/SuperQuery/QueryItem.vue | 12 ++++++-
 src/mixins/DownMixin.js                       | 32 +++++++++++++++++++
 .../modules/develop/codegen/CodeGenForm.vue   |  1 -
 .../modules/develop/codegen/CodeGenList.vue   | 26 +++------------
 5 files changed, 49 insertions(+), 23 deletions(-)
 create mode 100644 src/mixins/DownMixin.js

diff --git a/src/components/Bootx/SuperQuery/BQuery.vue b/src/components/Bootx/SuperQuery/BQuery.vue
index ca3cb7c..f1de259 100644
--- a/src/components/Bootx/SuperQuery/BQuery.vue
+++ b/src/components/Bootx/SuperQuery/BQuery.vue
@@ -8,6 +8,7 @@
           v-for="(field, i) in fields"
           :field="field"
           :md="defaultItemMd"
+          @query="query"
           v-model="queryParam"
         />
         <a-col :md="defaultItemMd" :sm="24">
diff --git a/src/components/Bootx/SuperQuery/QueryItem.vue b/src/components/Bootx/SuperQuery/QueryItem.vue
index b477412..51253ad 100644
--- a/src/components/Bootx/SuperQuery/QueryItem.vue
+++ b/src/components/Bootx/SuperQuery/QueryItem.vue
@@ -4,12 +4,14 @@
       <!-- 文本输入 -->
       <a-input
         allowClear
+        @keyup.enter="query"
         v-if="field.type === STRING"
         :placeholder="field.placeholder?field.placeholder:'请输入查询值'"
         v-model="queryParam[field.field]"/>
       <!-- 数字输入 -->
       <a-input-number
         allowClear
+        @keyup.enter="query"
         style="width: 100%"
         v-else-if="field.type === NUMBER"
         :placeholder="field.placeholder?field.placeholder:'请输入查询值'"
@@ -54,7 +56,12 @@
         :valueFormat="queryParam.format?queryParam.format:'yyyy-MM-DD HH:mm:ss'"
         v-model="queryParam[field.field]"/>
       <!-- 默认文本输入 -->
-      <a-input allowClear v-else :placeholder="field.placeholder?field.placeholder:'请输入查询值'" v-model="queryParam[field.field]"/>
+      <a-input
+        @keyup.enter="query"
+        allowClear
+        v-else
+        :placeholder="field.placeholder?field.placeholder:'请输入查询值'"
+        v-model="queryParam[field.field]"/>
     </a-form-item>
   </a-col>
 </template>
@@ -89,6 +96,9 @@ export default {
     }
   },
   methods: {
+    query () {
+      this.$emit('query')
+    }
   }
 }
 </script>
diff --git a/src/mixins/DownMixin.js b/src/mixins/DownMixin.js
new file mode 100644
index 0000000..627be84
--- /dev/null
+++ b/src/mixins/DownMixin.js
@@ -0,0 +1,32 @@
+export const DownMixin = {
+
+  methods: {
+
+    /**
+     * 获取http头部的文件名信息，若无需重命名文件，将下面这行删去
+     * @param response axios 返回响应对象
+     * @param fileName 文件名称
+     * @param type 文件类型 如 application/zip
+     */
+    downFileByData (response, fileName, type) {
+      if (response.type === 'application/octet-stream') {
+        /* 兼容ie内核，360浏览器的兼容模式 */
+        if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+          const blob = new Blob([response], { type })
+          window.navigator.msSaveOrOpenBlob(blob, fileName)
+        } else {
+          /* 火狐谷歌的文件下载方式 */
+          const blob = new Blob([response], { type })
+          const url = window.URL.createObjectURL(blob)
+          const link = document.createElement('a') // 创建a标签
+          link.href = url
+          if (fileName) {
+            link.download = fileName // 文件重命名，若无需重命名，将该行删去
+          }
+          link.click()
+          URL.revokeObjectURL(url) // 释放内存
+        }
+      }
+    }
+  }
+}
diff --git a/src/views/modules/develop/codegen/CodeGenForm.vue b/src/views/modules/develop/codegen/CodeGenForm.vue
index c722336..beaf6fc 100644
--- a/src/views/modules/develop/codegen/CodeGenForm.vue
+++ b/src/views/modules/develop/codegen/CodeGenForm.vue
@@ -140,7 +140,6 @@ export default {
       this.form.tableName = tableName
       this.type = type
       this.genPackFlag = false
-      console.log(this.form)
       this.getGenConfigParam()
     },
     // 确定
diff --git a/src/views/modules/develop/codegen/CodeGenList.vue b/src/views/modules/develop/codegen/CodeGenList.vue
index 58a57ad..a5cae34 100644
--- a/src/views/modules/develop/codegen/CodeGenList.vue
+++ b/src/views/modules/develop/codegen/CodeGenList.vue
@@ -25,8 +25,8 @@
       <vxe-table-column field="createTime" title="创建时间" />
       <vxe-table-column fixed="right" width="120" :showOverflow="false" title="操作">
         <template v-slot="{row}">
-<!--          <a href="javascript:" @click="previewShow(row)">预览</a>-->
-<!--          <a-divider type="vertical" />-->
+          <!--          <a href="javascript:" @click="previewShow(row)">预览</a>-->
+          <!--          <a-divider type="vertical" />-->
           <a href="javascript:" @click="generateShow(row)">生成</a>
         </template>
       </vxe-table-column>
@@ -47,9 +47,10 @@ import { TableMixin } from '@/mixins/TableMixin'
 import { codeGenPreview, genCodeZip, page } from '@/api/develop/codeGen'
 import CodeGenForm from './CodeGenForm'
 import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
+import { DownMixin } from '@/mixins/DownMixin'
 export default {
   name: 'CodeGenList',
-  mixins: [TableMixin],
+  mixins: [TableMixin, DownMixin],
   components: {
     CodeGenForm
   },
@@ -92,24 +93,7 @@ export default {
     // 生成代码
     generate (from) {
       genCodeZip(from).then(response => {
-        if (response.type === 'application/octet-stream') {
-          // 获取http头部的文件名信息，若无需重命名文件，将下面这行删去
-          const fileName = from.tableName + '.zip'
-          /* 兼容ie内核，360浏览器的兼容模式 */
-          if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-            const blob = new Blob([response], { type: 'application/zip' })
-            window.navigator.msSaveOrOpenBlob(blob, fileName)
-          } else {
-            /* 火狐谷歌的文件下载方式 */
-            const blob = new Blob([response], { type: 'application/zip' })
-            const url = window.URL.createObjectURL(blob)
-            const link = document.createElement('a') // 创建a标签
-            link.href = url
-            link.download = fileName // 文件重命名，若无需重命名，将该行删去
-            link.click()
-            URL.revokeObjectURL(url) // 释放内存
-          }
-        }
+        this.downFileByData(response, from.tableName + '.zip', 'application/zip')
       })
     }
   },
-- 
Gitee


From c1784b46319340cc354b06a259faf08cd7220bd0 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Thu, 20 Oct 2022 20:30:31 +0800
Subject: [PATCH 05/16] =?UTF-8?q?fix=20=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=89=A7=E8=A1=8C=E8=AE=B0=E5=BD=95=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8F=B0=E8=AD=A6=E5=91=8A=E6=B6=88=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/starter/quartz/QuartzJobList.vue  | 53 ++++++++-----------
 .../starter/quartz/QuartzJobLogList.vue       |  4 +-
 2 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/src/views/modules/starter/quartz/QuartzJobList.vue b/src/views/modules/starter/quartz/QuartzJobList.vue
index 20e6d7f..cbe7a0b 100644
--- a/src/views/modules/starter/quartz/QuartzJobList.vue
+++ b/src/views/modules/starter/quartz/QuartzJobList.vue
@@ -1,35 +1,13 @@
 <template>
   <a-card :bordered="false">
     <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form-model :model="queryParam" layout="inline">
-        <a-row :gutter="24">
-          <a-col :md="8" :sm="24">
-            <a-form-model-item label="任务类名" prop="jobClassName">
-              <a-input placeholder="请输入任务类名" v-model="queryParam.jobClassName"></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-form-model-item label="任务状态" prop="status">
-              <a-select
-                allowClear
-                style="width: 220px"
-                v-model="queryParam.status"
-                placeholder="请选择状态"
-              >
-                <a-select-option value="">全部</a-select-option>
-                <a-select-option value="1">正常</a-select-option>
-                <a-select-option value="0">停止</a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-button type="primary" @click="query">查询</a-button>
-            <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="8"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -138,6 +116,7 @@ import { TableMixin } from '@/mixins/TableMixin'
 import { page, del, start, stop, execute, syncJobStatus } from '@/api/starter/quartz'
 import QuartzJobEdit from './QuartzJobEdit'
 import QuartzJobLogList from './QuartzJobLogList'
+import { LIST, STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'QuartzJobList',
@@ -151,7 +130,21 @@ export default {
       queryParam: {
         jobClassName: '',
         status: ''
-      }
+      },
+      fields: [
+        { field: 'jobClassName', type: STRING, name: '任务类名', placeholder: '请输入任务类名' },
+        { field: 'status',
+          type: LIST,
+          name: '任务状态',
+          placeholder: '请选择状态',
+          md: 4,
+          list: [
+            { label: '全部', value: '' },
+            { label: '正常', value: '1' },
+            { label: '停止', value: '0' }
+          ]
+        }
+      ]
     }
   },
   methods: {
diff --git a/src/views/modules/starter/quartz/QuartzJobLogList.vue b/src/views/modules/starter/quartz/QuartzJobLogList.vue
index dbb6364..1786a8b 100644
--- a/src/views/modules/starter/quartz/QuartzJobLogList.vue
+++ b/src/views/modules/starter/quartz/QuartzJobLogList.vue
@@ -19,8 +19,8 @@
                 v-model="queryParam.success"
                 placeholder="请选择状态"
               >
-                <a-select-option :value="true">成功</a-select-option>
-                <a-select-option :value="false">失败</a-select-option>
+                <a-select-option value="true">成功</a-select-option>
+                <a-select-option value="false">失败</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
-- 
Gitee


From c6ace3135cddf7e220bafd1c953ecb9b7a2368ee Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Fri, 21 Oct 2022 17:52:47 +0800
Subject: [PATCH 06/16] =?UTF-8?q?feat=20=E5=A2=9E=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E7=B1=BB=E5=92=8C=E7=BB=84=E4=BB=B6=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dataUtil.js                         | 55 ++++++++++++++++++
 src/utils/entityUtil.js                       | 13 -----
 src/utils/util.js                             | 23 --------
 .../modules/goods/category/CategoryEdit.vue   |  2 +-
 .../modules/starter/log/LoginLogInfo.vue      |  2 +-
 .../modules/starter/log/LoginLogList.vue      | 56 ++++++-------------
 src/views/modules/system/dept/DeptEdit.vue    |  2 +-
 src/views/modules/system/menu/MenuEdit.vue    |  2 +-
 .../modules/system/role/RoleMenuModal.vue     |  2 +-
 .../modules/system/scope/DeptScopeModal.vue   |  2 +-
 .../system/user/dept/UserDeptAssign.vue       |  2 +-
 .../system/user/dept/UserDeptAssignBatch.vue  |  2 +-
 12 files changed, 81 insertions(+), 82 deletions(-)
 create mode 100644 src/utils/dataUtil.js
 delete mode 100644 src/utils/entityUtil.js

diff --git a/src/utils/dataUtil.js b/src/utils/dataUtil.js
new file mode 100644
index 0000000..c82d27f
--- /dev/null
+++ b/src/utils/dataUtil.js
@@ -0,0 +1,55 @@
+/**
+ * 从列表中获取指定的对象
+ * @param list 列表
+ * @param fieldValue 要查询的字段值
+ * @param fieldName 字段名称
+ */
+export function findOneByField (list, fieldValue, fieldName) {
+  const item = list?.filter(o => {
+    return o[fieldName] === fieldValue
+  })
+  if (item && item.length > 0) {
+    return item[0]
+  } else {
+    return null
+  }
+}
+
+/**
+ * 树形数据转换
+ * @param data 数据
+ * @param value
+ * @param title
+ * @param children 孩子列表字段名
+ * @returns {*[]}
+ */
+export function treeDataTranslate (data, value = 'value', title = 'title', children = 'children') {
+  const temp = []
+  for (let i = 0; i < data.length; i++) {
+    const p = {
+      key: data[i][value],
+      title: data[i][title],
+      value: String(data[i][value])
+    }
+    if (data[i][children] && data[i][children].length > 0) {
+      p.children = treeDataTranslate(data[i][children], value, title, children)
+    }
+    temp.push(p)
+  }
+  return temp
+}
+
+/**
+ * 转换成下拉框数据格式
+ * @param list 数据列表
+ * @param labelName label名称
+ * @param valueName 值名称
+ */
+export function dropdownTranslate (list, labelName, valueName) {
+  return list?.map(o => {
+    return {
+      label: o[labelName],
+      value: o[valueName]
+    }
+  })
+}
diff --git a/src/utils/entityUtil.js b/src/utils/entityUtil.js
deleted file mode 100644
index 58c1167..0000000
--- a/src/utils/entityUtil.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * 从列表中获取指定的对象
- */
-export function findOneByField (list, fieldValue, fieldName) {
-  const item = list.filter(o => {
-    return o[fieldName] === fieldValue
-  })
-  if (item && item.length > 0) {
-    return item[0]
-  } else {
-    return null
-  }
-}
diff --git a/src/utils/util.js b/src/utils/util.js
index 92057d2..e1144ed 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -94,26 +94,3 @@ export function scorePassword (pass) {
   return parseInt(score)
 }
 
-/**
- * 树形数据转换
- * @param data 数据
- * @param value
- * @param title
- * @param children 孩子列表字段名
- * @returns {*[]}
- */
-export function treeDataTranslate (data, value = 'value', title = 'title', children = 'children') {
-  const temp = []
-  for (let i = 0; i < data.length; i++) {
-    const p = {
-      key: data[i][value],
-      title: data[i][title],
-      value: String(data[i][value])
-    }
-    if (data[i][children] && data[i][children].length > 0) {
-      p.children = treeDataTranslate(data[i][children], value, title, children)
-    }
-    temp.push(p)
-  }
-  return temp
-}
diff --git a/src/views/modules/goods/category/CategoryEdit.vue b/src/views/modules/goods/category/CategoryEdit.vue
index 85feede..0bb73d7 100644
--- a/src/views/modules/goods/category/CategoryEdit.vue
+++ b/src/views/modules/goods/category/CategoryEdit.vue
@@ -80,7 +80,7 @@
 
 <script>
 import { FormMixin } from '@/mixins/FormMixin'
-import { treeDataTranslate } from '@/utils/util'
+import { treeDataTranslate } from '@/utils/dataUtil'
 import { findTree, update, get, add, existsByName, existsByNameNotId } from '@/api/goods/category'
 
 export default {
diff --git a/src/views/modules/starter/log/LoginLogInfo.vue b/src/views/modules/starter/log/LoginLogInfo.vue
index 66a5c12..77fcdf2 100644
--- a/src/views/modules/starter/log/LoginLogInfo.vue
+++ b/src/views/modules/starter/log/LoginLogInfo.vue
@@ -52,7 +52,7 @@
 <script>
 import { FormMixin } from '@/mixins/FormMixin'
 import { loginInfo } from '@/api/starter/log'
-import { findOneByField } from '@/utils/entityUtil'
+import { findOneByField } from '@/utils/dataUtil'
 
 export default {
   name: 'LoginLogInfo',
diff --git a/src/views/modules/starter/log/LoginLogList.vue b/src/views/modules/starter/log/LoginLogList.vue
index 11f986a..23ffe71 100644
--- a/src/views/modules/starter/log/LoginLogList.vue
+++ b/src/views/modules/starter/log/LoginLogList.vue
@@ -1,42 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="账号">
-              <a-input v-model="queryParam.account" placeholder="请输入账号" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="终端">
-              <a-select
-                allowClear
-                placeholder="请选择终端"
-                v-model="queryParam.client">
-                <a-select-option v-for="o in clients" :key="o.code">{{ o.name }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="登录方式">
-              <a-select
-                allowClear
-                placeholder="请输入登录方式"
-                v-model="queryParam.loginType">
-                <a-select-option v-for="o in loginTypes" :key="o.code">{{ o.name }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-space>
-              <a-button type="primary" @click="query">查询</a-button>
-              <a-button @click="() => this.queryParam = {}">重置</a-button>
-            </a-space>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="6"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -102,7 +72,8 @@ import { loginPage } from '@/api/starter/log'
 import LoginLogInfo from './LoginLogInfo'
 import { findAll as findClients } from '@/api/system/client'
 import { findAll as findLoginTypes } from '@/api/system/loginType'
-import { findOneByField } from '@/utils/entityUtil'
+import { dropdownTranslate, findOneByField } from '@/utils/dataUtil'
+import { LIST, STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'LoginLogList',
@@ -121,6 +92,15 @@ export default {
       }
     }
   },
+  computed: {
+    fields () {
+      return [
+        { field: 'code', type: STRING, name: '账号', placeholder: '请输入账号名称' },
+        { field: 'client', type: LIST, name: '终端', placeholder: '请选择终端', list: dropdownTranslate(this.clients, 'name', 'code') },
+        { field: 'loginType', type: LIST, name: '登录方式', placeholder: '请选择登录方式', list: dropdownTranslate(this.loginTypes, 'name', 'code') }
+      ]
+    }
+  },
   methods: {
     /**
      * 初始化 终端列表和登录方式列表
diff --git a/src/views/modules/system/dept/DeptEdit.vue b/src/views/modules/system/dept/DeptEdit.vue
index 15e048a..d58c4fc 100644
--- a/src/views/modules/system/dept/DeptEdit.vue
+++ b/src/views/modules/system/dept/DeptEdit.vue
@@ -112,7 +112,7 @@
 <script>
 import { get, add, update, tree } from '@/api/system/dept'
 import { FormMixin } from '@/mixins/FormMixin'
-import { treeDataTranslate } from '@/utils/util'
+import { treeDataTranslate } from '@/utils/dataUtil'
 import { validateMobile } from '@/utils/validate'
 export default {
   name: 'DeptEdit',
diff --git a/src/views/modules/system/menu/MenuEdit.vue b/src/views/modules/system/menu/MenuEdit.vue
index 0e32338..d381107 100644
--- a/src/views/modules/system/menu/MenuEdit.vue
+++ b/src/views/modules/system/menu/MenuEdit.vue
@@ -208,7 +208,7 @@
 
 <script>
 import { add, update, findById, menuTree } from '@/api/system/permMenu'
-import { treeDataTranslate } from '@/utils/util'
+import { treeDataTranslate } from '@/utils/dataUtil'
 import { FormMixin } from '@/mixins/FormMixin'
 import IconSelector from '@/components/IconSelector'
 export default {
diff --git a/src/views/modules/system/role/RoleMenuModal.vue b/src/views/modules/system/role/RoleMenuModal.vue
index fae7baa..3eaf2d1 100644
--- a/src/views/modules/system/role/RoleMenuModal.vue
+++ b/src/views/modules/system/role/RoleMenuModal.vue
@@ -59,7 +59,7 @@
 
 <script>
 import { findPermissionIdsByRole, save } from '@/api/system/roleMenu'
-import { treeDataTranslate } from '@/utils/util'
+import { treeDataTranslate } from '@/utils/dataUtil'
 import { allTree } from '@/api/system/permMenu'
 import XEUtils from 'xe-utils'
 import { findAll } from '@/api/system/client'
diff --git a/src/views/modules/system/scope/DeptScopeModal.vue b/src/views/modules/system/scope/DeptScopeModal.vue
index 8b7ade6..329341d 100644
--- a/src/views/modules/system/scope/DeptScopeModal.vue
+++ b/src/views/modules/system/scope/DeptScopeModal.vue
@@ -52,7 +52,7 @@
 
 <script>
 import { tree } from '@/api/system/dept'
-import { treeDataTranslate } from '@/utils/util'
+import { treeDataTranslate } from '@/utils/dataUtil'
 import { saveDeptAssign, getDeptIds } from '@/api/system/dataScope'
 import XEUtils from 'xe-utils'
 
diff --git a/src/views/modules/system/user/dept/UserDeptAssign.vue b/src/views/modules/system/user/dept/UserDeptAssign.vue
index 93ae9cf..7b19db3 100644
--- a/src/views/modules/system/user/dept/UserDeptAssign.vue
+++ b/src/views/modules/system/user/dept/UserDeptAssign.vue
@@ -53,7 +53,7 @@
 <script>
 import { tree } from '@/api/system/dept'
 import { addUserDept, findDeptIdsByUser } from '@/api/system/userAssign'
-import { treeDataTranslate } from '@/utils/util'
+import { treeDataTranslate } from '@/utils/dataUtil'
 import XEUtils from 'xe-utils'
 export default {
   name: 'UserDeptAssign',
diff --git a/src/views/modules/system/user/dept/UserDeptAssignBatch.vue b/src/views/modules/system/user/dept/UserDeptAssignBatch.vue
index 76605b0..c5d15d2 100644
--- a/src/views/modules/system/user/dept/UserDeptAssignBatch.vue
+++ b/src/views/modules/system/user/dept/UserDeptAssignBatch.vue
@@ -54,7 +54,7 @@
 <script>
 import { tree } from '@/api/system/dept'
 import { addUserDeptBatch } from '@/api/system/userAssign'
-import { treeDataTranslate } from '@/utils/util'
+import { treeDataTranslate } from '@/utils/dataUtil'
 import XEUtils from 'xe-utils'
 export default {
   name: 'UserDeptAssignBatch',
-- 
Gitee


From ad3b6c7d9b167cbdd418e025ddddb0b175f3bb41 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sun, 23 Oct 2022 21:56:10 +0800
Subject: [PATCH 07/16] =?UTF-8?q?perf=20=E6=90=9C=E7=B4=A2=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/develop/file/FileUploadList.vue   | 12 +++++-
 .../modules/starter/log/OperateLogList.vue    | 39 +++++++------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/views/modules/develop/file/FileUploadList.vue b/src/views/modules/develop/file/FileUploadList.vue
index 48549c9..0465fd3 100644
--- a/src/views/modules/develop/file/FileUploadList.vue
+++ b/src/views/modules/develop/file/FileUploadList.vue
@@ -1,5 +1,12 @@
 <template>
   <a-card :bordered="false">
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="6"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -55,6 +62,7 @@ import { page } from '@/api/develop/fileUpload'
 import { getFileDownloadUrl, getFilePreviewUrl } from '@/api/common/fileUpload'
 import storage from 'store'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'FileUploadList',
@@ -62,7 +70,9 @@ export default {
   data () {
     return {
       queryParam: {
-      }
+      },
+      fields: [
+    ]
     }
   },
   computed: {
diff --git a/src/views/modules/starter/log/OperateLogList.vue b/src/views/modules/starter/log/OperateLogList.vue
index 1e71d4f..a839137 100644
--- a/src/views/modules/starter/log/OperateLogList.vue
+++ b/src/views/modules/starter/log/OperateLogList.vue
@@ -1,27 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="操作模块">
-              <a-input v-model="queryParam.title" placeholder="" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-form-item label="账号">
-              <a-input v-model="queryParam.username" placeholder="" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-space>
-              <a-button type="primary" @click="query">查询</a-button>
-              <a-button @click="() => this.queryParam = {}">重置</a-button>
-            </a-space>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="6"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -51,7 +36,7 @@
       <vxe-table-column field="operateIp" title="IP" />
       <vxe-table-column field="errorMsg" title="错误消息" />
       <vxe-table-column field="operateTime" title="操作时间" />
-      <vxe-table-column title="操作" fixed="right" width="120">
+      <vxe-table-column title="操作" fixed="right" width="60">
         <template v-slot="{row}">
           <span>
             <a href="javascript:" @click="show(row)">查看</a>
@@ -78,6 +63,8 @@
 import { TableMixin } from '@/mixins/TableMixin'
 import { operatePage } from '@/api/starter/log'
 import OperateLogInfo from './OperateLogInfo'
+import { LIST, STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
+import { dropdownTranslate } from '@/utils/dataUtil'
 
 export default {
   name: 'OperateLogList',
@@ -91,7 +78,11 @@ export default {
       queryParam: {
         title: '',
         username: ''
-      }
+      },
+      fields: [
+        { field: 'title', type: STRING, name: '操作模块', placeholder: '请输入操作模块' },
+        { field: 'username', type: STRING, name: '账号', placeholder: '请输入账号名称' }
+      ]
     }
   },
   methods: {
-- 
Gitee


From d248674c4801dee8dc5bdc565b1e294a0e72de2a Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Tue, 25 Oct 2022 22:48:40 +0800
Subject: [PATCH 08/16] =?UTF-8?q?style=20=E6=B6=88=E6=81=AF=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/notice/template/TemplateList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/notice/template/TemplateList.vue b/src/views/modules/notice/template/TemplateList.vue
index 0ef8ebb..d50d218 100644
--- a/src/views/modules/notice/template/TemplateList.vue
+++ b/src/views/modules/notice/template/TemplateList.vue
@@ -57,7 +57,7 @@
                 </a-menu-item>
                 <a-menu-item>
                   <a-popconfirm
-                    title="是否删除模板"
+                    title="是否删除"
                     @confirm="remove(row)"
                     okText="是"
                     cancelText="否">
-- 
Gitee


From bc6359f21e92d9eaa0cc4b5f1316c52ea06b8ddc Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Wed, 26 Oct 2022 16:08:27 +0800
Subject: [PATCH 09/16] =?UTF-8?q?pref=20=E6=9B=BF=E6=8D=A2=E6=96=B0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wechat/template/WeChatTemplateList.vue    | 59 +++++++++----------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/src/views/modules/third/wechat/template/WeChatTemplateList.vue b/src/views/modules/third/wechat/template/WeChatTemplateList.vue
index fcbf8f8..86cb3ec 100644
--- a/src/views/modules/third/wechat/template/WeChatTemplateList.vue
+++ b/src/views/modules/third/wechat/template/WeChatTemplateList.vue
@@ -1,32 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper" >
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="名称">
-              <a-input v-model="queryParam.name" placeholder="请输入名称"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="名称">
-              <a-input v-model="queryParam.code" placeholder="请输入编码"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="名称">
-              <a-input v-model="queryParam.templateId" placeholder="请输入模板ID"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-space>
-              <a-button type="primary" @click="query">查询</a-button>
-              <a-button @click="resetQuery">重置</a-button>
-            </a-space>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      :query-param="queryParam"
+      :default-item-md="8"
+      :disabled-query="superQueryFlag"
+      :fields="fields"
+      @query="query"
+      @reset="() => queryParam = {}"/>
     <vxe-toolbar
       custom
       zoom
@@ -39,7 +19,7 @@
             @confirm="sync()"
             okText="是"
             cancelText="否">
-            <a-button icon="sync">同步微信模板</a-button>
+            <a-button @click="sync" icon="sync">同步微信模板</a-button>
           </a-popconfirm>
         </a-space>
       </template>
@@ -86,6 +66,8 @@
 import { page, sync } from '@/api/third/weChatTemplate'
 import WeChatTemplateEdit from './WeChatTemplateEdit'
 import { TableMixin } from '@/mixins/TableMixin'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
+import { uploadBpmn } from '@/api/bpm/model'
 export default {
   name: 'WeChatTemplateList',
   components: {
@@ -98,7 +80,12 @@ export default {
         code: '',
         name: '',
         templateId: ''
-      }
+      },
+      fields: [
+        { field: 'code', type: STRING, name: '编码', placeholder: '请输入编码' },
+        { field: 'name', type: STRING, name: '名称', placeholder: '请输入名称' },
+        { field: 'templateId', type: STRING, name: '模板ID', placeholder: '请输入模板ID' }
+      ]
     }
   },
   methods: {
@@ -117,9 +104,17 @@ export default {
     show (record) {
       this.$refs.weChatTemplateEdit.init(record.id, 'show')
     },
-    sync(){
-      sync().then(()=>{
-        this.$message.info('开始同步微信消息模板')
+    sync () {
+      this.$confirm({
+        title: '保存',
+        content: '是否保存该流程图',
+        okText: '确定',
+        cancelText: '取消',
+        onOk: () => {
+          sync().then(() => {
+            this.$message.info('开始同步微信消息模板')
+          })
+        }
       })
     }
   },
-- 
Gitee


From 0a925588f16b9698e4b88858cb8911b705fc2755 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Thu, 27 Oct 2022 17:02:56 +0800
Subject: [PATCH 10/16] =?UTF-8?q?pref=20=E6=9B=BF=E6=8D=A2=E6=96=B0?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/third/weChatMenu.js                   |  2 +-
 .../third/wechat/menu/WeChatMenuEdit.vue      |  1 -
 .../third/wechat/menu/WeChatMenuList.vue      | 30 ++++++++-----------
 .../wechat/template/WeChatTemplateList.vue    | 17 +++--------
 4 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/src/api/third/weChatMenu.js b/src/api/third/weChatMenu.js
index 0551775..1a4de2a 100644
--- a/src/api/third/weChatMenu.js
+++ b/src/api/third/weChatMenu.js
@@ -86,7 +86,7 @@ export function publish (id) {
 }
 
 /**
- * 发布菜单
+ * 导入微信配置的菜单
  */
 export function importMenu () {
   return axios({
diff --git a/src/views/modules/third/wechat/menu/WeChatMenuEdit.vue b/src/views/modules/third/wechat/menu/WeChatMenuEdit.vue
index 2f5d070..655bf55 100644
--- a/src/views/modules/third/wechat/menu/WeChatMenuEdit.vue
+++ b/src/views/modules/third/wechat/menu/WeChatMenuEdit.vue
@@ -54,7 +54,6 @@ export default {
       },
       rules: {
         name: [],
-        remark: []
       }
     }
   },
diff --git a/src/views/modules/third/wechat/menu/WeChatMenuList.vue b/src/views/modules/third/wechat/menu/WeChatMenuList.vue
index 2f40a62..98cc3a0 100644
--- a/src/views/modules/third/wechat/menu/WeChatMenuList.vue
+++ b/src/views/modules/third/wechat/menu/WeChatMenuList.vue
@@ -1,22 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="名称">
-              <a-input v-model="queryParam.name" placeholder="请输入名称"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-space>
-              <a-button type="primary" @click="query">查询</a-button>
-              <a-button @click="resetQuery">重置</a-button>
-            </a-space>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      :query-param="queryParam"
+      :default-item-md="8"
+      :disabled-query="superQueryFlag"
+      :fields="fields"
+      @query="query"
+      @reset="() => queryParam = {}"/>
     <vxe-toolbar
       custom
       zoom
@@ -107,6 +97,7 @@ import { page, del, importMenu, publish, clearMenu } from '@/api/third/weChatMen
 import WeChatMenuEdit from './WeChatMenuEdit'
 import WeChatMenuDesign from './WeChatMenuDesign'
 import { TableMixin } from '@/mixins/TableMixin'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 export default {
   name: 'WeChatMenuList',
   components: {
@@ -118,7 +109,10 @@ export default {
     return {
       queryParam: {
         name: ''
-      }
+      },
+      fields: [
+        { field: 'name', type: STRING, name: '名称', placeholder: '请输入名称' }
+      ]
     }
   },
   methods: {
diff --git a/src/views/modules/third/wechat/template/WeChatTemplateList.vue b/src/views/modules/third/wechat/template/WeChatTemplateList.vue
index 86cb3ec..3332d9d 100644
--- a/src/views/modules/third/wechat/template/WeChatTemplateList.vue
+++ b/src/views/modules/third/wechat/template/WeChatTemplateList.vue
@@ -13,15 +13,7 @@
       :refresh="{query: init}"
     >
       <template v-slot:buttons>
-        <a-space>
-          <a-popconfirm
-            title="是否同步同步微信模板"
-            @confirm="sync()"
-            okText="是"
-            cancelText="否">
-            <a-button @click="sync" icon="sync">同步微信模板</a-button>
-          </a-popconfirm>
-        </a-space>
+        <a-button @click="sync" icon="sync">同步微信模板</a-button>
       </template>
     </vxe-toolbar>
     <vxe-table
@@ -67,7 +59,6 @@ import { page, sync } from '@/api/third/weChatTemplate'
 import WeChatTemplateEdit from './WeChatTemplateEdit'
 import { TableMixin } from '@/mixins/TableMixin'
 import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
-import { uploadBpmn } from '@/api/bpm/model'
 export default {
   name: 'WeChatTemplateList',
   components: {
@@ -82,8 +73,8 @@ export default {
         templateId: ''
       },
       fields: [
-        { field: 'code', type: STRING, name: '编码', placeholder: '请输入编码' },
         { field: 'name', type: STRING, name: '名称', placeholder: '请输入名称' },
+        { field: 'code', type: STRING, name: '编码', placeholder: '请输入编码' },
         { field: 'templateId', type: STRING, name: '模板ID', placeholder: '请输入模板ID' }
       ]
     }
@@ -106,8 +97,8 @@ export default {
     },
     sync () {
       this.$confirm({
-        title: '保存',
-        content: '是否保存该流程图',
+        title: '同步',
+        content: '是否同步消息模板',
         okText: '确定',
         cancelText: '取消',
         onOk: () => {
-- 
Gitee


From 93207ccd3adcd663c28a68fc9e241c3e300e393a Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Thu, 27 Oct 2022 23:26:06 +0800
Subject: [PATCH 11/16] =?UTF-8?q?style=20=E6=B3=A8=E9=87=8A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=92=8C=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/third/wechat/menu/WeChatMenuDesign.vue  | 6 +++---
 src/views/modules/third/wechat/menu/edit/WxMenuDesign.vue | 8 ++------
 .../modules/third/wechat/menu/edit/WxMenuDetailEditor.vue | 1 -
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/third/wechat/menu/WeChatMenuDesign.vue b/src/views/modules/third/wechat/menu/WeChatMenuDesign.vue
index fa0cce7..b123992 100644
--- a/src/views/modules/third/wechat/menu/WeChatMenuDesign.vue
+++ b/src/views/modules/third/wechat/menu/WeChatMenuDesign.vue
@@ -10,7 +10,7 @@
     destroy-on-close
   >
     <a-spin :spinning="confirmLoading">
-      <wx-menu-editor
+      <wx-menu-design
         :showable="showable"
         v-model="form.menuInfo"
       />
@@ -23,13 +23,13 @@
 </template>
 
 <script>
-import WxMenuEditor from '@/views/modules/third/wechat/menu/edit/WxMenuDesign'
+import WxMenuDesign from '@/views/modules/third/wechat/menu/edit/WxMenuDesign'
 import { FormMixin } from '@/mixins/FormMixin'
 import { get, update } from '@/api/third/weChatMenu'
 
 export default {
   name: 'WeChatMenuDesign',
-  components: { WxMenuEditor },
+  components: { WxMenuDesign },
   mixins: [FormMixin],
   data () {
     return {
diff --git a/src/views/modules/third/wechat/menu/edit/WxMenuDesign.vue b/src/views/modules/third/wechat/menu/edit/WxMenuDesign.vue
index 7ad1e3b..87d832c 100644
--- a/src/views/modules/third/wechat/menu/edit/WxMenuDesign.vue
+++ b/src/views/modules/third/wechat/menu/edit/WxMenuDesign.vue
@@ -65,7 +65,7 @@ export default {
     prop: 'menu'
   },
   props: {
-    // 查询条件
+    // 菜单信息
     menu: {
       type: Object,
       default: () => {
@@ -110,7 +110,6 @@ export default {
       } else {
         this.currentMenuTyp = MenuTypeMain
       }
-      console.log(menu)
       this.currentMenu = menu
       this.currentSubMenuIndex = -1
       this.currentMenuIndex = i
@@ -214,10 +213,7 @@ export default {
           }
         }
       })
-    },
-  },
-  mounted () {
-    console.log(this.showable)
+    }
   }
 }
 </script>
diff --git a/src/views/modules/third/wechat/menu/edit/WxMenuDetailEditor.vue b/src/views/modules/third/wechat/menu/edit/WxMenuDetailEditor.vue
index 75204e9..c889155 100644
--- a/src/views/modules/third/wechat/menu/edit/WxMenuDetailEditor.vue
+++ b/src/views/modules/third/wechat/menu/edit/WxMenuDetailEditor.vue
@@ -108,7 +108,6 @@ export default {
         this.menuTypeChange(newV)
       },
       immediate: true
-
     }
   },
   data () {
-- 
Gitee


From 9877f8ac6bab9e22f76ad7bc982ffe58cb1c3d9d Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Fri, 28 Oct 2022 16:49:09 +0800
Subject: [PATCH 12/16] =?UTF-8?q?doc=20=E6=B3=A8=E9=87=8A=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/api/system/client.js      | 2 +-
 src/api/system/loginType.js   | 2 +-
 src/views/login/UserLogin.vue | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/api/system/client.js b/src/api/system/client.js
index 06df75b..bb095b4 100644
--- a/src/api/system/client.js
+++ b/src/api/system/client.js
@@ -81,4 +81,4 @@ export function existsByCodeNotId (code, id) {
     method: 'GET',
     params: { code, id }
   })
-}
\ No newline at end of file
+}
diff --git a/src/api/system/loginType.js b/src/api/system/loginType.js
index 9bfefa0..686c7fe 100644
--- a/src/api/system/loginType.js
+++ b/src/api/system/loginType.js
@@ -57,7 +57,7 @@ export function findAll () {
 }
 
 /**
- * 根据code获取终端信息
+ * 根据code获取登录方式
  */
 export function findByCode (code) {
   return axios({
diff --git a/src/views/login/UserLogin.vue b/src/views/login/UserLogin.vue
index 6f88cf9..b9ac3c2 100644
--- a/src/views/login/UserLogin.vue
+++ b/src/views/login/UserLogin.vue
@@ -32,7 +32,7 @@
       </a-input-password>
     </a-form-model-item>
 
-    <a-row :span="24" v-if="client.captcha">
+    <a-row :span="24" v-if="loginType.captcha">
       <a-col :span="16">
         <a-form-model-item prop="captcha">
           <a-input
@@ -94,7 +94,7 @@ export default {
         value: '',
         len: 4
       },
-      client: {
+      loginType: {
         captcha: false,
         enable: true
       },
@@ -108,9 +108,10 @@ export default {
   methods: {
     ...mapActions(['Login', 'Logout']),
     init () {
+      // 获取登录方式
       findByCode(this.form.loginType).then(res => {
-        this.client = res.data || {}
-        if (this.client && this.client.captcha && this.client.enable) {
+        this.loginType = res.data || {}
+        if (this.loginType && this.loginType.captcha && this.loginType.enable) {
           this.getCaptcha()
         }
       })
-- 
Gitee


From 40eee1df6e28989c2d539978a43ba2f3b1663400 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sat, 29 Oct 2022 22:24:45 +0800
Subject: [PATCH 13/16] =?UTF-8?q?perf=20=E6=90=9C=E7=B4=A2=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RoleSelectModal/BRoleSelectModal.vue      | 34 +++----
 .../UserSelectModal/BUserSelectModal.vue      | 34 +++----
 .../packages/UploadImg/uploadImg.vue          | 98 +++++++++----------
 .../demo/data/perm/DataPermDemoList.vue       | 42 +++-----
 .../channel/alipay/AliPayConfigList.vue       | 34 +++----
 .../channel/wechat/WeChatConfigList.vue       | 44 +++------
 .../payment/notify/PayNotifyRecordList.vue    | 68 ++++++-------
 .../payment/order/payment/PaymentList.vue     | 14 ++-
 .../payment/wallet/list/UserSelectModal.vue   | 38 +++----
 .../starter/log/DataVersionLogList.vue        | 36 +++----
 .../starter/quartz/QuartzJobLogList.vue       | 34 +++----
 src/views/modules/system/user/UserList.vue    | 34 +++----
 .../dingtalk/config/DingTalkConfigList.vue    | 36 +++----
 .../dingtalk/robot/DingRobotConfigList.vue    | 40 +++-----
 .../wecom/robot/WeComRobotConfigList.vue      | 39 +++-----
 15 files changed, 254 insertions(+), 371 deletions(-)

diff --git a/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue b/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue
index 65d5b60..77f091a 100644
--- a/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue
+++ b/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue
@@ -10,26 +10,13 @@
   >
     <vxe-toolbar>
       <template #buttons>
-        <div class="table-page-search-wrapper">
-          <a-form layout="inline">
-            <a-row :gutter="12">
-              <a-col :md="8" :sm="12">
-                <a-form-item label="名称">
-                  <a-input v-model="queryParam.name" placeholder="输入角色名称" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="12">
-                <a-form-item label="账号">
-                  <a-input v-model="queryParam.code" placeholder="输入角色编码" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-button type="primary" @click="queryPage">查询</a-button>
-                <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
-              </a-col>
-            </a-row>
-          </a-form>
-        </div>
+        <b-query
+          v-model="queryParam"
+          :fields="fields"
+          :default-item-md="8"
+          @query="query"
+          @reset="() => queryParam = {}"
+        />
       </template>
     </vxe-toolbar>
     <vxe-table
@@ -64,6 +51,7 @@
 <script>
 import { TableMixin } from '@/mixins/TableMixin'
 import { page } from '@/api/system/role'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'RoleSelectModel',
@@ -104,7 +92,11 @@ export default {
       queryParam: {
         code: '',
         name: ''
-      }
+      },
+      fields: [
+        { field: 'name', type: STRING, name: '名称', placeholder: '请输入角色名称' },
+        { field: 'code', type: STRING, name: '编号', placeholder: '请输入角色编号' }
+      ]
     }
   },
   methods: {
diff --git a/src/components/Bootx/UserSelectModal/BUserSelectModal.vue b/src/components/Bootx/UserSelectModal/BUserSelectModal.vue
index 67d9497..90a3f62 100644
--- a/src/components/Bootx/UserSelectModal/BUserSelectModal.vue
+++ b/src/components/Bootx/UserSelectModal/BUserSelectModal.vue
@@ -10,26 +10,13 @@
   >
     <vxe-toolbar>
       <template #buttons>
-        <div class="table-page-search-wrapper">
-          <a-form layout="inline">
-            <a-row :gutter="12">
-              <a-col :md="8" :sm="12">
-                <a-form-item label="名称">
-                  <a-input v-model="queryParam.name" placeholder="输入用户名称" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="12">
-                <a-form-item label="账号">
-                  <a-input v-model="queryParam.username" placeholder="输入用户账号" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-button type="primary" @click="queryPage">查询</a-button>
-                <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
-              </a-col>
-            </a-row>
-          </a-form>
-        </div>
+        <b-query
+          v-model="queryParam"
+          :fields="fields"
+          :default-item-md="8"
+          @query="query"
+          @reset="() => queryParam = {}"
+        />
       </template>
     </vxe-toolbar>
     <vxe-table
@@ -64,6 +51,7 @@
 <script>
 import { page } from '@/api/system/user'
 import { TableMixin } from '@/mixins/TableMixin'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'BUserSelectModal',
@@ -104,7 +92,11 @@ export default {
       queryParam: {
         name: '',
         username: ''
-      }
+      },
+      fields: [
+        { field: 'name', type: STRING, name: '账号', placeholder: '输入用户名称' },
+        { field: 'username', type: STRING, name: '账号', placeholder: '输入用户账号' }
+      ]
     }
   },
   methods: {
diff --git a/src/components/KFormDesign/packages/UploadImg/uploadImg.vue b/src/components/KFormDesign/packages/UploadImg/uploadImg.vue
index b17b3e9..69bd1c5 100644
--- a/src/components/KFormDesign/packages/UploadImg/uploadImg.vue
+++ b/src/components/KFormDesign/packages/UploadImg/uploadImg.vue
@@ -57,22 +57,22 @@
  * description 上传图片组件
  */
 export default {
-  name: "KUploadImg",
+  name: 'KUploadImg',
   // eslint-disable-next-line vue/require-prop-types
-  props: ["record", "value", "config", "parentDisabled"],
-  data() {
+  props: ['record', 'value', 'config', 'parentDisabled'],
+  data () {
     return {
       fileList: [],
       previewVisible: false,
-      previewImageUrl: ""
-    };
+      previewImageUrl: ''
+    }
   },
   watch: {
     value: {
       // value 需要深度监听及默认先执行handler函数
-      handler(val) {
+      handler (val) {
         if (val) {
-          this.setFileList();
+          this.setFileList()
         }
       },
       immediate: true,
@@ -80,89 +80,89 @@ export default {
     }
   },
   computed: {
-    optionsData() {
+    optionsData () {
       try {
-        return JSON.parse(this.record.options.data);
+        return JSON.parse(this.record.options.data)
       } catch (err) {
-        console.error(err);
-        return {};
+        console.error(err)
+        return {}
       }
     }
   },
   methods: {
-    setFileList() {
+    setFileList () {
       // 当传入value改变时，fileList也要改变
       // 如果传入的值为字符串，则转成json
-      if (typeof this.value === "string") {
-        this.fileList = JSON.parse(this.value);
+      if (typeof this.value === 'string') {
+        this.fileList = JSON.parse(this.value)
         // 将转好的json覆盖组件默认值的字符串
-        this.handleSelectChange();
+        this.handleSelectChange()
       } else {
-        this.fileList = this.value;
+        this.fileList = this.value
       }
     },
-    handleSelectChange() {
+    handleSelectChange () {
       setTimeout(() => {
         const arr = this.fileList.map(item => {
-          if (typeof item.response !== "undefined") {
-            const res = item.response;
+          if (typeof item.response !== 'undefined') {
+            const res = item.response
             return {
-              type: "img",
+              type: 'img',
               name: item.name,
               status: item.status,
               uid: item.uid,
-              url: res.data.url || ""
-            };
+              url: res.data.url || ''
+            }
           } else {
             return {
-              type: "img",
+              type: 'img',
               name: item.name,
               status: item.status,
               uid: item.uid,
-              url: item.url || ""
-            };
+              url: item.url || ''
+            }
           }
-        });
+        })
 
-        this.$emit("change", arr);
-        this.$emit("input", arr);
-      }, 10);
+        this.$emit('change', arr)
+        this.$emit('input', arr)
+      }, 10)
     },
-    handlePreview(file) {
+    handlePreview (file) {
       // 预览图片
-      this.previewImageUrl = file.url || file.thumbUrl;
-      this.previewVisible = true;
+      this.previewImageUrl = file.url || file.thumbUrl
+      this.previewVisible = true
     },
-    handleCancel() {
+    handleCancel () {
       // 取消操作
-      this.previewVisible = false;
+      this.previewVisible = false
     },
-    remove() {
-      this.handleSelectChange();
+    remove () {
+      this.handleSelectChange()
     },
-    beforeUpload(e, files) {
+    beforeUpload (e, files) {
       if (files.length + this.fileList.length > this.record.options.limit) {
-        this.$message.warning(`最大上传数量为${this.record.options.limit}`);
-        files.splice(this.record.options.limit - this.fileList.length);
+        this.$message.warning(`最大上传数量为${this.record.options.limit}`)
+        files.splice(this.record.options.limit - this.fileList.length)
       }
     },
-    handleChange(info) {
+    handleChange (info) {
       // 上传数据改变时
-      this.fileList = info.fileList;
-      if (info.file.status === "done") {
-        const res = info.file.response;
+      this.fileList = info.fileList
+      if (info.file.status === 'done') {
+        const res = info.file.response
         if (res.code === 0) {
-          this.handleSelectChange();
+          this.handleSelectChange()
         } else {
-          this.fileList.pop();
-          this.$message.error(`图片上传失败`);
+          this.fileList.pop()
+          this.$message.error(`图片上传失败`)
         }
-      } else if (info.file.status === "error") {
-        this.$message.error(`图片上传失败`);
+      } else if (info.file.status === 'error') {
+        this.$message.error(`图片上传失败`)
       }
     }
   }
-};
+}
 </script>
 <style lang="less">
 .upload-img-box-9136076486841527 {
diff --git a/src/views/modules/demo/data/perm/DataPermDemoList.vue b/src/views/modules/demo/data/perm/DataPermDemoList.vue
index 64fed2e..9c038e4 100644
--- a/src/views/modules/demo/data/perm/DataPermDemoList.vue
+++ b/src/views/modules/demo/data/perm/DataPermDemoList.vue
@@ -1,32 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="名称">
-              <a-input v-model="queryParam.name" placeholder="" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="创建人">
-              <a-input v-model="queryParam.creatorName" placeholder="" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="备注">
-              <a-input v-model="queryParam.remark" placeholder="" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-space>
-              <a-button type="primary" @click="query">查询</a-button>
-              <a-button @click="() => this.queryParam = {}">重置</a-button>
-            </a-space>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="6"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -87,6 +67,7 @@
 import { TableMixin } from '@/mixins/TableMixin'
 import { del, page } from '@/api/demo/dataPermDemo'
 import DataPermDemoEdit from './DataPermDemoEdit'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'DataPermDemoList',
@@ -100,7 +81,12 @@ export default {
         name: '',
         creatorName: '',
         remark: ''
-      }
+      },
+      fields: [
+        { field: 'name', type: STRING, name: '名称', placeholder: '请输入名称' },
+        { field: 'creatorName', type: STRING, name: '创建人', placeholder: '请输入创建人' },
+        { field: 'remark', type: STRING, name: '备注', placeholder: '请输入备注' }
+      ]
     }
   },
   methods: {
diff --git a/src/views/modules/payment/channel/alipay/AliPayConfigList.vue b/src/views/modules/payment/channel/alipay/AliPayConfigList.vue
index 5ad7aa6..c032ad2 100644
--- a/src/views/modules/payment/channel/alipay/AliPayConfigList.vue
+++ b/src/views/modules/payment/channel/alipay/AliPayConfigList.vue
@@ -1,25 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form-model :model="queryParam" layout="inline">
-        <a-row :gutter="24">
-          <a-col :md="8" :sm="24">
-            <a-form-model-item label="名称" prop="jobClassName">
-              <a-input placeholder="请输入名称" v-model="queryParam.name"></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-form-model-item label="AppId" prop="appId">
-              <a-input placeholder="请输入AppId" v-model="queryParam.appId"></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-button type="primary" @click="query">查询</a-button>
-            <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="8"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -108,6 +95,7 @@
 import { TableMixin } from '@/mixins/TableMixin'
 import AliPayConfigEdit from './AliPayConfigEdit'
 import { page, del, setUpActivity, clearActivity } from '@/api/payment/alipayConfig'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'AliPayConfigList',
@@ -120,7 +108,11 @@ export default {
       queryParam: {
         name: '',
         appId: ''
-      }
+      },
+      fields: [
+        { field: 'name', type: STRING, name: '名称', placeholder: '请输入名称' },
+        { field: 'appId', type: STRING, name: 'AppId', placeholder: '请输入AppId' }
+      ]
     }
   },
   methods: {
diff --git a/src/views/modules/payment/channel/wechat/WeChatConfigList.vue b/src/views/modules/payment/channel/wechat/WeChatConfigList.vue
index a1dff36..c00a4d5 100644
--- a/src/views/modules/payment/channel/wechat/WeChatConfigList.vue
+++ b/src/views/modules/payment/channel/wechat/WeChatConfigList.vue
@@ -1,30 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form-model layout="inline">
-        <a-row :gutter="24">
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="名称">
-              <a-input placeholder="请输入名称" v-model="queryParam.name"></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="AppId">
-              <a-input placeholder="请输入AppId" v-model="queryParam.appId"></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="商户号">
-              <a-input placeholder="请输入商户号" v-model="queryParam.mchId"></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="query">查询</a-button>
-            <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="6"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -115,6 +97,7 @@
 import { TableMixin } from '@/mixins/TableMixin'
 import { clearActivity, del, page, setUpActivity } from '@/api/payment/wechatPayConfig'
 import WeChatConfigEdit from './WeChatConfigEdit'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 export default {
   name: 'WeChatConfigList',
   mixins: [TableMixin],
@@ -125,9 +108,14 @@ export default {
     return {
       queryParam: {
         name: '',
-        appId: '',
-        mchId: ''
-      }
+        mchId: '',
+        appId: ''
+      },
+      fields: [
+        { field: 'name', type: STRING, name: '名称', placeholder: '请输入名称' },
+        { field: 'appId', type: STRING, name: 'AppId', placeholder: '请输入AppId' },
+        { field: 'mchId', type: STRING, name: '商户号', placeholder: '请输入商户号' }
+      ]
     }
   },
   methods: {
diff --git a/src/views/modules/payment/notify/PayNotifyRecordList.vue b/src/views/modules/payment/notify/PayNotifyRecordList.vue
index 13b07b8..e02cef2 100644
--- a/src/views/modules/payment/notify/PayNotifyRecordList.vue
+++ b/src/views/modules/payment/notify/PayNotifyRecordList.vue
@@ -1,43 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="支付单号">
-              <a-input v-model="queryParam.paymentId" placeholder="请输入支付单号" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="支付通道">
-              <a-select
-                allowClear
-                v-model="queryParam.payChannel"
-                placeholder="选择支付通道"
-                :options="asyncPayChannel"
-              >
-              </a-select>
-            </a-form-item>
-          </a-col><a-col :md="6" :sm="24">
-            <a-form-item label="处理状态">
-              <a-select
-                allowClear
-                v-model="queryParam.status"
-                placeholder="选择消息处理状态"
-                :options="payNotifyProcess"
-              >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-space>
-              <a-button type="primary" @click="query">查询</a-button>
-              <a-button @click="resetQuery">重置</a-button>
-            </a-space>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="6"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -90,6 +59,7 @@
 import { page, del } from '@/api/payment/payNotifyRecord'
 import PayNotifyRecordEdit from './PayNotifyRecordInfo'
 import { TableMixin } from '@/mixins/TableMixin'
+import { LIST, STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 export default {
   name: 'PayNotifyRecordList',
   components: {
@@ -107,6 +77,28 @@ export default {
       }
     }
   },
+  computed: {
+    fields () {
+      return [
+        { field: 'paymentId', type: STRING, name: '支付单号', placeholder: '请输入支付单号' },
+        {
+          field: 'payChannel',
+          type: LIST,
+          name: '支付通道',
+          placeholder: '请选择支付通道',
+          list: this.asyncPayChannel
+        },
+        {
+          field: 'status',
+          type: LIST,
+          name: '处理状态',
+          placeholder: '请选择消息处理状态',
+          list: this.payNotifyProcess
+        }
+      ]
+    }
+
+  },
   methods: {
     init () {
       this.loading = true
diff --git a/src/views/modules/payment/order/payment/PaymentList.vue b/src/views/modules/payment/order/payment/PaymentList.vue
index b7c5333..802f008 100644
--- a/src/views/modules/payment/order/payment/PaymentList.vue
+++ b/src/views/modules/payment/order/payment/PaymentList.vue
@@ -1,5 +1,12 @@
 <template>
   <a-card :bordered="false">
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="8"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <div class="table-page-search-wrapper" >
       <a-form layout="inline">
         <a-row :gutter="10">
@@ -145,7 +152,12 @@ export default {
         paymentId: '',
         businessId: '',
         title: ''
-      }
+      },
+      fields: [
+        { field: 'paymentId', type: STRING, name: '支付单号', placeholder: '请输入支付单号' },
+        { field: 'businessId', type: STRING, name: '业务ID', placeholder: '请输入业务ID' },
+        { field: 'title', type: STRING, name: '标题', placeholder: '请输入标题' }
+      ]
     }
   },
   computed: {
diff --git a/src/views/modules/payment/wallet/list/UserSelectModal.vue b/src/views/modules/payment/wallet/list/UserSelectModal.vue
index d0d1c10..c71dc70 100644
--- a/src/views/modules/payment/wallet/list/UserSelectModal.vue
+++ b/src/views/modules/payment/wallet/list/UserSelectModal.vue
@@ -10,26 +10,13 @@
   >
     <vxe-toolbar>
       <template #buttons>
-        <div class="table-page-search-wrapper">
-          <a-form layout="inline">
-            <a-row :gutter="12">
-              <a-col :md="8" :sm="12">
-                <a-form-item label="名称">
-                  <a-input v-model="queryParam.name" placeholder="" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="12">
-                <a-form-item label="账号">
-                  <a-input v-model="queryParam.username" placeholder="" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
-                <a-button type="primary" @click="queryPage">查询</a-button>
-                <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
-              </a-col>
-            </a-row>
-          </a-form>
-        </div>
+        <b-query
+          v-model="queryParam"
+          :fields="fields"
+          :default-item-md="8"
+          @query="query"
+          @reset="() => queryParam = {}"
+        />
       </template>
     </vxe-toolbar>
     <vxe-table
@@ -63,6 +50,7 @@
 <script>
 import { TableMixin } from '@/mixins/TableMixin'
 import { pageByNotWallet } from '@/api/payment/wallet'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'UserSelectModal',
@@ -71,9 +59,13 @@ export default {
     return {
       visible: false,
       queryParam: {
-        code: '',
-        name: ''
-      }
+        name: '',
+        username: ''
+      },
+      fields: [
+        { field: 'name', type: STRING, name: '账号', placeholder: '输入用户名称' },
+        { field: 'username', type: STRING, name: '账号', placeholder: '输入用户账号' }
+      ]
     }
   },
   methods: {
diff --git a/src/views/modules/starter/log/DataVersionLogList.vue b/src/views/modules/starter/log/DataVersionLogList.vue
index 4c0c686..450cdef 100644
--- a/src/views/modules/starter/log/DataVersionLogList.vue
+++ b/src/views/modules/starter/log/DataVersionLogList.vue
@@ -1,27 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="数据名称">
-              <a-input v-model="queryParam.dataName" placeholder="" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-form-item label="数据主键">
-              <a-input v-model="queryParam.dataId" placeholder="" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-space>
-              <a-button type="primary" @click="query">查询</a-button>
-              <a-button @click="() => this.queryParam = {}">重置</a-button>
-            </a-space>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="8"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -64,6 +49,7 @@
 import { TableMixin } from '@/mixins/TableMixin'
 import { dataVersionPage } from '@/api/starter/log'
 import DataVersionLogInfo from './DataVersionLogInfo'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'DataVersionLogList',
@@ -77,7 +63,11 @@ export default {
       queryParam: {
         dataName: '',
         dataId: ''
-      }
+      },
+      fields: [
+        { field: 'dataName', type: STRING, name: '数据名称', placeholder: '请输入数据名称' },
+        { field: 'dataId', type: STRING, name: '数据主键', placeholder: '请输入数据主键' }
+      ]
     }
   },
   methods: {
diff --git a/src/views/modules/starter/quartz/QuartzJobLogList.vue b/src/views/modules/starter/quartz/QuartzJobLogList.vue
index 1786a8b..961d943 100644
--- a/src/views/modules/starter/quartz/QuartzJobLogList.vue
+++ b/src/views/modules/starter/quartz/QuartzJobLogList.vue
@@ -8,29 +8,13 @@
     @close="handleCancel"
     :visible="visible"
   >
-    <div class="table-page-search-wrapper">
-      <a-form-model :model="queryParam" layout="inline">
-        <a-row :gutter="24">
-          <a-col :md="8" :sm="24">
-            <a-form-model-item label="执行状态">
-              <a-select
-                allowClear
-                style="width: 220px"
-                v-model="queryParam.success"
-                placeholder="请选择状态"
-              >
-                <a-select-option value="true">成功</a-select-option>
-                <a-select-option value="false">失败</a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-button type="primary" @click="query">查询</a-button>
-            <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="8"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -74,6 +58,7 @@
 import { TableMixin } from '@/mixins/TableMixin'
 import { logPage } from '@/api/starter/quartz'
 import TemplateEdit from '@/views/modules/notice/template/TemplateEdit'
+import { LIST } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'QuartzJobLogList',
@@ -86,6 +71,9 @@ export default {
       queryParam: {
         success: undefined
       },
+      fields: [
+      { field: 'success', type: LIST, name: '执行状态', placeholder: '请选择执行状态', list: [{ label: '成功', value: 'true' }, { label: '失败', value: 'false' }] }
+    ],
       visible: false,
       className: ''
     }
diff --git a/src/views/modules/system/user/UserList.vue b/src/views/modules/system/user/UserList.vue
index cc63723..b25a0fb 100644
--- a/src/views/modules/system/user/UserList.vue
+++ b/src/views/modules/system/user/UserList.vue
@@ -1,25 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="账号">
-              <a-input v-model="queryParam.username" placeholder="请输入要查询的账号"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-form-item label="姓名">
-              <a-input v-model="queryParam.name" placeholder="请输入要查询的姓名"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-button type="primary" @click="query">查询</a-button>
-            <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="8"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -155,6 +142,7 @@ import UserEdit from './UserEdit'
 import UserShow from './UserShow'
 import UserResetPassword from './UserResetPassword'
 import { TableMixin } from '@/mixins/TableMixin'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'UserList',
@@ -180,7 +168,11 @@ export default {
       queryParam: {
         account: '',
         name: ''
-      }
+      },
+      fields: [
+        { field: 'username', type: STRING, name: '账号', placeholder: '请输入要查询的账号' },
+        { field: 'name', type: STRING, name: '姓名', placeholder: '请输入要查询的姓名' }
+      ]
     }
   },
   methods: {
diff --git a/src/views/modules/third/dingtalk/config/DingTalkConfigList.vue b/src/views/modules/third/dingtalk/config/DingTalkConfigList.vue
index 48207ba..2e8e27f 100644
--- a/src/views/modules/third/dingtalk/config/DingTalkConfigList.vue
+++ b/src/views/modules/third/dingtalk/config/DingTalkConfigList.vue
@@ -1,27 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="名称">
-              <a-input v-model="queryParam.name" placeholder="请输入钉钉配置名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="AppKey">
-              <a-input v-model="queryParam.appKey" placeholder="请输入钉钉AppKey" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-space>
-              <a-button type="primary" @click="query">查询</a-button>
-              <a-button @click="resetQuery">重置</a-button>
-            </a-space>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="8"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -99,6 +84,7 @@
 import { TableMixin } from '@/mixins/TableMixin'
 import DingTalkConfigEdit from './DingTalkConfigEdit'
 import { page, del, setEnable, clearEnable } from '@/api/third/dingTalkConfig'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'DingTalkConfigList',
@@ -111,7 +97,11 @@ export default {
       queryParam: {
         name: '',
         appKey: ''
-      }
+      },
+      fields: [
+        { field: 'name', type: STRING, name: '名称', placeholder: '请输入钉钉配置名称' },
+        { field: 'appKey', type: STRING, name: 'AccessToken', placeholder: '请输入钉钉AppKey' }
+      ]
     }
   },
   methods: {
diff --git a/src/views/modules/third/dingtalk/robot/DingRobotConfigList.vue b/src/views/modules/third/dingtalk/robot/DingRobotConfigList.vue
index 42dfb4c..1d13534 100644
--- a/src/views/modules/third/dingtalk/robot/DingRobotConfigList.vue
+++ b/src/views/modules/third/dingtalk/robot/DingRobotConfigList.vue
@@ -1,30 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="编号">
-              <a-input v-model="queryParam.code" placeholder="编号" allowClear/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="名称">
-              <a-input v-model="queryParam.name" placeholder="名称" allowClear/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="AccessToken">
-              <a-input v-model="queryParam.accessToken" placeholder="AccessToken" allowClear/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="query">查询</a-button>
-            <a-button style="margin-left: 8px" @click="() => this.queryParam = {}">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="6"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -88,6 +70,7 @@
 import { TableMixin } from '@/mixins/TableMixin'
 import { del, page } from '@/api/third/dingRobotConfig'
 import DingRobotConfigEdit from './DingRobotConfigEdit'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'DingRobotConfigList',
@@ -101,7 +84,12 @@ export default {
         code: '',
         name: '',
         accessToken: ''
-      }
+      },
+      fields: [
+        { field: 'code', type: STRING, name: '编号', placeholder: '请输入编号' },
+        { field: 'name', type: STRING, name: '名称', placeholder: '请输入名称' },
+        { field: 'accessToken', type: STRING, name: 'AccessToken', placeholder: '请输入AccessToken' }
+      ]
     }
   },
   methods: {
diff --git a/src/views/modules/third/wecom/robot/WeComRobotConfigList.vue b/src/views/modules/third/wecom/robot/WeComRobotConfigList.vue
index 3a2442a..3e6e17c 100644
--- a/src/views/modules/third/wecom/robot/WeComRobotConfigList.vue
+++ b/src/views/modules/third/wecom/robot/WeComRobotConfigList.vue
@@ -1,30 +1,12 @@
 <template>
   <a-card >
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="6" :sm="24">
-            <a-form-item>
-              <a-input v-model="queryParam.code" placeholder="编码" allowClear/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24" >
-            <a-form-item>
-              <a-input v-model="queryParam.name" placeholder="名称" allowClear/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item >
-              <a-input v-model="queryParam.accessToken" placeholder="AccessToken" allowClear/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="query">查询</a-button>
-            <a-button style="margin-left: 8px" @click="() => this.queryParam = {}">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="6"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -79,6 +61,7 @@
 import { TableMixin } from '@/mixins/TableMixin'
 import WecomRobotConfigEdit from './WecomRobotConfigEdit'
 import { del, page } from '@/api/third/weComRobotConfig'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'WeComRobotConfigList',
@@ -91,6 +74,12 @@ export default {
         name: '',
         accessToken: ''
       }
+      ,
+      fields: [
+        { field: 'code', type: STRING, name: '编号', placeholder: '请输入编号' },
+        { field: 'name', type: STRING, name: '名称', placeholder: '请输入名称' },
+        { field: 'accessToken', type: STRING, name: 'AccessToken', placeholder: '请输入AccessToken' }
+      ]
     }
   },
   methods: {
-- 
Gitee


From 31cd0eac8429d2047a7479b686a13c2ec23e024b Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sun, 30 Oct 2022 09:24:08 +0800
Subject: [PATCH 14/16] =?UTF-8?q?perf=20=E6=90=9C=E7=B4=A2=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/goods/brand/BrandList.vue   | 30 +++++-------
 src/views/modules/goods/goods/GoodsList.vue   | 30 +++++-------
 .../modules/goods/spec/SpecificationList.vue  | 23 ++++-----
 .../payment/order/payment/PaymentList.vue     | 29 +-----------
 .../payment/order/refund/RefundRecordList.vue | 47 +++++++------------
 .../modules/payment/voucher/VoucherList.vue   | 36 +++++---------
 .../payment/wallet/list/WalletList.vue        | 36 +++++---------
 7 files changed, 79 insertions(+), 152 deletions(-)

diff --git a/src/views/modules/goods/brand/BrandList.vue b/src/views/modules/goods/brand/BrandList.vue
index 8dae76f..a4c280c 100644
--- a/src/views/modules/goods/brand/BrandList.vue
+++ b/src/views/modules/goods/brand/BrandList.vue
@@ -1,22 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="查询">
-              <a-input v-model="queryParam.name" allow-clear placeholder="请输入品牌名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-space>
-              <a-button type="primary" @click="query">查询</a-button>
-              <a-button @click="resetQuery">重置</a-button>
-            </a-space>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="8"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -78,6 +68,7 @@
   import { page, del } from '@/api/goods/brand'
   import BrandEdit from './BrandEdit'
   import { TableMixin } from '@/mixins/TableMixin'
+  import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
   export default {
     name: 'BrandList',
     components: {
@@ -88,7 +79,10 @@
       return {
         queryParam: {
           name: ''
-        }
+        },
+        fields: [
+          { field: 'name', type: STRING, name: '品牌名称', placeholder: '请输入品牌名称' }
+        ]
       }
     },
     methods: {
diff --git a/src/views/modules/goods/goods/GoodsList.vue b/src/views/modules/goods/goods/GoodsList.vue
index 69c936d..8c79d38 100644
--- a/src/views/modules/goods/goods/GoodsList.vue
+++ b/src/views/modules/goods/goods/GoodsList.vue
@@ -1,22 +1,12 @@
 <template>
   <a-card>
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="查询">
-              <a-input v-model="queryParam.name" allow-clear placeholder="请输入商品名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-space>
-              <a-button type="primary" @click="query">查询</a-button>
-              <a-button @click="resetQuery">重置</a-button>
-            </a-space>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="6"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -77,6 +67,7 @@
 import { TableMixin } from '@/mixins/TableMixin'
 import { page } from '@/api/goods/goods'
 import GoodsEdit from './GoodsEdit'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'GoodsList',
@@ -88,7 +79,10 @@ export default {
     return {
       queryParam: {
         name: ''
-      }
+      },
+      fields: [
+        { field: 'name', type: STRING, name: '商品名称', placeholder: '请输入商品名称' }
+      ]
     }
   },
   methods: {
diff --git a/src/views/modules/goods/spec/SpecificationList.vue b/src/views/modules/goods/spec/SpecificationList.vue
index 24a9af1..6f86fcf 100644
--- a/src/views/modules/goods/spec/SpecificationList.vue
+++ b/src/views/modules/goods/spec/SpecificationList.vue
@@ -1,17 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="6" :sm="24">
-            <a-space>
-              <a-button type="primary" @click="query">查询</a-button>
-              <a-button @click="resetQuery">重置</a-button>
-            </a-space>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="6"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -82,7 +77,9 @@
     data () {
       return {
         queryParam: {
-        }
+        },
+        fields: [
+        ]
       }
     },
     methods: {
diff --git a/src/views/modules/payment/order/payment/PaymentList.vue b/src/views/modules/payment/order/payment/PaymentList.vue
index 802f008..aa42dbd 100644
--- a/src/views/modules/payment/order/payment/PaymentList.vue
+++ b/src/views/modules/payment/order/payment/PaymentList.vue
@@ -3,37 +3,10 @@
     <b-query
       v-model="queryParam"
       :fields="fields"
-      :default-item-md="8"
+      :default-item-md="6"
       @query="query"
       @reset="() => queryParam = {}"
     />
-    <div class="table-page-search-wrapper" >
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="支付单号">
-              <a-input v-model="queryParam.paymentId" placeholder="请输入支付单号" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="业务ID">
-              <a-input v-model="queryParam.businessId" placeholder="请输入业务ID" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="标题">
-              <a-input v-model="queryParam.title" placeholder="请输入标题" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-space>
-              <a-button :disabled="superQueryFlag" type="primary" @click="query">查询</a-button>
-              <a-button @click="resetQuery">重置</a-button>
-            </a-space>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
     <vxe-toolbar
       custom
       zoom
diff --git a/src/views/modules/payment/order/refund/RefundRecordList.vue b/src/views/modules/payment/order/refund/RefundRecordList.vue
index 82bb9ad..4c67c5d 100644
--- a/src/views/modules/payment/order/refund/RefundRecordList.vue
+++ b/src/views/modules/payment/order/refund/RefundRecordList.vue
@@ -1,32 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="支付记录ID">
-              <a-input v-model="queryParam.paymentId" placeholder="请输入支付记录ID" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="业务ID">
-              <a-input v-model="queryParam.businessId" placeholder="请输入业务ID" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="标题">
-              <a-input v-model="queryParam.title" placeholder="请输入标题" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-space>
-              <a-button type="primary" @click="query">查询</a-button>
-              <a-button @click="resetQuery">重置</a-button>
-            </a-space>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="6"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -39,7 +19,7 @@
       :data="tableData"
     >
       <vxe-table-column type="seq" title="序号" width="60" />
-      <vxe-table-column field="paymentId" title="支付记录ID">
+      <vxe-table-column field="paymentId" title="支付记录单号">
         <template v-slot="{row}">
           <a @click="showPayment(row.paymentId)">
             {{ row.paymentId }}
@@ -81,6 +61,7 @@
   import RefundRecordInfo from './RefundRecordInfo'
   import { TableMixin } from '@/mixins/TableMixin'
   import PaymentInfo from '@/views/modules/payment/order/payment/PaymentInfo'
+  import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
   export default {
     name: 'RefundRecordList',
     components: {
@@ -91,7 +72,15 @@
     data () {
       return {
         queryParam: {
-        }
+          paymentId: '',
+          businessId: '',
+          title: ''
+        },
+        fields: [
+          { field: 'paymentId', type: STRING, name: '支付单号', placeholder: '请输入支付单号' },
+          { field: 'businessId', type: STRING, name: '业务ID', placeholder: '请输入业务ID' },
+          { field: 'title', type: STRING, name: '标题', placeholder: '请输入标题' }
+        ]
       }
     },
     methods: {
diff --git a/src/views/modules/payment/voucher/VoucherList.vue b/src/views/modules/payment/voucher/VoucherList.vue
index 5033fa5..6bb0f35 100644
--- a/src/views/modules/payment/voucher/VoucherList.vue
+++ b/src/views/modules/payment/voucher/VoucherList.vue
@@ -1,27 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper" >
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="卡号">
-              <a-input v-model="queryParam.cardNo" placeholder="请输入储值卡卡号" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="批次号">
-              <a-input v-model="queryParam.batchNo" placeholder="请输入批次号" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-space>
-              <a-button :disabled="superQueryFlag" type="primary" @click="query">查询</a-button>
-              <a-button @click="resetQuery">重置</a-button>
-            </a-space>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="6"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -100,6 +85,7 @@ import { TableMixin } from '@/mixins/TableMixin'
 import { lock, page, unlock } from '@/api/payment/voucher'
 import VoucherGeneration from './VoucherGeneration'
 import VoucherInfo from './VoucherInfo'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'VoucherList',
@@ -113,7 +99,11 @@ export default {
       queryParam: {
         cardNo: '',
         batchNo: ''
-      }
+      },
+      fields: [
+        { field: 'cardNo', type: STRING, name: '卡号', placeholder: '请输入储值卡卡号' },
+        { field: 'batchNo', type: STRING, name: '批次号', placeholder: '请输入批次号' }
+      ]
     }
   },
   methods: {
diff --git a/src/views/modules/payment/wallet/list/WalletList.vue b/src/views/modules/payment/wallet/list/WalletList.vue
index 6cd23f2..f12192d 100644
--- a/src/views/modules/payment/wallet/list/WalletList.vue
+++ b/src/views/modules/payment/wallet/list/WalletList.vue
@@ -1,27 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper" >
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="钱包ID">
-              <a-input v-model="queryParam.walletId" placeholder="请输入钱包ID" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="用户ID">
-              <a-input v-model="queryParam.userId" placeholder="请输入用户ID" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-space>
-              <a-button :disabled="superQueryFlag" type="primary" @click="query">查询</a-button>
-              <a-button @click="resetQuery">重置</a-button>
-            </a-space>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="6"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -96,6 +81,7 @@ import WalletInfo from './WalletInfo'
 import UserSelectModal from './UserSelectModal'
 import WalletChanger from './WalletChanger'
 import WalletLogList from './WalletLogList'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'WalletList',
@@ -111,7 +97,11 @@ export default {
       queryParam: {
         walletId: '',
         userId: ''
-      }
+      },
+      fields: [
+        { field: 'walletId', type: STRING, name: '钱包ID', placeholder: '请输入钱包ID' },
+        { field: 'userId', type: STRING, name: '用户ID', placeholder: '请输入用户ID' }
+      ]
     }
   },
   methods: {
-- 
Gitee


From a9b29e3903146e1a48528a2768ca8db5a7fe69f8 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 31 Oct 2022 14:11:16 +0800
Subject: [PATCH 15/16] =?UTF-8?q?fix=20=E5=8E=BB=E9=99=A4=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0=E5=AF=BC=E8=87=B4=E7=9A=84=E7=BB=8F?=
 =?UTF-8?q?=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/account/base/AvatarModal.vue  |  1 -
 src/views/account/base/BasicSetting.vue | 18 +++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/views/account/base/AvatarModal.vue b/src/views/account/base/AvatarModal.vue
index c95a322..08a8458 100644
--- a/src/views/account/base/AvatarModal.vue
+++ b/src/views/account/base/AvatarModal.vue
@@ -78,7 +78,6 @@ export default {
     edit (id) {
       this.visible = true
       this.id = id
-      /* 获取原始头像 */
     },
     close () {
       this.id = null
diff --git a/src/views/account/base/BasicSetting.vue b/src/views/account/base/BasicSetting.vue
index 1df0dfb..af55c98 100644
--- a/src/views/account/base/BasicSetting.vue
+++ b/src/views/account/base/BasicSetting.vue
@@ -18,7 +18,7 @@
               label="名称"
               prop="name"
             >
-              <a-input v-model="user.name" :disabled="!edit" placeholder="请输入名称"/>
+              <a-input v-model="user.name" :disabled="!editFLag" placeholder="请输入名称"/>
             </a-form-model-item>
             <a-form-model-item
               label="性别"
@@ -27,7 +27,7 @@
               <a-select
                 style="width: 100px"
                 v-model="user.sex"
-                :disabled="!edit"
+                :disabled="!editFLag"
                 placeholder="请选择性别"
               >
                 <a-select-option v-for="sex in sexList" :key="sex.code">{{ sex.name }}</a-select-option>
@@ -40,17 +40,17 @@
               <a-date-picker
                 placeholder="请选择日期"
                 valueFormat="yyyy-MM-DD"
-                :disabled="!edit"
+                :disabled="!editFLag"
                 v-model="user.birthday"/>
             </a-form-model-item>
             <a-form-model-item>
-              <a-button v-if="edit" type="primary" @click="handleOk">更新基础信息</a-button>
-              <a-button v-else @click="edit = true">编辑基础信息</a-button>
+              <a-button v-if="editFLag" type="primary" @click="handleOk">更新基础信息</a-button>
+              <a-button v-else @click="editFLag = true">编辑基础信息</a-button>
             </a-form-model-item>
           </a-form-model>
         </a-col>
         <a-col :order="1" :md="12" :lg="12" :style="{ minHeight: '180px' }">
-          <div v-if="edit" class="ant-upload-preview" @click="$refs.modal.edit(1)" >
+          <div v-if="editFLag" class="ant-upload-preview" @click="$refs.modal.edit(1)" >
             <a-icon type="cloud-upload-o" class="upload-icon"/>
             <div class="mask">
               <a-icon type="plus" />
@@ -82,7 +82,7 @@ export default {
   },
   data () {
     return {
-      edit: false,
+      editFLag: false,
       labelCol: {
         sm: { span: 3 }
       },
@@ -104,7 +104,7 @@ export default {
   },
   methods: {
     async init () {
-      this.edit = false
+      this.editFLag = false
       this.confirmLoading = true
       // 获取用户信息
       await getUserBaseInfo().then(res => {
@@ -134,7 +134,7 @@ export default {
               this.confirmLoading = true
               updateBaseInfo(this.user).then(() => {
                 this.confirmLoading = false
-                this.edit = false
+                this.editFLag = false
               })
             }
           })
-- 
Gitee


From 771068827dfaf51edb2f7472bbf972fd2bf04296 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Wed, 2 Nov 2022 21:13:22 +0800
Subject: [PATCH 16/16] =?UTF-8?q?fix=20Promise=E6=96=B9=E6=B3=95=E6=9C=AAa?=
 =?UTF-8?q?wait?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/account/security/PhoneEdit.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/account/security/PhoneEdit.vue b/src/views/account/security/PhoneEdit.vue
index 41a8eb8..32887b1 100644
--- a/src/views/account/security/PhoneEdit.vue
+++ b/src/views/account/security/PhoneEdit.vue
@@ -159,14 +159,14 @@ export default {
     /**
      * 后台校验手机号是否被使用
      */
-    validateNewPhone (rule, value, callback) {
+    async validateNewPhone (rule, value, callback) {
       if (this.currentTab !== 1) {
         callback()
         return
       }
       const { msg, result } = validateMobile(value)
       result ? callback() : callback(msg)
-      const { data } = existsPhone(value)
+      const { data } = await existsPhone(value)
       data ? callback('手机号已被使用') : callback()
     },
     /**
-- 
Gitee