v3.23.0 【新增】TS代码生成和优化;【优化】log日志格式;【优化】数据字典缓存;【优化】职位表结构

smart-admin-web-javascript/src/views/business/oa/notice/components/notice-form-visible-transfer-employee.vue

@@ -79,7 +79,7 @@
       smartSentry.captureError(err);
     }
   }
-buildDepartmentEmployeeTree 
+
   // 递归构建部门员工树
   function buildDepartmentEmployeeTree(departmentTree, employeeList) {
     for (const department of departmentTree) {

smart-admin-web-javascript/src/views/support/code-generator/code-generator-list.vue

@@ -110,20 +110,10 @@
       ellipsis: true,
     },
     {
-      title: '代码配置',
+      title: '代码配置时间',
       dataIndex: 'configTime',
       width: 150,
     },
-    {
-      title: '表创建时间',
-      dataIndex: 'createTime',
-      width: 150,
-    },
-    {
-      title: '表修改时间',
-      dataIndex: 'updateTime',
-      width: 150,
-    },
 
     {
       title: '操作',

smart-admin-web-javascript/src/views/support/code-generator/code-generator-util.js

@@ -112,8 +112,8 @@ export const JS_FILE_LIST = [
 export const TS_FILE_LIST = [
   'ts/list.vue', //
   'ts/form.vue', //
-  'ts/api.js', //
-  'ts/const.js', //
+  'ts/api.ts', //
+  'ts/const.ts', //
 ];
 
 // -------------------------------- 后端文件 --------------------------------

smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue

@@ -68,7 +68,6 @@
     if (deletedFlagColumn) {
       deleteFlagColumnName.value = deletedFlagColumn.columnName;
     }
-    console.log(deletedFlagColumn);
 
     //表单
     let deleteInfo = config.deleteInfo;

smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue

@@ -44,7 +44,7 @@
       </template>
 
       <template v-if="column.dataIndex === 'nullableFlag'">
-        <a-tag color="error" v-if="text">非空</a-tag>
+        <a-tag color="error" v-if="!text">非空</a-tag>
       </template>
 
       <template v-if="column.dataIndex === 'fieldName'">
@@ -68,7 +68,7 @@
       </template>
 
       <template v-if="column.dataIndex === 'dict'">
-        <DictCodeSelect ref="dictRef" v-model:value="record.dict" :dict-list="dictList" />
+        <DictCodeSelect ref="dictRef" v-model:value="record.dict" />
       </template>
 
       <template v-if="column.dataIndex === 'enumName'">
@@ -84,18 +84,11 @@
   import DictCodeSelect from '/@/components/support/dict-code-select/index.vue';
   import { convertUpperCamel, convertLowerCamel } from '/@/utils/str-util';
   import _ from 'lodash';
-  import { dictApi } from '/@/api/support/dict-api';
+  import { useDictStore } from '/@/store/modules/system/dict.js';
 
   const dictRef = ref();
-  const dictList = ref([]);
-  async function loadDictList() {
-    const response = await dictApi.getAllDict();
-    dictList.value = response.data;
-  }
-  loadDictList();
-
   function refreshDict() {
-    dictRef.value.queryDict();
+    useDictStore().refreshData();
   }
 
   //------------------------ 全局数据 ---------------------
@@ -239,4 +232,4 @@
   });
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped></style>

smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue

@@ -87,7 +87,7 @@
       </template>
 
       <template v-if="column.dataIndex === 'nullableFlag'">
-        <a-tag color="error" v-if="text">非空</a-tag>
+        <a-tag color="error" v-if="!text">非空</a-tag>
       </template>
 
       <template v-if="column.dataIndex === 'required'">
@@ -222,8 +222,8 @@
       };
 
       //表单
-      field.requiredFlag = configField ? configField.requiredFlag : field.nullableFlag;
-      field.insertFlag = configField ? configField.insertFlag : field.nullableFlag;
+      field.requiredFlag = configField ? configField.requiredFlag : !field.nullableFlag;
+      field.insertFlag = configField ? configField.insertFlag : !field.nullableFlag;
       field.updateFlag = configField ? configField.updateFlag : false;
 
       if (configField && configField.frontComponent) {

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

@@ -19,7 +19,7 @@
       </a-form-item>
 
       <a-form-item label="备注" name="remark">
-        <a-textarea v-model="form.remark" style="width: 100%; height: 100px; outline: none" />
+        <a-textarea v-model:value="form.remark" style="width: 100%; height: 100px; outline: none" />
       </a-form-item>
     </a-form>
   </a-modal>

smart-admin-web-javascript/src/views/system/position/position-form.vue

@@ -19,8 +19,8 @@
       <a-form-item label="职务名称" name="positionName">
         <a-input style="width: 100%" v-model:value="form.positionName" placeholder="职务名称" />
       </a-form-item>
-      <a-form-item label="职级" name="level">
-        <a-input style="width: 100%" v-model:value="form.level" placeholder="职级" />
+      <a-form-item label="职级" name="positionLevel">
+        <a-input style="width: 100%" v-model:value="form.positionLevel" placeholder="职级" />
       </a-form-item>
       <a-form-item label="排序" name="sort">
         <a-input-number :min="0" :step="1" :precision="0" style="width: 100%" v-model:value="form.sort" placeholder="排序" />
@@ -92,7 +92,7 @@
   const formDefault = {
     positionId: undefined,
     positionName: undefined, //职务名称
-    level: undefined, //职纪
+    positionLevel: undefined, //职纪
     sort: 0,
     remark: undefined, //备注
   };

smart-admin-web-javascript/src/views/system/position/position-list.vue

@@ -115,7 +115,7 @@
     },
     {
       title: '职级',
-      dataIndex: 'level',
+      dataIndex: 'positionLevel',
       ellipsis: true,
     },
     {