From 4d1a1c323542a10fb17c21412d3eb84508d141ea Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 8 Aug 2022 12:02:02 +0800
Subject: [PATCH 1/9] up

---
 src/router/homePageRoutes.js                  | 19 ++++++++++---------
 .../components/components/st-mineadmin.vue    |  2 +-
 src/views/login.vue                           |  2 +-
 src/views/setting/code/index.vue              |  2 ++
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/router/homePageRoutes.js b/src/router/homePageRoutes.js
index 40cbdbe..1b90b1e 100644
--- a/src/router/homePageRoutes.js
+++ b/src/router/homePageRoutes.js
@@ -36,16 +36,17 @@ const homePageRoutes = [
       type: 'M',
     },
     component: () => import('@/views/setting/config/index.vue'),
-  }, {
-    name: 'demo',
-    path: '/demo',
-    meta: {
-      title: '组件演示',
-      icon: 'icon-trophy',
-      type: 'M',
-    },
-    component: () => import('@/views/demo/index.vue'),
   }
+  // , {
+  //   name: 'demo',
+  //   path: '/demo',
+  //   meta: {
+  //     title: '组件演示',
+  //     icon: 'icon-trophy',
+  //     type: 'M',
+  //   },
+  //   component: () => import('@/views/demo/index.vue'),
+  // }
 ]
 
 export const homePage = {
diff --git a/src/views/dashboard/components/components/st-mineadmin.vue b/src/views/dashboard/components/components/st-mineadmin.vue
index 8868f8c..a24c2ac 100644
--- a/src/views/dashboard/components/components/st-mineadmin.vue
+++ b/src/views/dashboard/components/components/st-mineadmin.vue
@@ -57,7 +57,7 @@
       </a-card>
     </div>
     <div class="w-11/12 mx-auto mt-3">
-      <a-tag class="ml-0.5">MineAdmin v{{ config.version }} release</a-tag>
+      <a-tag class="ml-0.5">MineAdmin v{{ config.version }} Beta</a-tag>
     </div>
   </div>
 </template>
diff --git a/src/views/login.vue b/src/views/login.vue
index 5eb831a..13cb07e 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -46,7 +46,7 @@
   <div class="login-container">
     <div class="login-width mx-auto flex justify-between h-full items-center">
       <div class="w-6/12 mx-auto left-panel rounded-l pl-5 pr-5 hidden md:block bg-blue-50">
-        <div class="logo"><img src="/logo.svg" width="45"><span>MineAdmin</span></div>
+        <div class="logo"><img src="/logo.svg" width="45"><span>MineAdmin</span><i class="text-red-500 mt-4 ml-2">Beta</i></div>
         <div class="slogan flex justify-end"><span>---- {{ $t('sys.login.slogan') }}</span></div>
       </div>
 
diff --git a/src/views/setting/code/index.vue b/src/views/setting/code/index.vue
index c0fea44..b020d6c 100644
--- a/src/views/setting/code/index.vue
+++ b/src/views/setting/code/index.vue
@@ -90,6 +90,8 @@
   }
   
   const generateCode = async (ids) => {
+    Message.info('请下载部署使用此功能')
+    return
     Message.info('代码生成下载中，请稍后')
     const response = await generate.generateCode({ ids: ids.toString().split(',') })
     if (response.message && ! response.success) {
-- 
Gitee


From 9a527c53731a82ce9feee69c5da8677f619e037e Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 8 Aug 2022 12:06:42 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                          | 2 +-
 package.json                             | 2 +-
 src/views/mineDoc/components/auth.vue    | 2 +-
 src/views/mineDoc/components/docMain.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.env.production b/.env.production
index 6a5caa4..858e41a 100644
--- a/.env.production
+++ b/.env.production
@@ -2,5 +2,5 @@
 VITE_APP_ENV = production
 
 VITE_APP_BASE_URL = http://127.0.0.1:9501
-VITE_APP_WS_URL = ws://127.0.0.1:9502/message.io
+VITE_APP_WS_URL = wss://message.mineadmin.com/message.io
 VITE_APP_PROXY_PREFIX = /prod
\ No newline at end of file
diff --git a/package.json b/package.json
index eade534..716f488 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "vite serve --mode development",
     "build": "vite build",
-    "serve": "vite preview"
+    "preview": "vite preview"
   },
   "dependencies": {
     "@arco-design/web-vue": "^2.34.1",
diff --git a/src/views/mineDoc/components/auth.vue b/src/views/mineDoc/components/auth.vue
index 8853817..cf2d16c 100644
--- a/src/views/mineDoc/components/auth.vue
+++ b/src/views/mineDoc/components/auth.vue
@@ -14,7 +14,7 @@
   >
     <div class="auth-panel">
       <div class="flex text-2xl justify-center mt-5 title">
-        <img src="logo.svg" width="56" class="mr-2" />
+        <img src="/logo.svg" width="56" class="mr-2" />
         <div class="mt-0.5">Api Document</div>
       </div>
       <a-form :model="form" layout="vertical" class="mt-3 p-5" @submit="submit" ref="formRef">
diff --git a/src/views/mineDoc/components/docMain.vue b/src/views/mineDoc/components/docMain.vue
index 3690216..bf91298 100644
--- a/src/views/mineDoc/components/docMain.vue
+++ b/src/views/mineDoc/components/docMain.vue
@@ -14,7 +14,7 @@
   >
     <a-layout-header class="nav flex justify-between p-2">
       <div class="flex text-2xl">
-        <img src="logo.svg" width="54" class="mr-2" /> <span class="mt-1">API Document</span>
+        <img src="/logo.svg" width="54" class="mr-2" /> <span class="mt-1">API Document</span>
       </div>
       <a-space>
         <div
-- 
Gitee


From 1d70fb9013a9e403ef97a1c1f0a17eb232d58bd1 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 8 Aug 2022 13:19:34 +0800
Subject: [PATCH 3/9] up

---
 .../skins-thumb}/businessGray/thumb.jpg             | Bin
 .../skins => public/skins-thumb}/city/thumb.jpg     | Bin
 .../skins => public/skins-thumb}/mine/thumb.jpg     | Bin
 src/config/skins.js                                 |   6 +++---
 src/config/upload.js                                |   2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename {src/style/skins => public/skins-thumb}/businessGray/thumb.jpg (100%)
 rename {src/style/skins => public/skins-thumb}/city/thumb.jpg (100%)
 rename {src/style/skins => public/skins-thumb}/mine/thumb.jpg (100%)

diff --git a/src/style/skins/businessGray/thumb.jpg b/public/skins-thumb/businessGray/thumb.jpg
similarity index 100%
rename from src/style/skins/businessGray/thumb.jpg
rename to public/skins-thumb/businessGray/thumb.jpg
diff --git a/src/style/skins/city/thumb.jpg b/public/skins-thumb/city/thumb.jpg
similarity index 100%
rename from src/style/skins/city/thumb.jpg
rename to public/skins-thumb/city/thumb.jpg
diff --git a/src/style/skins/mine/thumb.jpg b/public/skins-thumb/mine/thumb.jpg
similarity index 100%
rename from src/style/skins/mine/thumb.jpg
rename to public/skins-thumb/mine/thumb.jpg
diff --git a/src/config/skins.js b/src/config/skins.js
index 724b6c5..e12d010 100644
--- a/src/config/skins.js
+++ b/src/config/skins.js
@@ -1,14 +1,14 @@
 export default [
   {
     name: 'mine',
-    thumb: '/src/style/skins/mine/thumb.jpg',
+    thumb: '/skins-thumb/mine/thumb.jpg',
   },
   {
     name: 'businessGray',
-    thumb: '/src/style/skins/businessGray/thumb.jpg',
+    thumb: '/skins-thumb/businessGray/thumb.jpg',
   },
   {
     name: 'city',
-    thumb: '/src/style/skins/city/thumb.jpg',
+    thumb: '/skins-thumb/city/thumb.jpg',
   }
 ]
\ No newline at end of file
diff --git a/src/config/upload.js b/src/config/upload.js
index 013fd4f..f374550 100644
--- a/src/config/upload.js
+++ b/src/config/upload.js
@@ -1,6 +1,6 @@
 export default {
   storage: {
-    LOCAL: 'http://127.0.0.1:9501',
+    LOCAL: 'https://img.mineadmin.com',
     OSS: '',
     COS: '',
     QINIU: ''
-- 
Gitee


From 00372817d04422727f250b97432a1f50a7e54640 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Sat, 13 Aug 2022 17:31:20 +0800
Subject: [PATCH 4/9] beta.2

---
 src/main.js                                                | 2 +-
 src/views/dashboard/components/components/st-mineadmin.vue | 2 +-
 src/views/login.vue                                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.js b/src/main.js
index 850eb7b..087f81d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -39,7 +39,7 @@ app.config.globalProperties.$common = common
 
 app.mount('#app')
 
-tool.capsule('MineAdmin', `v${packageJson.version} release`)
+tool.capsule('MineAdmin', `v${packageJson.version} Beta.2`)
 console.log('MineAdmin 官网  https://www.mineadmin.com')
 console.log('MineAdmin 文档  https://doc.mineadmin.com')
 console.log('MineAdmin Gitee https://gitee.com/xmo/MineAdmin')
diff --git a/src/views/dashboard/components/components/st-mineadmin.vue b/src/views/dashboard/components/components/st-mineadmin.vue
index a24c2ac..fbdb134 100644
--- a/src/views/dashboard/components/components/st-mineadmin.vue
+++ b/src/views/dashboard/components/components/st-mineadmin.vue
@@ -57,7 +57,7 @@
       </a-card>
     </div>
     <div class="w-11/12 mx-auto mt-3">
-      <a-tag class="ml-0.5">MineAdmin v{{ config.version }} Beta</a-tag>
+      <a-tag class="ml-0.5">MineAdmin v{{ config.version }} Beta.2</a-tag>
     </div>
   </div>
 </template>
diff --git a/src/views/login.vue b/src/views/login.vue
index 13cb07e..ece4950 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -46,7 +46,7 @@
   <div class="login-container">
     <div class="login-width mx-auto flex justify-between h-full items-center">
       <div class="w-6/12 mx-auto left-panel rounded-l pl-5 pr-5 hidden md:block bg-blue-50">
-        <div class="logo"><img src="/logo.svg" width="45"><span>MineAdmin</span><i class="text-red-500 mt-4 ml-2">Beta</i></div>
+        <div class="logo"><img src="/logo.svg" width="45"><span>MineAdmin</span><i class="text-red-500 mt-4 ml-2">Beta.2</i></div>
         <div class="slogan flex justify-end"><span>---- {{ $t('sys.login.slogan') }}</span></div>
       </div>
 
-- 
Gitee


From 5fd6741cc76aae6831c9513e9a63210167c25acb Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Sun, 14 Aug 2022 11:44:11 +0800
Subject: [PATCH 5/9] up

---
 src/main.js                                                | 2 +-
 src/views/dashboard/components/components/st-mineadmin.vue | 2 +-
 src/views/login.vue                                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.js b/src/main.js
index 087f81d..f39351f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -39,7 +39,7 @@ app.config.globalProperties.$common = common
 
 app.mount('#app')
 
-tool.capsule('MineAdmin', `v${packageJson.version} Beta.2`)
+tool.capsule('MineAdmin', `v${packageJson.version} RC`)
 console.log('MineAdmin 官网  https://www.mineadmin.com')
 console.log('MineAdmin 文档  https://doc.mineadmin.com')
 console.log('MineAdmin Gitee https://gitee.com/xmo/MineAdmin')
diff --git a/src/views/dashboard/components/components/st-mineadmin.vue b/src/views/dashboard/components/components/st-mineadmin.vue
index fbdb134..a120e34 100644
--- a/src/views/dashboard/components/components/st-mineadmin.vue
+++ b/src/views/dashboard/components/components/st-mineadmin.vue
@@ -57,7 +57,7 @@
       </a-card>
     </div>
     <div class="w-11/12 mx-auto mt-3">
-      <a-tag class="ml-0.5">MineAdmin v{{ config.version }} Beta.2</a-tag>
+      <a-tag class="ml-0.5">MineAdmin v{{ config.version }} RC</a-tag>
     </div>
   </div>
 </template>
diff --git a/src/views/login.vue b/src/views/login.vue
index ece4950..f71db02 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -46,7 +46,7 @@
   <div class="login-container">
     <div class="login-width mx-auto flex justify-between h-full items-center">
       <div class="w-6/12 mx-auto left-panel rounded-l pl-5 pr-5 hidden md:block bg-blue-50">
-        <div class="logo"><img src="/logo.svg" width="45"><span>MineAdmin</span><i class="text-red-500 mt-4 ml-2">Beta.2</i></div>
+        <div class="logo"><img src="/logo.svg" width="45"><span>MineAdmin</span><i class="text-red-500 mt-4 ml-2">RC</i></div>
         <div class="slogan flex justify-end"><span>---- {{ $t('sys.login.slogan') }}</span></div>
       </div>
 
-- 
Gitee


From 601ea26aac438fb2ccccb8fab8170d479298066a Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 15 Aug 2022 15:58:56 +0800
Subject: [PATCH 6/9] up

---
 src/main.js                                                | 2 +-
 src/views/dashboard/components/components/st-mineadmin.vue | 2 +-
 src/views/login.vue                                        | 2 +-
 src/views/setting/systemInterface/index.vue                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main.js b/src/main.js
index f39351f..775b887 100644
--- a/src/main.js
+++ b/src/main.js
@@ -39,7 +39,7 @@ app.config.globalProperties.$common = common
 
 app.mount('#app')
 
-tool.capsule('MineAdmin', `v${packageJson.version} RC`)
+tool.capsule('MineAdmin', `v${packageJson.version} Release`)
 console.log('MineAdmin 官网  https://www.mineadmin.com')
 console.log('MineAdmin 文档  https://doc.mineadmin.com')
 console.log('MineAdmin Gitee https://gitee.com/xmo/MineAdmin')
diff --git a/src/views/dashboard/components/components/st-mineadmin.vue b/src/views/dashboard/components/components/st-mineadmin.vue
index a120e34..1cbeb6e 100644
--- a/src/views/dashboard/components/components/st-mineadmin.vue
+++ b/src/views/dashboard/components/components/st-mineadmin.vue
@@ -57,7 +57,7 @@
       </a-card>
     </div>
     <div class="w-11/12 mx-auto mt-3">
-      <a-tag class="ml-0.5">MineAdmin v{{ config.version }} RC</a-tag>
+      <a-tag class="ml-0.5">MineAdmin v{{ config.version }} Release</a-tag>
     </div>
   </div>
 </template>
diff --git a/src/views/login.vue b/src/views/login.vue
index f71db02..d964995 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -46,7 +46,7 @@
   <div class="login-container">
     <div class="login-width mx-auto flex justify-between h-full items-center">
       <div class="w-6/12 mx-auto left-panel rounded-l pl-5 pr-5 hidden md:block bg-blue-50">
-        <div class="logo"><img src="/logo.svg" width="45"><span>MineAdmin</span><i class="text-red-500 mt-4 ml-2">RC</i></div>
+        <div class="logo"><img src="/logo.svg" width="45"><span>MineAdmin</span><i class="text-red-500 mt-4 ml-2">Release</i></div>
         <div class="slogan flex justify-end"><span>---- {{ $t('sys.login.slogan') }}</span></div>
       </div>
 
diff --git a/src/views/setting/systemInterface/index.vue b/src/views/setting/systemInterface/index.vue
index e5d1d60..6308078 100644
--- a/src/views/setting/systemInterface/index.vue
+++ b/src/views/setting/systemInterface/index.vue
@@ -4,7 +4,7 @@
 
 <script setup>
 import { ref } from 'vue'
-const url = ref(import.meta.env.VITE_APP_BASE_URL + '/swagger')
+const url = ref('http://swagger.mineadmin.com/swagger')
 </script>
 <script>
 export default { name: 'systemInterface' }
-- 
Gitee


From be4997dbc688b737f68116df746da6037d923ba8 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 15 Aug 2022 16:37:03 +0800
Subject: [PATCH 7/9] up

---
 src/views/setting/systemInterface/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/setting/systemInterface/index.vue b/src/views/setting/systemInterface/index.vue
index 6308078..fcd2bf7 100644
--- a/src/views/setting/systemInterface/index.vue
+++ b/src/views/setting/systemInterface/index.vue
@@ -4,7 +4,7 @@
 
 <script setup>
 import { ref } from 'vue'
-const url = ref('http://swagger.mineadmin.com/swagger')
+const url = ref('https://swagger.mineadmin.com/swagger')
 </script>
 <script>
 export default { name: 'systemInterface' }
-- 
Gitee


From 43082d91349458f129c0209f293127accdfafdb6 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Wed, 7 Sep 2022 15:22:02 +0800
Subject: [PATCH 8/9] =?UTF-8?q?refactor:=20=E6=90=9C=E7=B4=A2=E6=A0=8F?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=92=8C=E8=AE=BE=E7=BD=AE=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=88=A4=E6=96=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ma-crud/components/search.vue | 50 ++++++++++----------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/components/ma-crud/components/search.vue b/src/components/ma-crud/components/search.vue
index b58709c..bf7692b 100644
--- a/src/components/ma-crud/components/search.vue
+++ b/src/components/ma-crud/components/search.vue
@@ -209,35 +209,37 @@ const requestDict = (url, method, params, data, timeout = 10 * 1000) => request(
 
 const init = async () => {
   if (props.columns.length > 0) {
-    columns.value = props.columns.filter( item => item.search === true || item.dict )
+    columns.value = props.columns.filter( item => item.search === true )
   }
 
   const allowRequestFormType = ['radio', 'checkbox', 'select', 'transfer', 'treeSelect', 'tree-select', 'cascader']
   const allowCoverFormType = ['radio', 'checkbox', 'select', 'transfer']
-  if (columns.value.length > 0) {
-    isShowSearch.value = true
-    columns.value.map(async item => {
-      if (item.dataIndex && item.search) {
-        searchForm[item.dataIndex] = item.searchDefaultValue || undefined
-      }
+  if (props.columns.length > 0) {
+    isShowSearch.value = columns.value.length > 0 ? true : false
+    props.columns.map(async item => {
+      if (item.search || item.dict) {
+        if (item.dataIndex && item.search) {
+          searchForm[item.dataIndex] = item.searchDefaultValue || undefined
+        }
 
-      if (allowRequestFormType.includes(item.formType) && item.dict) {
-        if (item.dict.name) {
-          const response = await commonApi.getDict(item.dict.name)
-          if (response.data) {
-            formDictData.value[item.dataIndex] = handlerProps(allowCoverFormType, item, response.data)
-          }
-        } else if (item.dict.url) {
-          const response = await requestDict(item.dict.url, item.dict.method || 'GET', item.dict.params || {}, item.dict.body || {})
-          if (response.data) {
-            formDictData.value[item.dataIndex] = handlerProps(allowCoverFormType, item, response.data)
-          }
-        } else if (item.dict.data) {
-          if (isArray(item.dict.data)) {
-            formDictData.value[item.dataIndex] = handlerProps(allowCoverFormType, item, item.dict.data)
-          } else if (isFunction(item.dict.data)) {
-            const response = await item.dict.data()
-            formDictData.value[item.dataIndex] = handlerProps(allowCoverFormType, item, response)
+        if (allowRequestFormType.includes(item.formType) && item.dict) {
+          if (item.dict.name) {
+            const response = await commonApi.getDict(item.dict.name)
+            if (response.data) {
+              formDictData.value[item.dataIndex] = handlerProps(allowCoverFormType, item, response.data)
+            }
+          } else if (item.dict.url) {
+            const response = await requestDict(item.dict.url, item.dict.method || 'GET', item.dict.params || {}, item.dict.body || {})
+            if (response.data) {
+              formDictData.value[item.dataIndex] = handlerProps(allowCoverFormType, item, response.data)
+            }
+          } else if (item.dict.data) {
+            if (isArray(item.dict.data)) {
+              formDictData.value[item.dataIndex] = handlerProps(allowCoverFormType, item, item.dict.data)
+            } else if (isFunction(item.dict.data)) {
+              const response = await item.dict.data()
+              formDictData.value[item.dataIndex] = handlerProps(allowCoverFormType, item, response)
+            }
           }
         }
       }
-- 
Gitee


From dcb73ca93b9ce29f7cfcbba59e18c901075b7502 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Fri, 14 Oct 2022 14:00:03 +0800
Subject: [PATCH 9/9] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8=E6=96=B0=E5=A2=9E=E6=8E=92=E5=BA=8F=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/setting/code/components/editInfo.vue | 5 +++--
 src/views/setting/code/js/vars.js              | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/setting/code/components/editInfo.vue b/src/views/setting/code/components/editInfo.vue
index fcddb10..0ce5594 100644
--- a/src/views/setting/code/components/editInfo.vue
+++ b/src/views/setting/code/components/editInfo.vue
@@ -306,6 +306,7 @@
               <template #isEdit="{ rowIndex }"><a-checkbox v-model="form.columns[rowIndex].is_edit" /></template>
               <template #isList="{ rowIndex }"><a-checkbox v-model="form.columns[rowIndex].is_list" /></template>
               <template #isQuery="{ rowIndex }"><a-checkbox v-model="form.columns[rowIndex].is_query" /></template>
+              <template #isSort="{ rowIndex }"><a-checkbox v-model="form.columns[rowIndex].is_sort" /></template>
               <!-- end -->
               <!-- 查询方式 -->
               <template #queryType="{ rowIndex }">
@@ -314,7 +315,7 @@
               <!-- 组件 -->
               <template #viewType="{ record, rowIndex }">
                 <a-space>
-                  <a-select v-model="form.columns[rowIndex].view_type" :style="{ width: '180px' }" :options="vars.viewComponent" allow-clear></a-select>
+                  <a-select v-model="form.columns[rowIndex].view_type" :style="{ width: '160px' }" :options="vars.viewComponent" allow-clear></a-select>
                   <a-link
                     v-if="! notNeedSettingComponents.includes(record.view_type)"
                     @click="settingComponentRef.open(record)"
@@ -506,7 +507,6 @@ import SettingComponent from './settingComponent.vue'
 
 // 导入变量
 import * as vars from '../js/vars.js'
-import { findProp } from '@vue/compiler-core'
 
 const record = ref({})
 const loading = ref(true)
@@ -602,6 +602,7 @@ const init = () => {
       item.is_edit = item.is_edit === 2
       item.is_list = item.is_list === 2
       item.is_query = item.is_query === 2
+      item.is_sort = item.is_sort === 2
       form.value.columns.push(item)
     })
   })
diff --git a/src/views/setting/code/js/vars.js b/src/views/setting/code/js/vars.js
index ac9e7ca..c931d89 100644
--- a/src/views/setting/code/js/vars.js
+++ b/src/views/setting/code/js/vars.js
@@ -27,10 +27,11 @@ export const columns = [
   { title: '编辑', dataIndex: 'is_edit', slotName: 'isEdit', width: 80, },
   { title: '列表', dataIndex: 'is_list', slotName: 'isList', width: 80, },
   { title: '查询', dataIndex: 'is_query', slotName: 'isQuery', width: 80, },
+  { title: '排序', dataIndex: 'is_sort', slotName: 'isSort', width: 80, },
   { title: '查询方式', dataIndex: 'query_type', slotName: 'queryType', width: 180, },
-  { title: '页面控件', dataIndex: 'view_type', slotName: 'viewType', width: 260, },
-  { title: '数据字典', dataIndex: 'dict_type', slotName: 'dictType', width: 200, },
-  { title: '允许角色', dataIndex: 'allow_roles', slotName: 'allowRoles', width: 240, },
+  { title: '页面控件', dataIndex: 'view_type', slotName: 'viewType', width: 240, },
+  { title: '数据字典', dataIndex: 'dict_type', slotName: 'dictType', width: 180, },
+  { title: '允许角色', dataIndex: 'allow_roles', slotName: 'allowRoles', width: 200, },
 ]
 
 export const queryType = [
-- 
Gitee