@skyfox2000/webui 1.3.19 → 1.3.21

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@skyfox2000/webui",
-   "version": "1.3.19",
+   "version": "1.3.21",
    "description": "后台前端通用组件定义",
    "type": "module",
    "keywords": [],

package/src/components/content/dialog/excelForm.vue

@@ -413,7 +413,7 @@ const dialogSave = async (uploadFile: UploadFile) => {
 
          if (result?.status === ResStatus.SUCCESS) {
             if (excelCtrl.afterSave) {
-               excelCtrl.afterSave();
+               excelCtrl.afterSave(result);
             }
             excelCtrl.visible.value = false;
          }

package/src/components/content/form/formItem.vue

@@ -81,6 +81,11 @@ const required = computed(() => {
       errInfo.value.msg = `规则 \`${props.rule}\` 不存在，请检查代码！`;
       return true;
    }
+   if (!rule.required) {
+      // 如果rule.required为false，则表示该字段是可选字段，不需要验证
+      errInfo.value.errClass = '';
+      errInfo.value.msg = '';
+   }
    return rule.required ?? true;
 });
 

package/src/typings/form.d.ts

@@ -77,7 +77,7 @@ export type EditorControl<T> = EditorControlOption & {
     * @param editorCtrl 表单配置数据
     * @param pageCtrl 页面控制器
     */
-   afterSave?: () => void | undefined;
+   afterSave?: (result: ApiResponse<any>) => void | undefined;
    /**
     * 表单数据
     * - Model对象

package/src/typings/tree.d.ts

@@ -70,4 +70,8 @@ export type TreeControl = TreeControlOption & {
     * 是否正在加载中
     */
    isTreeLoading: Ref<boolean>;
+   /**
+    * 表格数据加载后回调
+    */
+   afterLoad?: (result: TreeNode[] | null) => void;
 };

package/src/utils/form.ts

@@ -95,7 +95,7 @@ export const saveForm = async <T>(editorCtrl: EditorControl<T>): Promise<void> =
          }
 
          if (editorCtrl.afterSave) {
-            editorCtrl.afterSave();
+            editorCtrl.afterSave(result);
          }
          if (editorCtrl!.autoClose !== false) {
             editorCtrl!.visible.value = false;
@@ -128,8 +128,14 @@ export const saveForm = async <T>(editorCtrl: EditorControl<T>): Promise<void> =
             }
             message.error(`保存失败！数据 \`${fieldValue}\` 已存在！`);
          } else message.error(result?.msg ?? '保存失败！');
+         if (editorCtrl.afterSave) {
+            editorCtrl.afterSave(result);
+         }
       } else {
          message.error(result?.msg ?? '保存失败！');
+         if (editorCtrl.afterSave) {
+            editorCtrl.afterSave(result);
+         }
       }
    });
 };

package/src/utils/table.ts

@@ -140,14 +140,19 @@ export const gridQueryFind = <T>(gridCtrl: GridControl<T>): Promise<FindResult>
                total: gridCtrl.total.value,
                rows: result.data as unknown as Record<string, any>[],
             };
-
-            if (gridCtrl.afterLoad) gridCtrl.afterLoad(findResult);
          }
+         if (gridCtrl.afterLoad) gridCtrl.afterLoad(findResult);
          return findResult;
       }
 
       gridCtrl.tableData.value = [];
       gridCtrl.total.value = 0;
+      if (gridCtrl.afterLoad) {
+         gridCtrl.afterLoad({
+            total: 0,
+            rows: [],
+         });
+      }
       return {
          total: 0,
          rows: [],

package/src/utils/tree.ts

@@ -20,9 +20,11 @@ export const queryTree = (treeCtrl: TreeControl, params?: ReqParams): Promise<Tr
       },
    }).then((result: ApiResponse<TreeNode> | null) => {
       if (result?.status === ResStatus.SUCCESS) {
-         treeCtrl.data.value = result.data as unknown as TreeNode[];
-         return treeCtrl.data.value as unknown as TreeNode[];
+         treeCtrl.data.value = (result.data as unknown as TreeNode[]) || [];
+         if (treeCtrl.afterLoad) treeCtrl.afterLoad(treeCtrl.data.value);
+         return treeCtrl.data.value;
       }
+      if (treeCtrl.afterLoad) treeCtrl.afterLoad((result?.data as unknown as TreeNode[]) || []);
       return [];
    });
 };

package/.cursorignore

@@ -1,8 +0,0 @@
-# Add directories or file patterns to ignore during indexing (e.g. foo/ or *.csv)
-target/
-dist/
-lib/
-demo/
-mock
-node_modules/
-.vscode/

package/scripts/userInput.py

@@ -1,2 +0,0 @@
-# userInput.py
-user_input=input("Enter Prompt:")