Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl

resources/java/app/application.yml

@@ -1,6 +1,6 @@
 server:
   host: 127.0.0.1
-  port: 8848
+  port: 8895
   path: C:\Users\Administrator\AppData\Roaming\dzsp_shijingjun_offline_Y_save
 poi:
   global:

resources/java/app/license/yjearth.lic

@@ -1 +1 @@
-41b/ujShRZRf9Aa433FD3uyIZuxWSSqXWXlc2dyQfJ75ED0HNbadcdsPF5CaMuJ624E+iLBfS14muki3Kp1qv3N0KPVdc0TjJDyrO+AVfwE2pkhuoGoZ8sNGSUSrom2NhRIwJNl4SNhqGkxKvDJhRhWfxw6LHS3T/4NDVmw/KlXwLryTr1ScTPGegLiv1C+r0BN58Qcbdy/IN4J0/xuadZTA9+UoajQ1PHwDUdI7SfpTyz/mXYghVpbQcW8OYTHqLypkZtybW+yeNEhnp/jeYw==
+41b/ujShRZRf9Aa433FD3uyIZuxWSSqXWXlc2dyQfJ75ED0HNbadcdsPF5CaMuJ624E+iLBfS14muki3Kp1qv3N0KPVdc0TjJDyrO+AVfwE3xW3RZy00SBFwUgG/tIU6bBTw4XijzGn57R1nl7djDeP1sx04fzNeWSLujfPS4hzwLryTr1ScTPGegLiv1C+rXsbkAxFf47uMIGGK0M2VBZTA9+UoajQ1PHwDUdI7Sfo2JRzkCFW8v6WI1jCNPaFyLypkZtybW+yeNEhnp/jeYw==

src/renderer/src/views/TS/list.vue

@@ -465,6 +465,12 @@ onUnmounted(() => {
     .tableBox {
       flex: auto;
     }
+
+    .pageBox {
+      width: auto;
+      margin: unset;
+      align-self: end;
+    }
   }
 }
 
@@ -571,4 +577,9 @@ background-color: transparent;
   --el-border-color-extra-light: #2B2B2C;
 
 }
+
+:deep(.el-pagination ) {
+  --el-fill-color-blank: #00000000;
+  --el-text-color-regular: #fff;
+}
 </style>

src/renderer/src/views/TS/newPlan.vue

@@ -82,13 +82,46 @@ let sizeForm = reactive<RuleForm>({
 
 const rules = reactive<FormRules<RuleForm>>({
   name: [
-    {required: true, message: '推演名称不能为空', trigger: 'blur'},
+    // {required: true, message: '推演名称不能为空', trigger: 'blur'},
+    {
+      // 自定义验证器
+      validator: (rule, value, callback) => {
+        // 关键：trim 后判断是否为空
+        const trimmedVal = value.trim();
+        if (!trimmedVal) {
+          // 验证失败，返回错误提示
+          callback(new Error('推演名称不能为空（不能仅输入空格）'));
+        } else {
+          // 验证通过，调用 callback() 无参
+          callback();
+        }
+      },
+      // 触发时机：失去焦点 + 表单提交（可按需调整）
+      trigger: ['blur', 'submit']
+    }
   ],
   desc: [
-    {required: true, message: '推演描述不能为空', trigger: 'blur'},
+    // {required: true, message: '推演描述不能为空', trigger: 'blur'},
+    {
+      // 自定义验证器
+      validator: (rule, value, callback) => {
+        // 关键：trim 后判断是否为空
+        const trimmedVal = value.trim();
+        if (!trimmedVal) {
+          // 验证失败，返回错误提示
+          callback(new Error('推演描述不能为空（不能仅输入空格）'));
+        } else {
+          // 验证通过，调用 callback() 无参
+          callback();
+        }
+      },
+      // 触发时机：失去焦点 + 表单提交（可按需调整）
+      trigger: ['blur', 'submit']
+    }
   ],
   simulationStartTime: [
     {required: true, message: '仿真开始时间不能为空', trigger: 'blur'},
+
   ],
 })
 const submitForm = async (formEl: FormInstance | undefined) => {