修改代码生成模板.

orion-ops-launch/src/main/java/com/orion/ops/launch/generator/CodeGenerator.java

@@ -12,6 +12,8 @@ import com.orion.lang.constant.Const;
 import com.orion.lang.utils.ext.yml.YmlExt;
 import com.orion.ops.framework.mybatis.core.domain.BaseDO;
 import com.orion.ops.framework.mybatis.core.mapper.IMapper;
+import com.orion.ops.module.infra.enums.RoleStatusEnum;
+import com.orion.ops.module.infra.enums.UserStatusEnum;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.io.File;
@@ -38,12 +40,12 @@ public class CodeGenerator {
         String module = "infra";
         // 生成的表
         GenTable[] tables = {
-                // new GenTable("system_user", "用户", "user")
-                //         .vue("user", "user")
-                //         .enums(UserStatusEnum.class),
-                // new GenTable("system_role", "角色", "role")
-                //         .vue("user", "role")
-                //         .enums(RoleStatusEnum.class),
+                new GenTable("system_user", "用户", "user")
+                        .vue("user", "user")
+                        .enums(UserStatusEnum.class),
+                new GenTable("system_role", "角色", "role")
+                        .vue("user", "role")
+                        .enums(RoleStatusEnum.class),
                 // new GenTable("system_menu", "菜单", "menu"),
         };
         // jdbc 配置 - 使用配置文件

orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm

@@ -54,6 +54,7 @@
   import useVisible from '@/hooks/visible';
   import formRules from '../types/form.rules';
   import { create${vue.featureFirstUpper}, update${vue.featureFirstUpper} } from '@/api/${vue.module}/${vue.feature}';
+  import { Message } from '@arco-design/web-vue';
 
   const { visible, setVisible } = useVisible();
   const { loading, setLoading } = useLoading();
@@ -111,10 +112,12 @@
       if (isAddHandle.value) {
         // 新增
         await create${vue.featureFirstUpper}(formModel as any);
+        Message.success('创建成功');
         emits('added');
       } else {
         // 修改
         await update${vue.featureFirstUpper}(formModel as any);
+        Message.success('修改成功');
         emits('updated');
       }
       // 清空

orion-ops-launch/src/main/resources/templates/orion-vue-views-components-table.vue.vm

@@ -7,7 +7,7 @@
                     @reset="fetchTableData">
       #foreach($field in ${table.fields})
       <!-- $field.comment -->
-      <a-form-item field="${field.propertyName}" label="${field.comment}" label-col-flex="60px">
+      <a-form-item field="${field.propertyName}" label="${field.comment}" label-col-flex="50px">
       #if("$field.propertyType" == "Integer" || "$field.propertyType" == "Long")
         <a-input-number v-model="formModel.${field.propertyName}" placeholder="请输入${field.comment}" allow-clear/>
       #elseif("$field.propertyType" == "Date")
@@ -26,9 +26,11 @@
   <!-- 表格 -->
   <a-card class="general-card table-card">
     <template #title>
+      <!-- 左侧标题 -->
       <div class="table-title">
         ${table.comment}列表
       </div>
+      <!-- 右侧按钮 -->
       <div class="table-bar-handle">
         <a-space>
           <!-- 新增 -->
@@ -87,9 +89,10 @@
                         position="left"
                         type="warning"
                         @ok="deleteRow(record)">
-            <a-button type="text" size="mini"
-                      status="danger"
-                      v-permission="['${package.ModuleName}:${typeHyphen}:delete']">
+            <a-button v-permission="['${package.ModuleName}:${typeHyphen}:delete']"
+                      type="text"
+                      size="mini"
+                      status="danger">
               删除
             </a-button>
           </a-popconfirm>

orion-ops-launch/src/main/resources/templates/orion-vue-views-index.vue.vm

@@ -4,7 +4,7 @@
     <${vue.feature}-table ref="table"
                   @openAdd="() => modal.openAdd()"
                   @openUpdate="(e) => modal.openUpdate(e)" />
-    <!-- 添加修改框 -->
+    <!-- 添加修改模态框 -->
     <${vue.feature}-form-modal ref="modal"
                        @added="() => table.addedCallback()"
                        @updated="() => table.updatedCallback()" />
@@ -13,7 +13,7 @@
 
 <script lang="ts">
   export default {
-    name: '${vue.module}${vue.featureAllUpper}'
+    name: '${vue.module}${vue.featureFirstUpper}'
   };
 </script>
 

orion-ops-launch/src/main/resources/templates/orion-vue-views-types-table.columns.ts.vm

@@ -19,13 +19,14 @@ const columns = [
     tooltip: true,
     #elseif(${field.propertyType} == 'Date')
     render: ({ record }) => {
-      return dateFormat(new Date(record.${field.propertyName}));
+      return record.${field.propertyName} && dateFormat(new Date(record.${field.propertyName}));
     },
     #end
   }, #end#end{
     title: '创建时间',
     dataIndex: 'createTime',
     slotName: 'createTime',
+    align: 'center',
     render: ({ record }) => {
       return dateFormat(new Date(record.createTime));
     },
@@ -33,8 +34,9 @@ const columns = [
     title: '修改时间',
     dataIndex: 'updateTime',
     slotName: 'updateTime',
+    align: 'center',
     render: ({ record }) => {
-      return dateFormat(new Date(record.createTime));
+      return dateFormat(new Date(record.updateTime));
     },
   }, {
     title: '创建人',