@skyfox2000/webui 1.3.9 → 1.3.11

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

@@ -451,32 +451,31 @@ const performDataValidation = async (buffer: ArrayBuffer): Promise<void> => {
 
       // 统一验证（格式验证和重复验证）
       const {
-         hasError,
          errBlob,
          validationMsg: valMsg,
          duplicateMsg: dupMsg,
+         hasFormatError,
+         hasDuplicateError
       } = await validateExcelUnified(buffer, excelCtrl.formRules.value, duplicateRules.value, duplicateUrl.value);
 
       // 更新验证状态
       validationMsg.value = valMsg;
       duplicateMsg.value = dupMsg;
 
-      if (hasError) {
-         // 有验证错误
-         if (errBlob) {
-            excelError.value = true;
-            duplicateError.value = true;
-            validationType.value = 'error';
-            duplicateType.value = 'error';
-            const blobUrl = URL.createObjectURL(errBlob);
-            excelUrl.value = blobUrl;
-         }
+      // 根据验证结果设置正确的状态类型
+      validationType.value = hasFormatError ? 'error' : (excelCtrl.formRules.value && Object.keys(excelCtrl.formRules.value).length > 0 ? 'success' : 'warning');
+      duplicateType.value = hasDuplicateError ? 'error' : (duplicateRules.value && duplicateRules.value.length > 0 ? 'success' : 'warning');
+
+      // 有验证错误
+      if (errBlob) {
+         excelError.value = hasFormatError ?? false;
+         duplicateError.value = hasDuplicateError ?? false;
+         const blobUrl = URL.createObjectURL(errBlob);
+         excelUrl.value = blobUrl;
       } else {
          // 验证成功
          excelError.value = false;
          duplicateError.value = false;
-         validationType.value = 'success';
-         duplicateType.value = 'success';
          // 验证成功时，excelUrl会在beforeUpload中设置
       }
    } catch (error) {

package/src/utils/form-excel.ts

@@ -316,22 +316,23 @@ export const validateExcelUnified = async (
    duplicateRules?: string[],
    duplicateUrl?: IUrlInfo,
 ): Promise<{
-   hasError: boolean;
    errBlob?: Blob;
    validationMsg: string;
    duplicateMsg: string;
+   hasFormatError?: boolean;
+   hasDuplicateError?: boolean;
 }> => {
    const allMarkCells: Array<{ row: number; col: number; color: string }> = [];
    const allMarkHeaders: string[] = [];
-   let hasValidationError = false;
+   let hasFormatError = false;
    let hasDuplicateError = false;
    let validationMsg = '数据验证成功';
-   let duplicateMsg = '数据验证通过';
+   let duplicateMsg = '待验证重复数据';
 
    // 1. 格式验证
    const validationResult = await validateExcel(excelBuffer, rules);
    if (validationResult.hasError) {
-      hasValidationError = true;
+      hasFormatError = true;
       validationMsg = '数据验证失败';
       if (validationResult.markCells) {
          allMarkCells.push(...validationResult.markCells);
@@ -339,6 +340,8 @@ export const validateExcelUnified = async (
       if (validationResult.markHeaders) {
          allMarkHeaders.push(...validationResult.markHeaders);
       }
+   } else if (rules && Object.keys(rules).length > 0) {
+      validationMsg = '数据验证通过';
    }
 
    // 2. 重复验证
@@ -363,11 +366,15 @@ export const validateExcelUnified = async (
          if (duplicateResult.markHeaders) {
             allMarkHeaders.push(...duplicateResult.markHeaders);
          }
+      } else {
+         duplicateMsg = '重复性检验通过';
       }
    }
 
+   const hasError = hasFormatError || hasDuplicateError;
+
    // 3. 如果有任何错误，创建统一的标记Excel
-   if (hasValidationError || hasDuplicateError) {
+   if (hasError) {
       const markResult = await createMarkedExcelView(
          excelBuffer,
          {
@@ -381,24 +388,27 @@ export const validateExcelUnified = async (
          const response = await fetch(markResult.blobUrl);
          const errBlob = await response.blob();
          return {
-            hasError: true,
             errBlob,
             validationMsg,
             duplicateMsg,
+            hasFormatError,
+            hasDuplicateError
          };
       } else {
          return {
-            hasError: true,
             validationMsg,
             duplicateMsg,
+            hasFormatError,
+            hasDuplicateError
          };
       }
    }
 
    return {
-      hasError: false,
       validationMsg,
       duplicateMsg,
+      hasFormatError: false,
+      hasDuplicateError: false
    };
 };
 

package/src/utils/page.ts

@@ -85,6 +85,17 @@ export const initPageFactory = (options: {
    };
 };
 
+const initUrls = (apiUrls: ApiUrls) => {
+   for (let urlKey in apiUrls.urls) {
+      if (!apiUrls.urls[urlKey]!.api) {
+         apiUrls.urls[urlKey]!.api = apiUrls.api;
+      }
+      if (!apiUrls.urls[urlKey]!.authorize) {
+         apiUrls.urls[urlKey]!.authorize = apiUrls.authorize;
+      }
+   }
+};
+
 /**
  * 编辑器工厂处理
  *
@@ -100,6 +111,7 @@ export const useEditorFactory = <T, E>(
    defaultData?: Partial<E>,
    formRules?: Record<string, ValidateRule>,
 ) => {
+   initUrls(urls);
    /**
     * 表单数据交互控制
     */
@@ -133,6 +145,7 @@ export const useEditorFactory = <T, E>(
  * @returns
  */
 export const useGridFactory = <T, G>(urls: ApiUrls, pageCtrl: PageControl<T>, columns?: Record<string, any>[]) => {
+   initUrls(urls);
    /**
     * 表格数据交互控制
     */
@@ -194,6 +207,7 @@ export const useGridFactory = <T, G>(urls: ApiUrls, pageCtrl: PageControl<T>, co
  * @returns
  */
 export const useTreeFactory = <T>(urls: ApiUrls, pageCtrl: PageControl<T>) => {
+   initUrls(urls);
    /**
     * 树数据交互控制
     */
@@ -306,15 +320,7 @@ export const usePageFactory = <T>(
    defaultData?: Partial<T>,
    formRules?: Record<string, ValidateRule>,
 ) => {
-   // urls 参数处理
-   // api 默认
-   // authorize 默认
-   for (const key in urls.urls) {
-      if (urls.urls[key]) {
-         if (!urls.urls[key].api) urls.urls[key].api = urls.api;
-         if (urls.urls[key].authorize === undefined) urls.urls[key].authorize = urls.authorize;
-      }
-   }
+   initUrls(urls);
 
    /**
     * 页面交互主数据