@oinone/kunlun-vue-admin-base 6.3.8 → 6.3.9

package/dist/types/src/action/server-actions/ServerActionWidget.d.ts

@@ -16,6 +16,9 @@ export declare class ServerActionWidget extends ActionWidget<RuntimeServerAction
     protected clickAction(): Promise<ClickResult>;
     protected formValidateProcess(e: HttpClientError): void;
     protected convertFormValidateResults(e: HttpClientError): FormValidateResult[];
+    /**
+     * @deprecated 6.x please using {@link formValidateErrorProcess}
+     */
     protected notifyValidateResults(e: HttpClientError): void;
     protected clickActionAfter(result: ClickResult): Promise<ClickResult>;
     protected clickActionAfterRefreshData(result: ClickResult, refreshParent?: boolean): Promise<ClickResult>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oinone/kunlun-vue-admin-base",
-  "version": "6.3.8",
+  "version": "6.3.9",
   "main": "index.ts",
   "scripts": {
     "prebuild": "rimraf dist",
@@ -14,13 +14,13 @@
     "doc": "typedoc --out docs src/index.ts"
   },
   "dependencies": {
-    "@oinone/kunlun-vue-admin-layout": "6.3.8",
-    "@oinone/kunlun-vue-router": "6.3.8",
-    "@oinone/kunlun-vue-ui": "6.3.8",
-    "@oinone/kunlun-vue-ui-antd": "6.3.8",
-    "@oinone/kunlun-vue-ui-common": "6.3.8",
-    "@oinone/kunlun-vue-ui-el": "6.3.8",
-    "@oinone/kunlun-vue-widget": "6.3.8",
+    "@oinone/kunlun-vue-admin-layout": "6.3.9",
+    "@oinone/kunlun-vue-router": "6.3.9",
+    "@oinone/kunlun-vue-ui": "6.3.9",
+    "@oinone/kunlun-vue-ui-antd": "6.3.9",
+    "@oinone/kunlun-vue-ui-common": "6.3.9",
+    "@oinone/kunlun-vue-ui-el": "6.3.9",
+    "@oinone/kunlun-vue-widget": "6.3.9",
     "@wangeditor/editor": "5.1.23",
     "@wangeditor/editor-for-vue": "5.1.11",
     "@wangeditor/plugin-upload-attachment": "1.1.0",

package/src/action/server-actions/ServerActionWidget.ts

@@ -2,6 +2,7 @@ import {
   Dialog,
   Drawer,
   executeViewAction,
+  formValidateErrorProcess,
   FunctionCache,
   FunctionService,
   MultiTabsManager,
@@ -16,7 +17,7 @@ import {
   UpdateOneWithRelationsService
 } from '@oinone/kunlun-engine';
 import { ActionType, ViewType } from '@oinone/kunlun-meta';
-import { HttpClientError, MessageHub, RequestErrorInterceptor, SystemErrorCode } from '@oinone/kunlun-request';
+import { HttpClientError, SystemErrorCode } from '@oinone/kunlun-request';
 import { SPI } from '@oinone/kunlun-spi';
 import { BooleanHelper, CallChaining, debugConsole, OioNotification } from '@oinone/kunlun-vue-ui-antd';
 import { VueWidget, Widget, WidgetSubjection } from '@oinone/kunlun-vue-widget';
@@ -135,19 +136,11 @@ export class ServerActionWidget extends ActionWidget<RuntimeServerAction> {
     return results;
   }
 
+  /**
+   * @deprecated 6.x please using {@link formValidateErrorProcess}
+   */
   protected notifyValidateResults(e: HttpClientError): void {
-    const error = e.errors?.[0];
-    if (!error) {
-      return;
-    }
-    if (error.extensions?.errorCode !== SystemErrorCode.FORM_VALIDATE_ERROR) {
-      return;
-    }
-    for (const messageItem of error.extensions?.messages || []) {
-      if (RequestErrorInterceptor.ignoredFormValidateMessage(messageItem)) {
-        MessageHub.error(messageItem.message);
-      }
-    }
+    formValidateErrorProcess(e);
   }
 
   protected async clickActionAfter(result: ClickResult): Promise<ClickResult> {

package/src/basic/table/BaseTableWidget.ts

@@ -3,22 +3,23 @@ import {
   ActiveRecord,
   ActiveRecords,
   ActiveRecordsOperator,
+  formValidateErrorProcess,
   FunctionCache,
   FunctionMetadata,
   FunctionService,
   isRelation2MField,
   parseConfigs,
+  RelationUpdateType,
   RuntimeAction,
   RuntimeFunctionDefinition,
   RuntimeM2MField,
   RuntimeO2MField,
   SubmitCacheManager,
   SubmitValue,
-  translateValueByKey,
-  RelationUpdateType
+  translateValueByKey
 } from '@oinone/kunlun-engine';
 import { Expression, ExpressionRunParam } from '@oinone/kunlun-expression';
-import { MessageHub } from '@oinone/kunlun-request';
+import { HttpClientError, MessageHub } from '@oinone/kunlun-request';
 import { BooleanHelper, CallChaining, Optional, ReturnPromise } from '@oinone/kunlun-shared';
 import {
   ActiveEditorContext,
@@ -341,7 +342,7 @@ export class BaseTableWidget<
       return false;
     }
     const data = await this.rowEditorClosedForSubmit(context);
-    const useDiffUpdate = [RelationUpdateType.diff, RelationUpdateType.batch].includes(this.relationUpdateType)
+    const useDiffUpdate = [RelationUpdateType.diff, RelationUpdateType.batch].includes(this.relationUpdateType);
     if (this.inline) {
       if (res && data) {
         if (this.createMode && useDiffUpdate) {
@@ -349,7 +350,6 @@ export class BaseTableWidget<
         } else {
           this.updateSubviewFieldWidget(context, data);
         }
-
       }
     } else if (data) {
       try {
@@ -580,27 +580,37 @@ export class BaseTableWidget<
   protected async executeRowEditorUpdate(functionDefinition: RuntimeFunctionDefinition, data: ActiveRecord) {
     const { rootRuntimeContext, model } = this;
     const requestFields = rootRuntimeContext.getRequestModelFields();
-    if (this.currentTriggerCreateAction && this.currentTriggerCreateAction.sessionPath) {
-      return FunctionService.INSTANCE.simpleExecute<Record<string, unknown>>(
+    const sessionPath = this.currentTriggerCreateAction?.sessionPath;
+    try {
+      if (sessionPath) {
+        return await FunctionService.INSTANCE.simpleExecute<Record<string, unknown>>(
+          model,
+          functionDefinition,
+          {
+            requestFields,
+            variables: {
+              path: sessionPath,
+              relationExcludeUpdate: true
+            }
+          },
+          data
+        );
+      }
+      return await FunctionService.INSTANCE.simpleExecute<Record<string, unknown>>(
         model,
         functionDefinition,
         {
           requestFields,
           variables: {
-            path: this.currentTriggerCreateAction?.sessionPath
+            relationExcludeUpdate: true
           }
         },
         data
       );
+    } catch (e) {
+      formValidateErrorProcess(e as HttpClientError);
+      throw e;
     }
-    return FunctionService.INSTANCE.simpleExecute<Record<string, unknown>>(
-      model,
-      functionDefinition,
-      {
-        requestFields
-      },
-      data
-    );
   }
 
   protected refreshRowEditorUpdate(context: RowContext, data: ActiveRecord, res: unknown) {