@oinone/kunlun-vue-admin-base 6.2.10 → 6.2.11

package/dist/types/src/field/form/text/DefaultTextarea.vue.d.ts

@@ -9,7 +9,7 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
     };
     rows: {
-        type: NumberConstructor;
+        type: (BooleanConstructor | ObjectConstructor | NumberConstructor)[];
         default: number;
     };
     allowClear: {
@@ -47,9 +47,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly: import("vue").ComputedRef<boolean | undefined>;
     disabled: import("vue").ComputedRef<boolean | undefined>;
     realValue: import("vue").Ref<string | undefined>;
-    autoSize: import("vue").ComputedRef<true | {
-        minRows: number;
-    }>;
+    autoSize: import("vue").ComputedRef<boolean | Record<string, any> | undefined>;
     clearContent: () => void;
     clearStatus: import("vue").ComputedRef<boolean | "" | undefined>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
@@ -63,7 +61,7 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
     };
     rows: {
-        type: NumberConstructor;
+        type: (BooleanConstructor | ObjectConstructor | NumberConstructor)[];
         default: number;
     };
     allowClear: {
@@ -96,7 +94,7 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
 }>>, {
-    rows: number;
+    rows: number | boolean | Record<string, any>;
     allowClear: boolean;
     showCount: boolean;
     readonly: string | boolean;

package/dist/types/src/field/form/text/FormTextFieldWidget.d.ts

@@ -1,8 +1,10 @@
 import { ValidatorInfo } from '../../../typing';
 import { FormStringFieldWidget } from '../string/FormStringFieldWidget';
+import { InputTextareaSize } from './typing';
 export declare class FormTextFieldWidget extends FormStringFieldWidget {
     initialize(props: any): this;
-    protected get rows(): number;
+    protected get defaultRows(): InputTextareaSize;
+    protected get rows(): InputTextareaSize;
     protected get maxLength(): any;
     validator(): Promise<ValidatorInfo>;
 }

package/dist/types/src/field/form/text/index.d.ts

@@ -1,2 +1,3 @@
 export * from './FormTextFieldWidget';
 export * from './DomainExpGenerator';
+export * from './typing';

package/dist/types/src/field/form/text/typing.d.ts

@@ -0,0 +1,4 @@
+export declare type InputTextareaSize = number | boolean | {
+    minRows?: number;
+    maxRows?: number;
+} | undefined;

package/dist/types/src/field/table/boolean/TableBooleanRadioFieldWidget.d.ts

@@ -0,0 +1,3 @@
+import { TableBooleanSelectFieldWidget } from './TableBooleanSelectFieldWidget';
+export declare class TableBooleanRadioFieldWidget extends TableBooleanSelectFieldWidget {
+}

package/dist/types/src/field/table/boolean/index.d.ts

@@ -1,3 +1,4 @@
 export * from './TableBooleanFieldWidget';
+export * from './TableBooleanRadioFieldWidget';
 export * from './TableBooleanSelectFieldWidget';
 export * from './TableBooleanSwitchFieldWidget';

package/dist/types/src/field/table/string/upload/TableStringMultiUploadWidget.d.ts

@@ -1,5 +1,5 @@
-import { TableStringTagFieldWidget } from '../tag/TableStringTagFieldWidget';
 import { VNode } from 'vue';
+import { TableStringTagFieldWidget } from '../tag';
 export declare class TableStringMultiUploadWidget extends TableStringTagFieldWidget {
     protected get cdnKey(): any;
     protected get privateLink(): boolean | undefined;

package/dist/types/src/provider/RootWidget.d.ts

@@ -1,10 +1,10 @@
 import { VueWidget } from '@oinone/kunlun-vue-widget';
 import { DefaultMetadataMainViewWidget } from '../main-view';
-import { FirstResetPasswordWidget, ForgetPasswordWidget, LoginPageWidget } from '../view';
+import { FirstResetPasswordWidget, ForgetPasswordWidget } from '../view';
 export declare class RootWidget extends VueWidget {
     root: string;
     widgets: {
-        login: typeof LoginPageWidget;
+        login: typeof import("../view").LoginWidget;
         page: typeof DefaultMetadataMainViewWidget;
         forget: typeof ForgetPasswordWidget;
         first: typeof FirstResetPasswordWidget;

package/dist/types/src/typing/widget-names.d.ts

@@ -3,3 +3,4 @@ export declare const FORM_WIDGET = "Form";
 export declare const DETAIL_WIDGET = "Detail";
 export declare const SEARCH_WIDGET = "Search";
 export declare const GALLERY_WIDGET = "Gallery";
+export declare const CARD_WIDGET = "Card";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oinone/kunlun-vue-admin-base",
-  "version": "6.2.10",
+  "version": "6.2.11",
   "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.2.10",
-    "@oinone/kunlun-vue-router": "6.2.10",
-    "@oinone/kunlun-vue-ui": "6.2.10",
-    "@oinone/kunlun-vue-ui-antd": "6.2.10",
-    "@oinone/kunlun-vue-ui-common": "6.2.10",
-    "@oinone/kunlun-vue-ui-el": "6.2.10",
-    "@oinone/kunlun-vue-widget": "6.2.10",
+    "@oinone/kunlun-vue-admin-layout": "6.2.11",
+    "@oinone/kunlun-vue-router": "6.2.11",
+    "@oinone/kunlun-vue-ui": "6.2.11",
+    "@oinone/kunlun-vue-ui-antd": "6.2.11",
+    "@oinone/kunlun-vue-ui-common": "6.2.11",
+    "@oinone/kunlun-vue-ui-el": "6.2.11",
+    "@oinone/kunlun-vue-widget": "6.2.11",
     "@wangeditor/editor": "5.1.23",
     "@wangeditor/editor-for-vue": "5.1.11",
     "@wangeditor/plugin-upload-attachment": "1.1.0",

package/src/action/component/action/ActionWidget.ts

@@ -2,26 +2,42 @@ import {
   ActiveRecord,
   ActiveRecords,
   buildQueryCondition,
+  ConfirmModal,
+  FunctionCache,
+  FunctionService,
+  GetRequestModelFieldsOptions,
+  ModelCache,
   parseConfigs,
+  RequestModelField,
   resolveDynamicDomain,
   resolveDynamicExpression,
   RuntimeAction,
   RuntimeContext,
   RuntimeContextManager,
+  RuntimeFunctionDefinition,
+  RuntimeServerAction,
+  SubmitRelationValue,
+  SubmitValue,
   translate,
   translateValueByKey,
   ValidatorCallChainingParameters
 } from '@oinone/kunlun-engine';
 import { EventBus, EventConsumer, KeyboardEventMessage } from '@oinone/kunlun-event';
 import { Expression, ExpressionRunParam } from '@oinone/kunlun-expression';
-import { ActionContextType, ActionElement, IAction, ViewType } from '@oinone/kunlun-meta';
+import { ActionContextType, ActionElement, IAction, ModelFieldType, ViewType } from '@oinone/kunlun-meta';
 import { Condition } from '@oinone/kunlun-request';
 import { DEFAULT_TRUE_CONDITION } from '@oinone/kunlun-service';
 import { BooleanHelper, debugConsole, GraphqlHelper, ReturnPromise } from '@oinone/kunlun-shared';
-import { ButtonBizStyle, ButtonType, ConfirmType, PopconfirmPlacement } from '@oinone/kunlun-vue-ui-common';
+import {
+  ButtonBizStyle,
+  ButtonType,
+  ConfirmType,
+  PopconfirmPlacement,
+  StyleHelper
+} from '@oinone/kunlun-vue-ui-common';
 import { Widget } from '@oinone/kunlun-vue-widget';
 import { isBoolean, isNil, isString, set as setData } from 'lodash-es';
-import { Component, toRaw } from 'vue';
+import { Component, createVNode, toRaw } from 'vue';
 import { BaseActionWidget, BaseActionWidgetProps, BaseView, QueryExpression } from '../../../basic';
 import { ActionKeyboardConfig, ClickResult, fetchPopconfirmPlacement } from '../../../typing';
 import { executeConfirm } from '../../../util';
@@ -310,9 +326,8 @@ export class ActionWidget<
 
       if (length) {
         return GraphqlHelper.serializableObject(queryData);
-      } else {
-        return '{}';
       }
+      return '{}';
     };
 
     return { rsql, queryData, condition, queryDataToString };
@@ -471,26 +486,28 @@ export class ActionWidget<
   @Widget.Reactive()
   protected get enableConfirm(): boolean {
     const enableConfirm = this.getDsl().enableConfirm;
-    const rst = BooleanHelper.toBoolean(enableConfirm);
-
-    // 如果返回值是undefined ｜ null，说明enableConfirm是表达式，需要执行表达式
-    if (isNil(rst)) {
-      const scene = this.scene;
-
-      return Expression.run(
-        {
-          activeRecords: this.activeRecords,
-          rootRecord: this.rootData?.[0] || {},
-          openerRecord: this.openerActiveRecords?.[0] || {},
-          scene: scene,
-          activeRecord: this.activeRecords?.[0] || {},
-          parentRecord: this.parentViewActiveRecords?.[0] || {}
-        } as ExpressionRunParam,
-        enableConfirm,
-        enableConfirm
-      );
+    if (enableConfirm != null) {
+      const rst = BooleanHelper.toBoolean(enableConfirm);
+      if (isNil(rst)) {
+        const scene = this.scene;
+
+        return Expression.run(
+          {
+            activeRecords: this.activeRecords,
+            rootRecord: this.rootData?.[0] || {},
+            openerRecord: this.openerActiveRecords?.[0] || {},
+            scene,
+            activeRecord: this.activeRecords?.[0] || {},
+            parentRecord: this.parentViewActiveRecords?.[0] || {}
+          } as ExpressionRunParam,
+          enableConfirm,
+          enableConfirm
+        );
+      }
+      return rst;
     }
-    return rst;
+    const { confirmText, confirmFun } = this;
+    return !!confirmText || !!confirmFun;
   }
 
   /**
@@ -510,7 +527,7 @@ export class ActionWidget<
   protected get confirmType(): ConfirmType | undefined {
     const { confirmType } = this.getDsl();
     if (confirmType) {
-      const realConfirmType = ConfirmType[confirmType];
+      const realConfirmType = ConfirmType[confirmType.toUpperCase()];
       if (realConfirmType) {
         return realConfirmType;
       }
@@ -536,6 +553,16 @@ export class ActionWidget<
     return undefined;
   }
 
+  @Widget.Reactive()
+  protected get confirmHtml(): boolean | undefined {
+    return BooleanHelper.toBoolean(this.getDsl().confirmHtml);
+  }
+
+  @Widget.Reactive()
+  protected get confirmFun(): string | undefined {
+    return this.getDsl().confirmFun;
+  }
+
   @Widget.Reactive()
   protected get confirmPosition(): PopconfirmPlacement {
     return fetchPopconfirmPlacement(this.getDsl().confirmPosition) || PopconfirmPlacement.BM;
@@ -550,6 +577,11 @@ export class ActionWidget<
     return translate('kunlun.common.prompt');
   }
 
+  @Widget.Reactive()
+  protected get confirmWidth(): string | undefined {
+    return StyleHelper.px(this.getDsl().confirmWidth);
+  }
+
   @Widget.Reactive()
   protected get enterText(): string | undefined {
     const { enterText } = this.getDsl();
@@ -760,12 +792,70 @@ export class ActionWidget<
    * 二次弹窗校验
    */
   @Widget.Method()
-  public validateConfirm(): Promise<boolean> {
+  public async validateConfirm(): Promise<boolean> {
     if (this.enableConfirm && this.confirmType === ConfirmType.MODAL) {
-      const { confirmText } = this;
+      const { confirmText, confirmFun } = this;
       if (confirmText) {
+        return this.validateConfirmByText();
+      }
+      if (confirmFun) {
+        return this.validateConfirmByFun();
+      }
+    }
+    return Promise.resolve(true);
+  }
+
+  protected async validateConfirmByText(): Promise<boolean> {
+    const { confirmTitle, confirmWidth, confirmHtml, confirmText } = this;
+    let confirm: string | Function = confirmText!;
+    if (confirmHtml) {
+      confirm = () => createVNode('span', { innerHTML: confirmText });
+    }
+    return executeConfirm({
+      title: confirmTitle,
+      width: confirmWidth,
+      confirm: confirm as unknown as string,
+      enterText: this.enterText,
+      cancelText: this.cancelText
+    });
+  }
+
+  protected async validateConfirmByFun(): Promise<boolean> {
+    const { confirmTitle, confirmWidth, confirmHtml, confirmFun } = this;
+    const functionDefinition = await FunctionCache.get(this.model.model, confirmFun!);
+    if (functionDefinition) {
+      const requestFields = await this.getRequestModelFields();
+      const submitValue = await this.submit(this.action);
+      const message = await this.executeFunction<string | ConfirmModal>(
+        functionDefinition,
+        requestFields,
+        submitValue.records
+      );
+      if (message) {
+        let title: string = confirmTitle!;
+        let confirm: string | Function;
+        if (typeof message === 'string') {
+          confirm = message;
+        } else {
+          const expressionParam: ExpressionRunParam = {
+            activeRecords: [message.context || {}],
+            rootRecord: this.rootData?.[0] || {},
+            activeRecord: message.context || {},
+            scene: this.scene,
+            openerRecord: this.openerActiveRecords?.[0] || {},
+            parentRecord: this.parentViewActiveRecords?.[0] || {}
+          };
+          title = Expression.replaceRun(expressionParam, message.title || title || '');
+          confirm = Expression.replaceRun(expressionParam, translateValueByKey(message.content || ''));
+        }
+        if (confirmHtml) {
+          const finalMessage = confirm;
+          confirm = () => createVNode('span', { innerHTML: finalMessage });
+        }
         return executeConfirm({
-          confirm: confirmText,
+          title,
+          width: confirmWidth,
+          confirm: confirm as unknown as string,
           enterText: this.enterText,
           cancelText: this.cancelText
         });
@@ -947,6 +1037,91 @@ export class ActionWidget<
     return result;
   }
 
+  protected async getRequestModelFields(options?: GetRequestModelFieldsOptions): Promise<RequestModelField[]> {
+    const { viewType } = this;
+    if (viewType === ViewType.Tree) {
+      const runtimeModel = await ModelCache.get(this.model.model);
+      if (runtimeModel) {
+        return runtimeModel.modelFields.map((field) => ({ field }));
+      }
+      return [];
+    }
+    if (this.popupScene) {
+      return this.seekPopupMainRuntimeContext().getRequestModelFields(options);
+    }
+    return this.rootRuntimeContext.getRequestModelFields(options);
+  }
+
+  protected seekPopupMainRuntimeContext(): RuntimeContext {
+    if (this.metadataHandle === this.rootHandle) {
+      const modelModel = this.model.model;
+      if (modelModel) {
+        const popupMainRuntimeContext = RuntimeContextManager.getOthers(this.rootHandle)?.find(
+          (v) => v.model.model === modelModel
+        );
+        if (popupMainRuntimeContext) {
+          return popupMainRuntimeContext;
+        }
+      }
+    }
+    return this.rootRuntimeContext;
+  }
+
+  protected async submit(action: RuntimeServerAction): Promise<SubmitValue> {
+    let records: ActiveRecords | undefined;
+    let relationRecords: SubmitRelationValue[] | undefined;
+    if (!this.inline && this.submitCallChaining) {
+      const callResult = await this.submitCallChaining?.syncCall();
+      if (callResult != null) {
+        records = callResult.records;
+        relationRecords = callResult.relationRecords;
+      }
+    }
+    if (records == null) {
+      records = this.activeRecords || [];
+    }
+    if (action.contextType === ActionContextType.Batch || action.contextType === ActionContextType.SingleAndBatch) {
+      // do nothing.
+    } else if (action.contextType === ActionContextType.Single) {
+      if (Array.isArray(records)) {
+        [records] = records;
+      }
+    } else {
+      const ttype = action.functionDefinition?.argumentList?.[0]?.ttype;
+      if (ttype && [ModelFieldType.ManyToOne, ModelFieldType.OneToOne].includes(ttype as ModelFieldType)) {
+        if (Array.isArray(records)) {
+          [records] = records;
+        }
+      }
+    }
+    if (!records) {
+      if (action.contextType !== ActionContextType.ContextFree) {
+        const name = this.action?.displayName || this.action?.label;
+        throw new Error(`${name} action not params`);
+      }
+      records = {};
+    }
+    return new SubmitValue(records, relationRecords);
+  }
+
+  protected executeFunction<T>(
+    functionDefinition: RuntimeFunctionDefinition,
+    requestFields: RequestModelField[],
+    activeRecords: ActiveRecords | undefined
+  ): Promise<T> {
+    activeRecords = this.mergeContext(activeRecords);
+    return FunctionService.INSTANCE.simpleExecute(
+      this.model,
+      functionDefinition,
+      {
+        requestModels: FunctionService.usingStaticModels(),
+        requestFields,
+        variables: this.rootRuntimeContext.generatorVariables({ path: this.action.sessionPath })
+      },
+      activeRecords
+    );
+  }
+
   private validatorByExpression(expression: string) {
     Expression.getInstance().initExpressionContext(
       this.activeRecords,

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

@@ -1,28 +1,21 @@
 import {
-  ActiveRecords,
   Dialog,
   Drawer,
   executeViewAction,
   FunctionCache,
   FunctionService,
-  GetRequestModelFieldsOptions,
-  ModelCache,
   MultiTabsManager,
   RelationUpdateType,
   RequestModelField,
   ROOT_HANDLE,
   RuntimeContext,
-  RuntimeContextManager,
-  RuntimeFunctionDefinition,
   RuntimeServerAction,
   RuntimeViewAction,
-  StaticMetadata,
-  SubmitRelationValue,
   SubmitValue,
   translateValueByKey,
   UpdateOneWithRelationsService
 } from '@oinone/kunlun-engine';
-import { ActionContextType, ActionType, ModelFieldType, ViewType } from '@oinone/kunlun-meta';
+import { ActionType, ViewType } from '@oinone/kunlun-meta';
 import { HttpClientError, MessageHub, RequestErrorInterceptor, SystemErrorCode } from '@oinone/kunlun-request';
 import { SPI } from '@oinone/kunlun-spi';
 import { BooleanHelper, CallChaining, debugConsole, OioNotification } from '@oinone/kunlun-vue-ui-antd';
@@ -157,48 +150,6 @@ export class ServerActionWidget extends ActionWidget<RuntimeServerAction> {
     }
   }
 
-  protected async submit(action: RuntimeServerAction): Promise<SubmitValue> {
-    let records: ActiveRecords | undefined;
-    let relationRecords: SubmitRelationValue[] | undefined;
-    if (!this.inline && this.submitCallChaining) {
-      debugConsole.run(() => {
-        if ([ViewType.Detail, ViewType.Form].includes(this.viewType!)) {
-          debugConsole.log('formData in view:', this.activeRecords?.[0]);
-        }
-      });
-      const callResult = await this.submitCallChaining?.syncCall();
-      if (callResult != null) {
-        records = callResult.records;
-        relationRecords = callResult.relationRecords;
-      }
-    }
-    if (records == null) {
-      records = this.activeRecords || [];
-    }
-    if (action.contextType === ActionContextType.Batch || action.contextType === ActionContextType.SingleAndBatch) {
-      // do nothing.
-    } else if (action.contextType === ActionContextType.Single) {
-      if (Array.isArray(records)) {
-        [records] = records;
-      }
-    } else {
-      const ttype = action.functionDefinition?.argumentList?.[0]?.ttype;
-      if (ttype && [ModelFieldType.ManyToOne, ModelFieldType.OneToOne].includes(ttype as ModelFieldType)) {
-        if (Array.isArray(records)) {
-          [records] = records;
-        }
-      }
-    }
-    if (!records) {
-      if (action.contextType !== ActionContextType.ContextFree) {
-        const name = this.action?.displayName || this.action?.label;
-        throw new Error(`${name} action not params`);
-      }
-      records = {};
-    }
-    return new SubmitValue(records, relationRecords);
-  }
-
   protected async clickActionAfter(result: ClickResult): Promise<ClickResult> {
     let refreshParent = false;
     if (this.isDialog) {
@@ -207,8 +158,8 @@ export class ServerActionWidget extends ActionWidget<RuntimeServerAction> {
         await this.clickActionAfterRefreshData(result, refreshParent);
         this.closeAllDialog ? Dialog.disposeAll() : Dialog.dispose(this.action);
         return result;
-      } else if (this.goBack) {
-        // eslint-disable-next-line no-restricted-globals
+      }
+      if (this.goBack) {
         this.historyBack();
         return result;
       }
@@ -218,13 +169,12 @@ export class ServerActionWidget extends ActionWidget<RuntimeServerAction> {
         await this.clickActionAfterRefreshData(result, refreshParent);
         this.closeAllDrawer ? Drawer.disposeAll() : Drawer.dispose(this.action);
         return result;
-      } else if (this.goBack) {
-        // eslint-disable-next-line no-restricted-globals
+      }
+      if (this.goBack) {
         this.historyBack();
         return result;
       }
     } else if (this.goBack) {
-      // eslint-disable-next-line no-restricted-globals
       this.historyBack();
       return result;
     }
@@ -355,36 +305,6 @@ export class ServerActionWidget extends ActionWidget<RuntimeServerAction> {
     return !!parameters.relationRecords.length;
   }
 
-  protected seekPopupMainRuntimeContext(): RuntimeContext {
-    if (this.metadataHandle === this.rootHandle) {
-      const modelModel = this.model.model;
-      if (modelModel) {
-        const popupMainRuntimeContext = RuntimeContextManager.getOthers(this.rootHandle)?.find(
-          (v) => v.model.model === modelModel
-        );
-        if (popupMainRuntimeContext) {
-          return popupMainRuntimeContext;
-        }
-      }
-    }
-    return this.rootRuntimeContext;
-  }
-
-  protected async getRequestModelFields(options?: GetRequestModelFieldsOptions): Promise<RequestModelField[]> {
-    const { viewType } = this;
-    if (viewType === ViewType.Tree) {
-      const runtimeModel = await ModelCache.get(this.model.model);
-      if (runtimeModel) {
-        return runtimeModel.modelFields.map((field) => ({ field }));
-      }
-      return [];
-    }
-    if (this.popupScene) {
-      return this.seekPopupMainRuntimeContext().getRequestModelFields(options);
-    }
-    return this.rootRuntimeContext.getRequestModelFields(options);
-  }
-
   protected async executeAction(action: RuntimeServerAction, submitValue: SubmitValue): Promise<ClickResult> {
     if (
       (this.updateOneWithRelationName === action.fun || this.updateActionName === action.name) &&
@@ -407,27 +327,9 @@ export class ServerActionWidget extends ActionWidget<RuntimeServerAction> {
     return this.executeFunction(functionDefinition, requestFields, submitValue.records);
   }
 
-  protected executeFunction<T>(
-    functionDefinition: RuntimeFunctionDefinition,
-    requestFields: RequestModelField[],
-    activeRecords: ActiveRecords | undefined
-  ): Promise<T> {
-    activeRecords = this.mergeContext(activeRecords);
-    return FunctionService.INSTANCE.simpleExecute(
-      this.model,
-      functionDefinition,
-      {
-        requestModels: [StaticMetadata.ResourceAddress],
-        requestFields,
-        variables: this.rootRuntimeContext.generatorVariables({ path: this.action.sessionPath })
-      },
-      activeRecords
-    );
-  }
-
   protected executeRelationUpdate<T>(requestFields: RequestModelField[], submitValue: SubmitValue): Promise<T> {
     return UpdateOneWithRelationsService.execute(this.model, submitValue, {
-      requestModels: [StaticMetadata.ResourceAddress],
+      requestModels: FunctionService.usingStaticModels(),
       requestFields,
       variables: this.rootRuntimeContext.generatorVariables({ path: this.action.sessionPath })
     });

package/src/action/url-actions/UrlActionWidget.ts

@@ -2,19 +2,14 @@ import {
   ActiveRecord,
   FunctionCache,
   FunctionService,
-  GetRequestModelFieldsOptions,
-  ModelCache,
   RedirectTargetEnum,
   RequestModelField,
-  RuntimeContext,
-  RuntimeContextManager,
   RuntimeFunctionDefinition,
   RuntimeUrlAction,
-  StaticMetadata,
   translateValueByKey
 } from '@oinone/kunlun-engine';
 import { Expression } from '@oinone/kunlun-expression';
-import { ActionType, ViewActionTarget, ViewType } from '@oinone/kunlun-meta';
+import { ActionType, ViewActionTarget } from '@oinone/kunlun-meta';
 import { ReturnPromise } from '@oinone/kunlun-shared';
 import { SPI } from '@oinone/kunlun-spi';
 import { OioMessage, OioNotification } from '@oinone/kunlun-vue-ui-antd';
@@ -67,36 +62,6 @@ export class UrlActionWidget extends ActionWidget<RuntimeUrlAction> {
     return res;
   }
 
-  protected seekPopupMainRuntimeContext(): RuntimeContext {
-    if (this.metadataHandle === this.rootHandle) {
-      const modelModel = this.model.model;
-      if (modelModel) {
-        const popupMainRuntimeContext = RuntimeContextManager.getOthers(this.rootHandle)?.find(
-          (v) => v.model.model === modelModel
-        );
-        if (popupMainRuntimeContext) {
-          return popupMainRuntimeContext;
-        }
-      }
-    }
-    return this.rootRuntimeContext;
-  }
-
-  protected async getRequestModelFields(options?: GetRequestModelFieldsOptions): Promise<RequestModelField[]> {
-    const { viewType } = this;
-    if (viewType === ViewType.Tree) {
-      const runtimeModel = await ModelCache.get(this.model.model);
-      if (runtimeModel) {
-        return runtimeModel.modelFields.map((field) => ({ field }));
-      }
-      return [];
-    }
-    if (this.popupScene) {
-      return this.seekPopupMainRuntimeContext().getRequestModelFields(options);
-    }
-    return this.rootRuntimeContext.getRequestModelFields(options);
-  }
-
   protected executeFunction<T>(
     functionDefinition: RuntimeFunctionDefinition,
     requestFields: RequestModelField[],
@@ -109,7 +74,7 @@ export class UrlActionWidget extends ActionWidget<RuntimeUrlAction> {
       this.model,
       functionDefinition,
       {
-        requestModels: [StaticMetadata.ResourceAddress],
+        requestModels: FunctionService.usingStaticModels(),
         requestFields,
         variables: { path: this.action.sessionPath }
       },