v3.30.0 【增加】字典项增加回显样式;【优化】文件S3协议对最新minio的支持;【优化】代码生成；【优化】前端vite编译配置

Signed-off-by: 1024创新实验室 <1024lab@sina.com>

smart-admin-web-javascript/src/constants/support/dict-const.js

@@ -37,8 +37,8 @@ export const DICT_DATA_STYLE_ENUM = {
     desc: '信息',
     color: 'colorInfo',
   },
-  WARN: {
+  WARNING: {
-    value: 'warn',
+    value: 'warning',
     desc: '警告',
     color: 'colorWarning',
   },

smart-admin-web-javascript/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue

@@ -42,7 +42,7 @@
   import { JAVA_FILE_LIST, LANGUAGE_LIST, JS_FILE_LIST, TS_FILE_LIST } from '../../code-generator-util';
   import { smartSentry } from '/@/lib/smart-sentry';
   import { lineNumbersBlock } from '/@/lib/highlight-line-number';
-  import hljs from 'highlight';
+  import hljs from 'highlight.js';
   import 'highlight.js/styles/github-dark.css';
   import javascript from 'highlight.js/lib/languages/javascript';
   import typescript from 'highlight.js/lib/languages/typescript';

smart-admin-web-javascript/src/views/support/dict/components/dict-data-modal.vue

@@ -66,6 +66,10 @@
       bordered
     >
       <template #bodyCell="{ record, column }">
+        <template v-if="column.dataIndex === 'dataLabel'">
+          <span v-if="record.color" :style="{ color: token[record.color] }">{{ record.dataLabel }}</span>
+          <span v-else> {{ record.dataLabel }} </span>
+        </template>
         <template v-if="column.dataIndex === 'disabledFlag'">
           <a-switch
             @change="(checked) => handleChangeDisabled(checked, record)"
@@ -89,11 +93,14 @@
   import DictDataFormModal from './dict-data-form-modal.vue';
   import { dictApi } from '/@/api/support/dict-api';
   import { SmartLoading } from '/@/components/framework/smart-loading';
-  import { Modal } from 'ant-design-vue';
+  import { message, Modal, theme } from 'ant-design-vue';
-  import { message } from 'ant-design-vue';
   import { smartSentry } from '/@/lib/smart-sentry';
   import BooleanSelect from '/@/components/framework/boolean-select/index.vue';
   import _ from 'lodash';
+  import { DICT_DATA_STYLE_ENUM } from '/@/constants/support/dict-const';
+
+  const { useToken } = theme;
+  const { token } = useToken();
 
   // 是否展示抽屉
   const visible = ref(false);
@@ -168,7 +175,7 @@
       let keywordsFilterFlag = true;
       if (keywords.value) {
         keywordsFilterFlag =
-          (item.dataValue &&_.includes(item.dataValue.toLowerCase(), keywords.value.toLowerCase())) ||
+          (item.dataValue && _.includes(item.dataValue.toLowerCase(), keywords.value.toLowerCase())) ||
           (item.dataLabel && _.includes(item.dataLabel.toLowerCase(), keywords.value.toLowerCase())) ||
           (item.remark && _.includes(item.remark.toLowerCase(), keywords.value.toLowerCase()));
       }
@@ -187,7 +194,12 @@
     try {
       tableLoading.value = true;
       let responseData = await dictApi.queryDictData(dictId.value);
-      responseData.data.map((e) => (e.enabled = !e.disabledFlag));
+      responseData.data.map((e) => {
+        e.enabled = !e.disabledFlag;
+        if (e.dataStyle) {
+          e.color = DICT_DATA_STYLE_ENUM[e.dataStyle.toUpperCase()].color;
+        }
+      });
       dictDataList.value = responseData.data;
       search();
     } catch (e) {

smart-admin-web-typescript/src/constants/support/dict-const.ts

@@ -37,8 +37,8 @@ export const DICT_DATA_STYLE_ENUM = {
     desc: '信息',
     color: 'colorInfo',
   },
-  WARN: {
+  WARNING: {
-    value: 'warn',
+    value: 'warning',
     desc: '警告',
     color: 'colorWarning',
   },

smart-admin-web-typescript/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue

@@ -42,7 +42,7 @@
   import { JAVA_FILE_LIST, LANGUAGE_LIST, JS_FILE_LIST, TS_FILE_LIST } from '../../code-generator-util';
   import { smartSentry } from '/@/lib/smart-sentry';
   import { lineNumbersBlock } from '/@/lib/highlight-line-number';
-  import hljs from 'highlight';
+  import hljs from 'highlight.js';
   import 'highlight.js/styles/github-dark.css';
   import javascript from 'highlight.js/lib/languages/javascript';
   import typescript from 'highlight.js/lib/languages/typescript';

smart-admin-web-typescript/src/views/support/dict/components/dict-data-modal.vue

@@ -66,6 +66,10 @@
       bordered
     >
       <template #bodyCell="{ record, column }">
+        <template v-if="column.dataIndex === 'dataLabel'">
+          <span v-if="record.color" :style="{ color: token[record.color] }">{{ record.dataLabel }}</span>
+          <span v-else> {{ record.dataLabel }} </span>
+        </template>
         <template v-if="column.dataIndex === 'disabledFlag'">
           <a-switch
             @change="(checked) => handleChangeDisabled(checked, record)"
@@ -89,11 +93,14 @@
   import DictDataFormModal from './dict-data-form-modal.vue';
   import { dictApi } from '/@/api/support/dict-api';
   import { SmartLoading } from '/@/components/framework/smart-loading';
-  import { Modal } from 'ant-design-vue';
+  import { message, Modal, theme } from 'ant-design-vue';
-  import { message } from 'ant-design-vue';
   import { smartSentry } from '/@/lib/smart-sentry';
   import BooleanSelect from '/@/components/framework/boolean-select/index.vue';
   import _ from 'lodash';
+  import { DICT_DATA_STYLE_ENUM } from '/@/constants/support/dict-const';
+
+  const { useToken } = theme;
+  const { token } = useToken();
 
   // 是否展示抽屉
   const visible = ref(false);
@@ -168,7 +175,7 @@
       let keywordsFilterFlag = true;
       if (keywords.value) {
         keywordsFilterFlag =
-          (item.dataValue &&_.includes(item.dataValue.toLowerCase(), keywords.value.toLowerCase())) ||
+          (item.dataValue && _.includes(item.dataValue.toLowerCase(), keywords.value.toLowerCase())) ||
           (item.dataLabel && _.includes(item.dataLabel.toLowerCase(), keywords.value.toLowerCase())) ||
           (item.remark && _.includes(item.remark.toLowerCase(), keywords.value.toLowerCase()));
       }
@@ -187,7 +194,12 @@
     try {
       tableLoading.value = true;
       let responseData = await dictApi.queryDictData(dictId.value);
-      responseData.data.map((e) => (e.enabled = !e.disabledFlag));
+      responseData.data.map((e) => {
+        e.enabled = !e.disabledFlag;
+        if (e.dataStyle) {
+          e.color = DICT_DATA_STYLE_ENUM[e.dataStyle.toUpperCase()].color;
+        }
+      });
       dictDataList.value = responseData.data;
       search();
     } catch (e) {

数据库SQL脚本/mysql/smart_admin_v3.sql

@@ -216,7 +216,7 @@ CREATE TABLE `t_dict_data` (
   `dict_id` bigint NOT NULL COMMENT '字典id',
   `data_value` varchar(500) NOT NULL COMMENT '字典项值',
   `data_label` varchar(500) NOT NULL COMMENT '字典项显示名称',
-  `data_style` varchar(500) NULL COMMENT '字典项样式'
+  `data_style` varchar(500) NULL COMMENT '字典项样式',
   `remark` varchar(1000) DEFAULT NULL COMMENT '备注',
   `sort_order` int NOT NULL COMMENT '排序（越大越靠前）',
   `disabled_flag` tinyint NOT NULL DEFAULT '0' COMMENT '禁用状态',