@ibiz-template/vue3-components 0.0.1-alpha.2 → 0.0.1-alpha.3

package/es/common/action-toolbar/action-toolbar.d.ts

@@ -0,0 +1,64 @@
+import { PropType } from 'vue';
+import { IButtonContainerState } from '@ibiz-template/runtime';
+import { IUIActionGroupDetail } from '@ibiz/model-core';
+import './action-toolbar.scss';
+export declare const ActionToolbar: import("vue").DefineComponent<{
+    actionDetails: {
+        type: {
+            (arrayLength: number): IUIActionGroupDetail[];
+            (...items: IUIActionGroupDetail[]): IUIActionGroupDetail[];
+            new (arrayLength: number): IUIActionGroupDetail[];
+            new (...items: IUIActionGroupDetail[]): IUIActionGroupDetail[];
+            isArray(arg: any): arg is any[];
+            readonly prototype: any[];
+            from<T>(arrayLike: ArrayLike<T>): T[];
+            from<T_1, U>(arrayLike: ArrayLike<T_1>, mapfn: (v: T_1, k: number) => U, thisArg?: any): U[];
+            from<T_2>(iterable: Iterable<T_2> | ArrayLike<T_2>): T_2[];
+            from<T_3, U_1>(iterable: Iterable<T_3> | ArrayLike<T_3>, mapfn: (v: T_3, k: number) => U_1, thisArg?: any): U_1[];
+            of<T_4>(...items: T_4[]): T_4[];
+            readonly [Symbol.species]: ArrayConstructor;
+        };
+        required: true;
+    };
+    actionsState: {
+        type: PropType<IButtonContainerState>;
+        required: true;
+    };
+    caption: StringConstructor;
+    mode: {
+        type: PropType<"dropdown" | "buttons">;
+        default: string;
+    };
+}, {
+    ns: import("@ibiz-template/core").Namespace;
+    handleClick: (detail: IUIActionGroupDetail, event: MouseEvent) => Promise<void>;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    actionDetails: {
+        type: {
+            (arrayLength: number): IUIActionGroupDetail[];
+            (...items: IUIActionGroupDetail[]): IUIActionGroupDetail[];
+            new (arrayLength: number): IUIActionGroupDetail[];
+            new (...items: IUIActionGroupDetail[]): IUIActionGroupDetail[];
+            isArray(arg: any): arg is any[];
+            readonly prototype: any[];
+            from<T>(arrayLike: ArrayLike<T>): T[];
+            from<T_1, U>(arrayLike: ArrayLike<T_1>, mapfn: (v: T_1, k: number) => U, thisArg?: any): U[];
+            from<T_2>(iterable: Iterable<T_2> | ArrayLike<T_2>): T_2[];
+            from<T_3, U_1>(iterable: Iterable<T_3> | ArrayLike<T_3>, mapfn: (v: T_3, k: number) => U_1, thisArg?: any): U_1[];
+            of<T_4>(...items: T_4[]): T_4[];
+            readonly [Symbol.species]: ArrayConstructor;
+        };
+        required: true;
+    };
+    actionsState: {
+        type: PropType<IButtonContainerState>;
+        required: true;
+    };
+    caption: StringConstructor;
+    mode: {
+        type: PropType<"dropdown" | "buttons">;
+        default: string;
+    };
+}>>, {
+    mode: "dropdown" | "buttons";
+}>;

package/es/common/app-col/app-col.d.ts

@@ -1,5 +1,6 @@
 import { PropType } from 'vue';
 import { ILayoutPos } from '@ibiz/model-core';
+import { ILayoutController } from '@ibiz-template/runtime';
 export declare const AppCol: import("vue").DefineComponent<{
     layoutPos: PropType<ILayoutPos>;
     controller: {
@@ -15,25 +16,25 @@ export declare const AppCol: import("vue").DefineComponent<{
         lg?: undefined;
     } | {
         xs: {
-            span: number;
-            offset: number;
+            span?: number | undefined;
+            offset?: number | undefined;
         };
         sm: {
-            span: number;
-            offset: number;
+            span?: number | undefined;
+            offset?: number | undefined;
         };
         md: {
-            span: number;
-            offset: number;
+            span?: number | undefined;
+            offset?: number | undefined;
         };
         lg: {
-            span: number;
-            offset: number;
+            span?: number | undefined;
+            offset?: number | undefined;
         };
     }>;
     cssVars: import("vue").ComputedRef<{
-        width: any;
-        height: any;
+        width: string;
+        height: string;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     layoutPos: PropType<ILayoutPos>;

package/es/common/app-col/app-col.js

@@ -1,5 +1,18 @@
 import { defineComponent, computed, createVNode, h, resolveComponent } from "vue";
 import { useNamespace } from "@ibiz-template/vue3-util";
+function calcGridSpanOffset(span, offset, layout) {
+  const multiplier = layout === "TABLE_24COL" ? 1 : 2;
+  const spanDefault = layout === "TABLE_24COL" ? 24 : 12;
+  const _span = !span || span === -1 ? spanDefault : span;
+  const _offset = !offset || offset === -1 ? 0 : offset;
+  const result = {
+    span: _span * multiplier
+  };
+  if (_offset !== 0) {
+    result.offset = _offset;
+  }
+  return result;
+}
 const AppCol = /* @__PURE__ */ defineComponent({
   name: "AppCol",
   props: {
@@ -16,32 +29,21 @@ const AppCol = /* @__PURE__ */ defineComponent({
       if (gridLayoutPos.layout === "FLEX") {
         return {};
       }
-      const colXS = gridLayoutPos.colXS || 0;
-      const colXSOffset = gridLayoutPos.colXSOffset || 0;
-      const colSM = gridLayoutPos.colSM || 0;
-      const colSMOffset = gridLayoutPos.colSMOffset || 0;
-      const colMD = gridLayoutPos.colMD || 0;
-      const colMDOffset = gridLayoutPos.colMDOffset || 0;
-      const colLG = gridLayoutPos.colLG || 0;
-      const colLGOffset = gridLayoutPos.colLGOffset || 0;
-      const multiplier = gridLayoutPos.layout === "TABLE_24COL" ? 1 : 2;
+      const {
+        colXS,
+        colXSOffset,
+        colSM,
+        colSMOffset,
+        colMD,
+        colMDOffset,
+        colLG,
+        colLGOffset
+      } = gridLayoutPos;
       return {
-        xs: {
-          span: colXS * multiplier,
-          offset: colXSOffset * multiplier
-        },
-        sm: {
-          span: colSM * multiplier,
-          offset: colSMOffset * multiplier
-        },
-        md: {
-          span: colMD * multiplier,
-          offset: colMDOffset * multiplier
-        },
-        lg: {
-          span: colLG * multiplier,
-          offset: colLGOffset * multiplier
-        }
+        xs: calcGridSpanOffset(colXS, colXSOffset, gridLayoutPos.layout),
+        sm: calcGridSpanOffset(colSM, colSMOffset, gridLayoutPos.layout),
+        md: calcGridSpanOffset(colMD, colMDOffset, gridLayoutPos.layout),
+        lg: calcGridSpanOffset(colLG, colLGOffset, gridLayoutPos.layout)
       };
     });
     const cssVars = computed(() => {
@@ -69,6 +71,8 @@ const AppCol = /* @__PURE__ */ defineComponent({
         "class": [this.ns.b(), this.ns.m("flex"), this.controller.extraClass],
         "style": {
           flexGrow: this.layoutPos.grow,
+          // 修复flex时flex-grow和flex-shrink时高度被内容撑开，没法压缩
+          minHeight: 0,
           ...this.cssVars
         }
       }, [defaultSlot]);

package/es/common/app-icon/app-icon.d.ts

@@ -17,4 +17,3 @@ export declare const AppIcon: import("vue").DefineComponent<{
         type: PropType<"small" | "medium" | "large">;
     };
 }>>, {}>;
-export default AppIcon;

package/es/common/app-icon/app-icon.js

@@ -66,6 +66,5 @@ const AppIcon = /* @__PURE__ */ defineComponent({
   }
 });
 export {
-  AppIcon,
-  AppIcon as default
+  AppIcon
 };

package/es/common/app-router-view/app-router-view.js

@@ -1,4 +1,5 @@
 import { defineComponent, watch, createVNode, resolveComponent, h } from "vue";
+import { isNotNil } from "ramda";
 const AppRouterView = /* @__PURE__ */ defineComponent({
   name: "AppRouterView",
   inheritAttrs: false,
@@ -18,7 +19,7 @@ const AppRouterView = /* @__PURE__ */ defineComponent({
     const cache = {};
     let isActive = true;
     watch(() => props.manualKey, (newVal, oldVal) => {
-      if (newVal && newVal !== oldVal) {
+      if (isNotNil(newVal) && newVal !== oldVal) {
         isActive = true;
       }
     });

package/es/common/app-row/app-row.js

@@ -23,9 +23,10 @@ const AppRow = /* @__PURE__ */ defineComponent({
         align,
         valign
       } = this.layout;
+      const _dir = dir || "column";
       return createVNode("div", {
         "class": [this.ns.b(), this.ns.m("flex")],
-        "style": `display:flex;flex-direction: ${dir};justify-content: ${align};align-items: ${valign};`
+        "style": `display:flex;flex-direction: ${_dir};justify-content: ${align};align-items: ${valign};`
       }, [defaultSlot]);
     }
     return createVNode(resolveComponent("el-row"), {

package/es/{layout → common}/control-base/control-base.js

@@ -1,6 +1,5 @@
-import { defineComponent, createVNode, resolveComponent } from "vue";
+import { defineComponent, createVNode } from "vue";
 import { useNamespace } from "@ibiz-template/vue3-util";
-import { kebabCase } from "lodash-es";
 const ControlBase = /* @__PURE__ */ defineComponent({
   props: {
     controller: {
@@ -17,24 +16,18 @@ const ControlBase = /* @__PURE__ */ defineComponent({
     } = props.controller.model;
     const typeClass = controlType.toLowerCase();
     const sysCssName = sysCss == null ? void 0 : sysCss.cssName;
-    const modelClass = kebabCase(codeName);
     return {
       ns,
       typeClass,
       sysCssName,
-      modelClass
+      codeName
     };
   },
   render() {
-    return createVNode(resolveComponent("control-layout"), {
-      "modelData": this.controller.model,
-      "class": [this.ns.b(), this.ns.b(this.typeClass), this.ns.m(this.modelClass), this.sysCssName]
-    }, {
-      default: () => {
-        var _a, _b;
-        return [(_b = (_a = this.$slots).default) == null ? void 0 : _b.call(_a)];
-      }
-    });
+    var _a, _b;
+    return createVNode("div", {
+      "class": [this.ns.b(), this.ns.b(this.typeClass), this.ns.m(this.codeName), this.sysCssName]
+    }, [(_b = (_a = this.$slots).default) == null ? void 0 : _b.call(_a)]);
   }
 });
 export {

package/es/common/index.d.ts

@@ -1,9 +1,10 @@
+import { App } from 'vue';
 export * from './app-icon/app-icon';
 export * from './app-keep-alive/app-keep-alive';
-export * from './app-keep-alive/scheduler';
 export * from './app-router-view/app-router-view';
-export * from './app-user/app-user';
-export * from './tab-page-exp/tab-page-exp';
-export * from './quick-search/quick-search';
 export * from './app-col/app-col';
 export * from './app-row/app-row';
+export declare const IBizCommonComponents: {
+    install: (v: App) => void;
+};
+export default IBizCommonComponents;

package/es/common/index.js

@@ -1,9 +1,27 @@
+import { ActionToolbar } from "./action-toolbar/action-toolbar";
+import { AppCol } from "./app-col/app-col";
+export * from "./app-col/app-col";
+import { AppIcon } from "./app-icon/app-icon";
 export * from "./app-icon/app-icon";
+import { AppKeepAlive } from "./app-keep-alive/app-keep-alive";
 export * from "./app-keep-alive/app-keep-alive";
-export * from "./app-keep-alive/scheduler";
+import { AppRouterView } from "./app-router-view/app-router-view";
 export * from "./app-router-view/app-router-view";
-export * from "./app-user/app-user";
-export * from "./tab-page-exp/tab-page-exp";
-export * from "./quick-search/quick-search";
-export * from "./app-col/app-col";
+import { AppRow } from "./app-row/app-row";
 export * from "./app-row/app-row";
+import { ControlBase } from "./control-base/control-base";
+const IBizCommonComponents = {
+  install: (v) => {
+    v.component("ControlBase", ControlBase);
+    v.component("AppKeepAlive", AppKeepAlive);
+    v.component("AppIcon", AppIcon);
+    v.component("AppRow", AppRow);
+    v.component("AppCol", AppCol);
+    v.component("AppRouterView", AppRouterView);
+    v.component("ActionToolbar", ActionToolbar);
+  }
+};
+export {
+  IBizCommonComponents,
+  IBizCommonComponents as default
+};

package/es/control/app-menu/app-menu-provider.js

@@ -6,7 +6,7 @@ var __publicField = (obj, key, value) => {
 };
 class AppMenuProvider {
   constructor() {
-    __publicField(this, "component", "AppMenu");
+    __publicField(this, "component", "AppMenuControl");
   }
 }
 export {

package/es/control/app-menu/app-menu.controller.d.ts

@@ -1,4 +1,4 @@
-import { ControlController } from '@ibiz-template/runtime';
+import { ControlController, IAppMenuController, ControllerEvent, IAppMenuEvent, Application } from '@ibiz-template/runtime';
 import { IAppMenu, IAppMenuItem } from '@ibiz/model-core';
 import { AppMenuState } from './app-menu-state';
 /**
@@ -10,8 +10,9 @@ import { AppMenuState } from './app-menu-state';
  * @class AppMenuController
  * @extends {ControlController}
  */
-export declare class AppMenuController extends ControlController<IAppMenu> {
+export declare class AppMenuController extends ControlController<IAppMenu> implements IAppMenuController {
     state: AppMenuState;
+    evt: ControllerEvent<IAppMenuEvent>;
     /**
      * 菜单项状态
      *
@@ -26,6 +27,7 @@ export declare class AppMenuController extends ControlController<IAppMenu> {
             permitted: boolean;
         };
     };
+    app: Application;
     protected doCreated(): Promise<void>;
     /**
      * 菜单项点击回调，触发对应的应用功能
@@ -35,7 +37,7 @@ export declare class AppMenuController extends ControlController<IAppMenu> {
      * @param {string} id
      * @return {*}  {Promise<void>}
      */
-    onClickMenuItem(id: string): Promise<void>;
+    onClickMenuItem(id: string, event: MouseEvent): Promise<void>;
     /**
      * 初始化菜单项状态
      *

package/es/control/app-menu/app-menu.controller.js

@@ -20,10 +20,12 @@ class AppMenuController extends ControlController {
      * @type {{ [p: string]: { visible: boolean; permitted: boolean } }}
      */
     __publicField(this, "menuItemsState", {});
+    __publicField(this, "app");
   }
   async doCreated() {
     var _a;
     await super.doCreated();
+    this.app = await ibiz.hub.getApp(this.context.srfappid);
     (_a = this.model.appMenuItems) == null ? void 0 : _a.forEach((item) => {
       this.initMenuItemState(item);
     });
@@ -36,7 +38,7 @@ class AppMenuController extends ControlController {
    * @param {string} id
    * @return {*}  {Promise<void>}
    */
-  async onClickMenuItem(id) {
+  async onClickMenuItem(id, event) {
     const menuItem = findRecursiveChild(this.model, id, {
       compareField: "id",
       childrenFields: ["appMenuItems"]
@@ -44,7 +46,10 @@ class AppMenuController extends ControlController {
     if (!menuItem) {
       throw new RuntimeError(`找不到名为${id}的菜单项`);
     }
-    console.log(menuItem);
+    this.evt.emit("onClick", {
+      eventArg: id,
+      event
+    });
     await ibiz.commands.execute(
       AppFuncCommand.TAG,
       menuItem.appFuncId,
@@ -62,7 +67,10 @@ class AppMenuController extends ControlController {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   initMenuItemState(menu) {
     var _a;
-    const permitted = true;
+    let permitted = true;
+    if (menu.accessKey) {
+      permitted = this.app.authority.calcByResCode(menu.accessKey);
+    }
     let visible = permitted;
     if ((_a = menu.appMenuItems) == null ? void 0 : _a.length) {
       const childrenState = menu.appMenuItems.map((child) => {

package/es/control/app-menu/app-menu.d.ts

@@ -2,6 +2,7 @@ import { Namespace } from '@ibiz-template/core';
 import { IAppMenu } from '@ibiz/model-core';
 import { PropType, Ref } from 'vue';
 import './app-menu.scss';
+import { AppMenuController } from './app-menu.controller';
 export declare const AppMenu: import("vue").DefineComponent<{
     modelData: {
         type: PropType<IAppMenu>;
@@ -23,9 +24,9 @@ export declare const AppMenu: import("vue").DefineComponent<{
     };
 }, {
     menus: Ref<IDatum[]>;
-    c: any;
+    c: AppMenuController;
     key: Ref<string>;
-    onClick: (key: string) => Promise<void>;
+    onClick: (key: string, event: MouseEvent) => Promise<void>;
     ns: Namespace;
     defaultActive: Ref<string>;
     defaultOpens: Ref<string[]>;
@@ -50,7 +51,7 @@ export declare const AppMenu: import("vue").DefineComponent<{
         default: string;
     };
 }>>, {
+    mode: string;
     params: IParams;
     collapse: boolean;
-    mode: string;
 }>;

package/es/control/app-menu/app-menu.js

@@ -72,7 +72,7 @@ function renderSubmenu(isFirst, subMenu, collapse, ns, c) {
   });
 }
 const AppMenu = /* @__PURE__ */ defineComponent({
-  name: "AppMenu",
+  name: "AppMenuControl",
   props: {
     modelData: {
       type: Object,
@@ -98,17 +98,13 @@ const AppMenu = /* @__PURE__ */ defineComponent({
       proxy
     } = getCurrentInstance();
     const c = useControlController((...args) => new AppMenuController(...args));
+    const ns = useNamespace(`control-${c.model.controlType.toLowerCase()}`);
     const menus = ref(getMenus(c.model.appMenuItems));
     const defaultActive = ref("");
     const defaultOpens = ref([]);
-    let menuClickDoing = false;
-    const onClick = async (key2) => {
-      menuClickDoing = true;
-      await c.onClickMenuItem(key2);
-      menuClickDoing = false;
+    const onClick = async (key2, event) => {
+      await c.onClickMenuItem(key2, event);
     };
-    console.log(menuClickDoing);
-    const ns = useNamespace("control-menu");
     const key = ref(createUUID());
     const updateMenu = () => {
       setTimeout(() => {

package/es/control/app-menu/index.js

@@ -1,10 +1,14 @@
-import { ControlType } from "@ibiz-template/runtime";
-import { withInstall } from "../../util/install";
+import { registerControlProvider, ControlType } from "@ibiz-template/runtime";
+import { withInstall } from "@ibiz-template/vue3-util";
 import { AppMenu } from "./app-menu";
+export * from "./app-menu";
 import { AppMenuProvider } from "./app-menu-provider";
+export * from "./app-menu-provider";
+export * from "./app-menu-state";
+export * from "./app-menu.controller";
 const IBizAppMenu = withInstall(AppMenu, function(v) {
   v.component(AppMenu.name, AppMenu);
-  ibiz.register.control.register(ControlType.APP_MENU, new AppMenuProvider());
+  registerControlProvider(ControlType.APP_MENU, () => new AppMenuProvider());
 });
 export {
   IBizAppMenu,

package/es/control/form/form/form.controller.d.ts

@@ -1,4 +1,4 @@
-import { ControlController, ControllerEvent, ControlVO, FormNotifyState, IFormDetailProvider, IFormEvent } from '@ibiz-template/runtime';
+import { ControlController, ControllerEvent, ControlVO, FormNotifyState, IFormController, IFormDetailProvider, IFormEvent } from '@ibiz-template/runtime';
 import { IDEForm, IDEFormDetail } from '@ibiz/model-core';
 import { FormDetailController } from '../form-detail/form-detail/form-detail';
 import { FormGroupPanelController } from '../form-detail/form-group-panel/form-group-panel.controller';
@@ -14,7 +14,7 @@ import { FormState } from './form-state';
  * @extends {ControlController<T>}
  * @template T
  */
-export declare abstract class FormController<T extends IDEForm = IDEForm> extends ControlController<T> {
+export declare abstract class FormController<T extends IDEForm = IDEForm> extends ControlController<T> implements IFormController {
     evt: ControllerEvent<IFormEvent>;
     state: FormState;
     /**

package/es/control/form/form/form.controller.js

@@ -5,7 +5,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 import { RuntimeError, debounceAndAsyncMerge } from "@ibiz-template/core";
-import { ControlController } from "@ibiz-template/runtime";
+import { ControlController, getFormDetailProvider } from "@ibiz-template/runtime";
 import { isNil } from "lodash-es";
 import { FormState } from "./form-state";
 class FormController extends ControlController {
@@ -122,16 +122,12 @@ class FormController extends ControlController {
    * @protected
    */
   async initDetailControllers(details = this.model.deformPages, form = this, parent = void 0) {
-    const { formDetail: register } = ibiz.register;
-    if (!register) {
-      throw new RuntimeError("formDetail注册器不存在");
-    }
     await Promise.all(
       details.map(async (detail) => {
         var _a;
-        const detailProvider = await register.get(detail);
+        const detailProvider = await getFormDetailProvider(detail);
         if (!detailProvider) {
-          throw new RuntimeError("找不到对应的适配器");
+          return;
         }
         form.providers[detail.id] = detailProvider;
         const detailController = await detailProvider.createController(

package/es/control/form/form/index.js

@@ -1,9 +1,10 @@
+import { withInstall } from "@ibiz-template/vue3-util";
+import { registerFormDetailProvider } from "@ibiz-template/runtime";
 import { FormItemProvider } from "../form-detail/form-item/form-item-provider";
 import IBizSearchForm from "../search-form";
 import { default as default2 } from "../search-form";
 import { FormControl } from "./form-control";
 export * from "./form-control";
-import { withInstall } from "../../../util/install";
 import FormPage from "../form-detail/form-page/form-page";
 import { FormPageItem } from "../form-detail/form-page/form-page-item";
 import { FormPageProvider } from "../form-detail/form-page/form-page-provider";
@@ -17,9 +18,8 @@ const IBizForm = withInstall(FormControl, function(v) {
   v.component(FormPageItem.name, FormPageItem);
   v.component(FormItemContainer.name, FormItemContainer);
   v.component(FormItem.name, FormItem);
-  const { formDetail } = ibiz.register;
-  formDetail.register("FORMITEM", new FormItemProvider());
-  formDetail.register("FORMPAGE", new FormPageProvider());
+  registerFormDetailProvider("FORMITEM", () => new FormItemProvider());
+  registerFormDetailProvider("FORMPAGE", () => new FormPageProvider());
 });
 export {
   IBizForm,

package/es/control/form/form-detail/form-detail/form-detail-state.js

@@ -31,8 +31,8 @@ class FormDetailState {
      * @type {ILayoutController}
      */
     __publicField(this, "layoutController", {
-      width: "auto",
-      height: "auto",
+      width: "",
+      height: "",
       extraStyle: {},
       extraClass: "",
       contentStyle: {}

package/es/control/form/form-detail/form-detail/form-detail.js

@@ -5,7 +5,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 import { isOverlap } from "@ibiz-template/core";
-import { calcLayoutContentStyle, verifyFormGroupLogic } from "@ibiz-template/runtime";
+import { calcLayoutHeightWidth, verifyFormGroupLogic } from "@ibiz-template/runtime";
 import { FormDetailState } from "./form-detail-state";
 class FormDetailController {
   /**
@@ -74,11 +74,10 @@ class FormDetailController {
   }
   async onInit() {
     this.state.showMoreMode = this.model.showMoreMode;
-    const { width, height, sysCss, detailType } = this.model;
-    if (width) {
+    const { layoutPos, sysCss, detailType } = this.model;
+    if (layoutPos) {
+      const { width, height } = calcLayoutHeightWidth(layoutPos);
       this.state.layoutController.width = `${width}`;
-    }
-    if (height) {
       this.state.layoutController.height = `${height}`;
     }
     this.state.layoutController.extraClass = `ibiz-form-col__${detailType.toLowerCase()} `;
@@ -92,11 +91,6 @@ class FormDetailController {
         return this.state.visible;
       }
     });
-    if (this.model.layoutPos) {
-      this.state.layoutController.contentStyle = calcLayoutContentStyle(
-        this.model.layoutPos
-      );
-    }
   }
   /**
    * 创建表单状态对象

package/es/control/form/form-detail/form-group-panel/form-group-panel.controller.d.ts

@@ -22,7 +22,7 @@ export declare class FormGroupPanelController<T extends IDEFormGroupPanel = IDEF
      * @author lxm
      * @date 2022-09-07 21:09:43
      */
-    initActionStates(): void;
+    initActionStates(): Promise<void>;
     /**
      * 触发操作列点击事件
      *

package/es/control/form/form-detail/form-group-panel/form-group-panel.controller.js

@@ -1,4 +1,4 @@
-import { ButtonContainerState, ButtonState } from "@ibiz-template/runtime";
+import { ButtonContainerState, UIActionButtonState } from "@ibiz-template/runtime";
 import { FormDetailController } from "../form-detail/form-detail";
 import { FormGroupPanelState } from "./form-group-panel-state";
 class FormGroupPanelController extends FormDetailController {
@@ -8,7 +8,7 @@ class FormGroupPanelController extends FormDetailController {
   }
   async onInit() {
     super.onInit();
-    this.initActionStates();
+    await this.initActionStates();
   }
   async formStateNotify(state) {
     super.calcDynamicLogic([], state);
@@ -22,7 +22,7 @@ class FormGroupPanelController extends FormDetailController {
    * @author lxm
    * @date 2022-09-07 21:09:43
    */
-  initActionStates() {
+  async initActionStates() {
     var _a;
     const { uiactionGroup } = this.model;
     if (!((_a = uiactionGroup == null ? void 0 : uiactionGroup.uiactionGroupDetails) == null ? void 0 : _a.length)) {
@@ -32,11 +32,15 @@ class FormGroupPanelController extends FormDetailController {
     uiactionGroup.uiactionGroupDetails.forEach((detail) => {
       const actionid = detail.uiactionId;
       if (actionid) {
-        const buttonState = new ButtonState(detail.id, actionid);
+        const buttonState = new UIActionButtonState(
+          detail.id,
+          this.form.context.srfappid,
+          actionid
+        );
         containerState.addState(detail.id, buttonState);
       }
     });
-    containerState.update();
+    await containerState.update();
     this.state.actionGroupState = containerState;
   }
   /**