diff --git a/.env.production b/.env.production
index 6a5caa4ab3984ef1cc5354977cca99ddc6e5afd6..858e41a1aa193b3a05f620c3fd2f0b5099ba032b 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/src/config/upload.js b/src/config/upload.js
index 013fd4ff461c2d5ac5d18b7a7bb8ce2e226f5568..f3745500f4320b26cc659a112b3b91a2167b3fba 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: ''
diff --git a/src/main.js b/src/main.js
index 29b9c89ed317f92d9fb41a3355c5e49d66abea25..93da4e0e3873931f560340fb2ef47d562c0ec851 100644
--- a/src/main.js
+++ b/src/main.js
@@ -42,7 +42,7 @@ app.config.globalProperties.$common = common
app.mount('#app')
-tool.capsule('MineAdmin', `v${packageJson.version} release`)
+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 af6d93797455adc956d0bec5ed847a85db8df42e..19e1fe9d0285e84e0658898670aae724b08e20a1 100644
--- a/src/views/dashboard/components/components/st-mineadmin.vue
+++ b/src/views/dashboard/components/components/st-mineadmin.vue
@@ -57,7 +57,7 @@
-
MineAdmin v{{ config.version }} release
+
MineAdmin v{{ config.version }} Release
diff --git a/src/views/login.vue b/src/views/login.vue
index 5eb831a724f54c3f789b5150d9460106bde801b3..d964995f0ebf24f4e74471ff53dc6b3b1ae9ecb0 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -46,7 +46,7 @@
-
MineAdmin
+
MineAdminRelease
---- {{ $t('sys.login.slogan') }}
diff --git a/src/views/setting/code/components/editInfo.vue b/src/views/setting/code/components/editInfo.vue
index fcddb10870622d11554700b152a8faf0b200b199..0ce55948be5a796b23ba5ccf8de0e225e33c4987 100644
--- a/src/views/setting/code/components/editInfo.vue
+++ b/src/views/setting/code/components/editInfo.vue
@@ -306,6 +306,7 @@
+
@@ -314,7 +315,7 @@
-
+
{
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/index.vue b/src/views/setting/code/index.vue
index aaa48b1e31ff6300d3c39717cdc8233014d12fbd..d131f700cc6532cb9ee8729ef8dce74ced60c5b5 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) {
diff --git a/src/views/setting/code/js/vars.js b/src/views/setting/code/js/vars.js
index ac9e7cae6eede3dc446384d58b6163ab855b3840..c931d89456c1d0249792a1036eff2ad8b1096e2a 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 = [
diff --git a/src/views/setting/systemInterface/index.vue b/src/views/setting/systemInterface/index.vue
index e5d1d60b703cfbddc6a3a585d9413c7443526a6c..fcd2bf7ee095478538763465bd4bd6505aa99b74 100644
--- a/src/views/setting/systemInterface/index.vue
+++ b/src/views/setting/systemInterface/index.vue
@@ -4,7 +4,7 @@