v3.21.0 【新增】修改部门名称字段；【新增】修改系统版本version字段；【新增】优化代码生成前端代码；【优化】SQL

smart-admin-web-javascript/src/components/system/department-tree-select/index.vue

@@ -12,7 +12,7 @@
   <a-tree-select
     :value="props.value"
     :treeData="treeData"
-    :fieldNames="{ label: 'name', key: 'departmentId', value: 'departmentId' }"
+    :fieldNames="{ label: 'departmentName', key: 'departmentId', value: 'departmentId' }"
     show-search
     style="width: 100%"
     :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"

smart-admin-web-javascript/src/config/app-config.js

@@ -29,7 +29,7 @@ export const appDefaultConfig = {
   // 标签页
   pageTagFlag: true,
   // 标签页样式: default、 antd、chrome
-  pageTagStyle: 'default',
+  pageTagStyle: 'chrome',
   // 面包屑
   breadCrumbFlag: true,
   // 页脚

smart-admin-web-javascript/src/views/support/change-log/change-log-form.vue

@@ -17,8 +17,8 @@
     :destroyOnClose="true"
   >
     <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }">
-      <a-form-item label="版本" name="version">
-        <a-input style="width: 100%" v-model:value="form.version" placeholder="版本" />
+      <a-form-item label="版本" name="updateVersion">
+        <a-input style="width: 100%" v-model:value="form.updateVersion" placeholder="版本" />
       </a-form-item>
       <a-form-item label="更新类型" name="type">
         <SmartEnumSelect width="100%" v-model:value="form.type" enumName="CHANGE_LOG_TYPE_ENUM" placeholder="更新类型" />
@@ -85,7 +85,7 @@
 
   const formDefault = {
     changeLogId: undefined,
-    version: undefined, //版本
+    updateVersion: undefined, //版本
     type: undefined, //更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复]
     publishAuthor: undefined, //发布人
     publicDate: undefined, //发布日期
@@ -96,7 +96,7 @@
   let form = reactive({ ...formDefault });
 
   const rules = {
-    version: [{ required: true, message: '版本 必填' }],
+    updateVersion: [{ required: true, message: '版本 必填' }],
     type: [{ required: true, message: '更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复] 必填' }],
     publishAuthor: [{ required: true, message: '发布人 必填' }],
     publicDate: [{ required: true, message: '发布日期 必填' }],

smart-admin-web-javascript/src/views/support/change-log/change-log-list.vue

@@ -75,7 +75,7 @@
       :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
     >
       <template #bodyCell="{ text, record, column }">
-        <template v-if="column.dataIndex === 'version'">
+        <template v-if="column.dataIndex === 'updateVersion'">
           <a-button @click="showModal(record)" type="link">{{ text }}</a-button>
         </template>
         <template v-if="column.dataIndex === 'type'">
@@ -135,7 +135,7 @@
   const columns = ref([
     {
       title: '版本',
-      dataIndex: 'version',
+      dataIndex: 'updateVersion',
       ellipsis: true,
     },
     {

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

@@ -176,9 +176,9 @@
         columnName: column.columnName,
         columnComment: column.columnComment,
         dataType: column.dataType,
-        nullableFlag: column.isNullable === 'NO',
-        primaryKeyFlag: column.columnKey === 'PRI',
-        autoIncreaseFlag: column.extra === 'auto_increment',
+        nullableFlag: column.nullableFlag,
+        primaryKeyFlag: column.primaryKeyFlag,
+        autoIncreaseFlag: column.autoIncreaseFlag,
         //表单
         fieldName: configField ? configField.fieldName : convertLowerCamel(column.columnName),
         label: configField ? configField.label : column.columnComment,

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

@@ -216,9 +216,9 @@
         columnName: column.columnName,
         columnComment: column.columnComment,
         dataType: column.dataType,
-        nullableFlag: column.isNullable === 'NO',
-        primaryKeyFlag: column.columnKey === 'PRI',
-        autoIncreaseFlag: column.extra === 'auto_increment',
+        nullableFlag: column.nullableFlag,
+        primaryKeyFlag: column.primaryKeyFlag,
+        autoIncreaseFlag: column.autoIncreaseFlag,
       };
 
       //表单

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

@@ -102,6 +102,7 @@
   const visibleFlag = ref(false);
   function showModal(table) {
     Object.assign(tableInfo, table);
+    tableInfo.createTime = table.createTime ? table.createTime : new Date();
     activeKey.value = '1';
     visibleFlag.value = true;
     nextTick(() => {

smart-admin-web-javascript/src/views/system/department/components/department-form-modal.vue

@@ -14,8 +14,8 @@
         <DepartmentTreeSelect ref="departmentTreeSelect" v-model:value="formState.parentId" :defaultValueFlag="false"
           width="100%" />
       </a-form-item>
-      <a-form-item label="部门名称" name="name">
-        <a-input v-model:value.trim="formState.name" placeholder="请输入部门名称" />
+      <a-form-item label="部门名称" name="departmentName">
+        <a-input v-model:value.trim="formState.departmentName" placeholder="请输入部门名称" />
       </a-form-item>
       <a-form-item label="部门负责人" name="managerId">
         <EmployeeSelect ref="employeeSelect" placeholder="请选择部门负责人" width="100%" v-model:value="formState.managerId"
@@ -76,7 +76,7 @@ const emits = defineEmits(['refresh']);
   const defaultDepartmentForm = {
     id: undefined,
     managerId: undefined, //部门负责人
-    name: undefined,
+    departmentName: undefined,
     parentId: undefined,
     sort: 0,
   };
@@ -88,7 +88,7 @@ let formState = reactive({
 // 表单校验规则
 const rules = {
   parentId: [{ required: true, message: '上级部门不能为空' }],
-  name: [
+  departmentName: [
     { required: true, message: '部门名称不能为空' },
     { max: 50, message: '部门名称不能大于20个字符', trigger: 'blur' },
   ],

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

@@ -95,8 +95,8 @@
   const columns = ref([
     {
       title: '部门名称',
-      dataIndex: 'name',
-      key: 'name',
+      dataIndex: 'departmentName',
+      key: 'departmentName',
     },
     {
       title: '负责人',
@@ -189,7 +189,7 @@
       return;
     }
     // 筛选出名称符合的部门
-    let filterDepartment = originData.filter((e) => e.name.indexOf(keywords.value) > -1);
+    let filterDepartment = originData.filter((e) => e.departmentName.indexOf(keywords.value) > -1);
     let filterDepartmentList = [];
     // 循环筛选出的部门 构建部门树
     filterDepartment.forEach((e) => {
@@ -220,7 +220,7 @@
   function addDepartment(e) {
     let data = {
       departmentId: 0,
-      name: '',
+      departmentName: '',
       parentId: e.departmentId || null,
     };
     departmentFormModal.value.showModal(data);

smart-admin-web-javascript/src/views/system/employee/components/department-children/index.vue

@@ -19,7 +19,7 @@
       <template #renderItem="{ item }">
         <a-list-item>
           <div class="department-item" @click="selectTree(item.departmentId)">
-            {{ item.name }}
+            {{ item.departmentName }}
             <RightOutlined />
           </div>
         </a-list-item>

smart-admin-web-javascript/src/views/system/employee/components/department-tree/index.vue

@@ -18,7 +18,7 @@
       v-model:checkedKeys="checkedKeys"
       class="tree"
       :treeData="departmentTreeData"
-      :fieldNames="{ title: 'name', key: 'departmentId', value: 'departmentId' }"
+      :fieldNames="{ title: 'departmentName', key: 'departmentId', value: 'departmentId' }"
       style="width: 100%; overflow-x: auto"
       :style="[!height ? '' : { height: `${height}px`, overflowY: 'auto' }]"
       :checkable="props.checkable"
@@ -28,7 +28,7 @@
       @select="treeSelectChange"
     >
       <template #title="item">
-        <div>{{ item.name }}</div>
+        <div>{{ item.departmentName }}</div>
       </template>
     </a-tree>
     <div class="no-data" v-else>暂无结果</div>
@@ -158,7 +158,7 @@
     selectedDepartmentChildren.value = departmentList.value.filter((e) => e.parentId == id);
     let filterDepartmentList = [];
     recursionFilterDepartment(filterDepartmentList, id, true);
-    breadcrumb.value = filterDepartmentList.map((e) => e.name);
+    breadcrumb.value = filterDepartmentList.map((e) => e.departmentName);
   }
 
   // -----------------------  筛选 ---------------------
@@ -181,7 +181,7 @@
       return;
     }
     // 筛选出名称符合的部门
-    let filterDepartment = originData.filter((e) => e.name.indexOf(keywords.value) > -1);
+    let filterDepartment = originData.filter((e) => e.departmentName.indexOf(keywords.value) > -1);
     let filterDepartmentList = [];
     // 循环筛选出的部门 构建部门树
     filterDepartment.forEach((e) => {