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

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/spi/LayoutManager.d.ts

@@ -8,31 +8,31 @@ export interface LayoutRegisterOptions extends SPIOptions {
     /**
      * 视图类型
      */
-    viewType: ViewType;
+    viewType: ViewType | ViewType[];
     /**
-     * 视图模型所在模块编码，一般是驼峰风格的英文 designerCommon
+     * 视图模型所在模块编码，一般是下划线风格的英文 designer_common
      */
-    module?: string;
+    module?: string | string[];
     /**
-     * 视图模型所在模块名称，一般是下划线风格的英文 designer_common
+     * 视图模型所在模块名称，一般是驼峰风格的英文 designerCommon
      */
-    moduleName?: string;
+    moduleName?: string | string[];
     /**
-     * 布局名称，对应viewActionQuery.load.resView.baseLayoutName
+     * 布局名称，对应 viewActionQuery.load.resView.baseLayoutName
      */
-    layoutName?: string;
+    layoutName?: string | string[];
     /**
      * 视图的模型编码
      */
-    model?: string;
+    model?: string | string[];
     /**
      * 视图的模型名称
      */
-    modelName?: string;
+    modelName?: string | string[];
     /**
      * 视图的名称
      */
-    viewName?: string;
+    viewName?: string | string[];
     /**
      * 是否为内嵌视图(子视图特有)，表单页内有个o2m的子表格，该表格的inline为true
      */
@@ -40,23 +40,23 @@ export interface LayoutRegisterOptions extends SPIOptions {
     /**
      * 模型字段类型(子视图特有)
      */
-    ttype?: ModelFieldType;
+    ttype?: ModelFieldType | ModelFieldType[];
     /**
      * 关联模型字段类型(子视图特有)
      */
-    relatedTtype?: ModelFieldType;
+    relatedTtype?: ModelFieldType | ModelFieldType[];
     /**
      * 字段(子视图特有)
      */
-    field?: string;
+    field?: string | string[];
     /**
      * 动作名称
      */
-    actionName?: string;
+    actionName?: string | string[];
     /**
      * 动作使用的组件名称
      */
-    actionWidget?: string;
+    actionWidget?: string | string[];
 }
 export declare class LayoutManager {
     private static Token;
@@ -64,6 +64,9 @@ export declare class LayoutManager {
     static register(options: LayoutRegisterOptions, template: string): boolean;
     static selector(options: LayoutRegisterOptions): DslDefinition | undefined;
 }
+/**
+ * @deprecated please use {@link LayoutRegisterOptions}
+ */
 export declare type ILayoutOption = LayoutRegisterOptions;
-export declare function registerLayout(layoutTpl: string, layoutOption: ILayoutOption): boolean;
-export declare function generatorLayout(layoutOption: ILayoutOption): DslDefinition | undefined;
+export declare function registerLayout(layoutTpl: string, layoutOption: LayoutRegisterOptions): boolean;
+export declare function generatorLayout(layoutOption: LayoutRegisterOptions): DslDefinition | undefined;

package/dist/types/src/spi/MaskManager.d.ts

@@ -1,8 +1,33 @@
+import { ViewType } from '@oinone/kunlun-meta';
 import { SPIOptions } from '@oinone/kunlun-spi';
 export interface MaskRegisterOptions extends SPIOptions {
-    module?: string;
-    moduleName?: string;
-    model?: string;
+    /**
+     * 视图类型
+     */
+    viewType?: ViewType | ViewType[];
+    /**
+     * 模块编码
+     */
+    module?: string | string[];
+    /**
+     * 模块名称
+     */
+    moduleName?: string | string[];
+    /**
+     * 模型编码
+     */
+    model?: string | string[];
+    /**
+     * 模型名称
+     */
+    modelName?: string | string[];
+    /**
+     * 视图名称
+     */
+    viewName?: string | string[];
+    /**
+     * 动作名称
+     */
     actionName?: string | string[];
 }
 export declare class MaskManager {
@@ -11,6 +36,9 @@ export declare class MaskManager {
     static register(options: MaskRegisterOptions, template: string): boolean;
     static selector(options: MaskRegisterOptions): string | undefined;
 }
+/**
+ * @deprecated please use {@link MaskRegisterOptions}
+ */
 export declare type IMaskOption = MaskRegisterOptions;
-export declare function registerMask(maskTpl: string, maskOption?: IMaskOption): boolean;
-export declare function generatorMask(maskOption?: IMaskOption): string | undefined;
+export declare function registerMask(maskTpl: string, maskOption?: MaskRegisterOptions): boolean;
+export declare function generatorMask(maskOption?: MaskRegisterOptions): string | undefined;

package/dist/types/src/tags/context/runtime-context-helper.d.ts

@@ -1,5 +1,6 @@
 import { DslDefinition } from '@oinone/kunlun-dsl';
 import { RuntimeContext, RuntimeContextService, RuntimeModelField, RuntimeView, RuntimeViewAction } from '@oinone/kunlun-engine';
+export declare function seekViewMask(viewAction: RuntimeViewAction, moduleName?: string): DslDefinition;
 export declare function createRuntimeContextByViewAction(viewAction: RuntimeViewAction, inline: boolean, nodeHandle?: string, rootHandle?: string): RuntimeContext | undefined;
 export declare function createRuntimeContextByView(view: RuntimeView, inline: boolean, nodeHandle?: string, rootHandle?: string): RuntimeContext;
 export declare function createRuntimeContextByFieldSubview(view: RuntimeView, field: RuntimeModelField, inline: boolean, nodeHandle?: string, rootHandle?: string): RuntimeContext;

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.12",
   "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.12",
+    "@oinone/kunlun-vue-router": "6.2.12",
+    "@oinone/kunlun-vue-ui": "6.2.12",
+    "@oinone/kunlun-vue-ui-antd": "6.2.12",
+    "@oinone/kunlun-vue-ui-common": "6.2.12",
+    "@oinone/kunlun-vue-ui-el": "6.2.12",
+    "@oinone/kunlun-vue-widget": "6.2.12",
     "@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,