@ibiz-template/vue3-components 0.1.2 → 0.1.5

package/es/control/exp-bar/calendar-exp-bar/calendar-exp-bar.provider.mjs

@@ -0,0 +1,13 @@
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class CalendarExpBarProvider {
+  constructor() {
+    __publicField(this, "component", "IBizCalendarExpBarControl");
+  }
+}
+
+export { CalendarExpBarProvider };

package/es/control/exp-bar/calendar-exp-bar/index.d.ts

@@ -0,0 +1,49 @@
+export * from './calendar-exp-bar.provider';
+export * from './calendar-exp-bar.controller';
+export declare const IBizCalendarExpBarControl: import("@ibiz-template/vue3-util").TypeWithInstall<import("vue").DefineComponent<{
+    modelData: {
+        type: import("vue").PropType<import("@ibiz/model-core").IExpBar>;
+        required: true;
+    };
+    context: {
+        type: import("vue").PropType<IContext>;
+        required: true;
+    };
+    params: {
+        type: import("vue").PropType<IParams>;
+        default: () => {};
+    };
+    srfnav: {
+        type: StringConstructor;
+        required: false;
+    };
+}, {
+    c: import("./calendar-exp-bar.controller").CalendarExpBarController;
+    ns: import("@ibiz-template/core").Namespace;
+    renderTitle: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        [key: string]: any;
+    }> | null;
+    renderQuickSearch: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        [key: string]: any;
+    }> | null;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    modelData: {
+        type: import("vue").PropType<import("@ibiz/model-core").IExpBar>;
+        required: true;
+    };
+    context: {
+        type: import("vue").PropType<IContext>;
+        required: true;
+    };
+    params: {
+        type: import("vue").PropType<IParams>;
+        default: () => {};
+    };
+    srfnav: {
+        type: StringConstructor;
+        required: false;
+    };
+}>>, {
+    params: IParams;
+}, {}>>;
+export default IBizCalendarExpBarControl;

package/es/control/exp-bar/calendar-exp-bar/index.mjs

@@ -0,0 +1,18 @@
+import { registerControlProvider, ControlType } from '@ibiz-template/runtime';
+import { withInstall } from '@ibiz-template/vue3-util';
+import { CalendarExpBarControl } from './calendar-exp-bar.mjs';
+import { CalendarExpBarProvider } from './calendar-exp-bar.provider.mjs';
+export { CalendarExpBarController } from './calendar-exp-bar.controller.mjs';
+
+const IBizCalendarExpBarControl = withInstall(
+  CalendarExpBarControl,
+  function(v) {
+    v.component(CalendarExpBarControl.name, CalendarExpBarControl);
+    registerControlProvider(
+      ControlType.CALENDAR_EXPBAR,
+      () => new CalendarExpBarProvider()
+    );
+  }
+);
+
+export { CalendarExpBarProvider, IBizCalendarExpBarControl, IBizCalendarExpBarControl as default };

package/es/control/exp-bar/exp-bar.controller.d.ts

@@ -1,5 +1,5 @@
-import { IDEGrid, IExpBar, IDETree, IDEList, IDEDataView, IDETreeNode } from '@ibiz/model-core';
-import { IExpBarControlController, IExpBarControlState, ControlController, IExpBarControlEvent, LoadEvent, IMDControlController, IPanelItemNavPosController, INavViewMsg, IToolbarController, IViewLayoutPanelController } from '@ibiz-template/runtime';
+import { IDEGrid, IExpBar, IDETree, IDEList, IDEDataView, IDETreeNode, ISysCalendarItem } from '@ibiz/model-core';
+import { IExpBarControlController, IExpBarControlState, ControlController, IExpBarControlEvent, LoadEvent, IMDControlController, IPanelItemNavPosController, INavViewMsg, IToolbarController, IViewLayoutPanelController, EventBase } from '@ibiz-template/runtime';
 /**
  * 导航部件控制器
  *
@@ -141,7 +141,7 @@ export declare class ExpBarControlController<T extends IExpBar = IExpBar, S exte
      * @param {IData} data
      * @memberof ExpBarControlController
      */
-    xDataActive(data: IData[]): void;
+    xDataActive(event: EventBase): void;
     /**
      * 解析参数
      *
@@ -151,7 +151,7 @@ export declare class ExpBarControlController<T extends IExpBar = IExpBar, S exte
      * @return {*}
      * @memberof ExpBarControlController
      */
-    prepareParams(XDataModel: IDEGrid | IDEList | IDEDataView | IDETreeNode, data: IData[]): {
+    prepareParams(XDataModel: IDEGrid | IDEList | IDEDataView | IDETreeNode | ISysCalendarItem, data: IData[], _context: IContext, _params: IParams): {
         context: IContext;
         params: IParams;
     };
@@ -173,7 +173,7 @@ export declare class ExpBarControlController<T extends IExpBar = IExpBar, S exte
      * @return {*}  {Promise<INavViewMsg>}
      * @memberof TabExpPanelController
      */
-    getNavViewMsg(data: IData[]): INavViewMsg | undefined;
+    getNavViewMsg(data: IData[], _context: IContext, _params: IParams): INavViewMsg | undefined;
     /**
      * 是否显示部件头部
      * @author lxm

package/es/control/exp-bar/exp-bar.controller.mjs

@@ -140,7 +140,7 @@ class ExpBarControlController extends ControlController {
     super.onMounted();
     if (this.xDataController) {
       this.xDataController.evt.on("onActive", (event) => {
-        this.xDataActive(event.data);
+        this.xDataActive(event);
       });
       this.xDataController.evt.on("onLoadSuccess", (event) => {
         this.xDataLoadSuccess(event);
@@ -210,7 +210,7 @@ class ExpBarControlController extends ControlController {
    */
   setDefaultOpenView(data) {
     var _a;
-    const navViewMsg = this.getNavViewMsg(data);
+    const navViewMsg = this.getNavViewMsg(data, this.context, this.params);
     if (navViewMsg) {
       (_a = this.navPos) == null ? void 0 : _a.setDefaultOpenView(navViewMsg);
     }
@@ -223,9 +223,10 @@ class ExpBarControlController extends ControlController {
    * @param {IData} data
    * @memberof ExpBarControlController
    */
-  xDataActive(data) {
+  xDataActive(event) {
     var _a;
-    const navViewMsg = this.getNavViewMsg(data);
+    const { data, context, params } = event;
+    const navViewMsg = this.getNavViewMsg(data, context, params);
     if (navViewMsg && navViewMsg.viewId) {
       (_a = this.navPos) == null ? void 0 : _a.openView(navViewMsg);
     }
@@ -239,7 +240,7 @@ class ExpBarControlController extends ControlController {
    * @return {*}
    * @memberof ExpBarControlController
    */
-  prepareParams(XDataModel, data) {
+  prepareParams(XDataModel, data, _context, _params) {
     const {
       navDER,
       navFilter,
@@ -256,15 +257,15 @@ class ExpBarControlController extends ControlController {
     };
     const _data = data.length > 0 ? data[0] : {};
     const originParams = {
-      context: this.context,
-      params: this.params,
+      context: _context,
+      params: _params,
       data: _data
     };
     const { resultContext, resultParams } = calcNavParams(model, originParams);
-    const context = Object.assign(this.context.clone(), resultContext, {
+    const context = Object.assign(_context.clone(), resultContext, {
       currentSrfNav: _data[this.navKeyName]
     });
-    const params = { ...this.params, ...resultParams };
+    const params = { ..._params, ...resultParams };
     return { context, params };
   }
   /**
@@ -291,12 +292,17 @@ class ExpBarControlController extends ControlController {
    * @return {*}  {Promise<INavViewMsg>}
    * @memberof TabExpPanelController
    */
-  getNavViewMsg(data) {
+  getNavViewMsg(data, _context, _params) {
     if (data.length === 0) {
       return;
     }
     const viewModelId = this.calcViewModelId();
-    const { context, params } = this.prepareParams(this.XDataModel, data);
+    const { context, params } = this.prepareParams(
+      this.XDataModel,
+      data,
+      _context,
+      _params
+    );
     return {
       key: data[0][this.navKeyName],
       context,

package/es/control/exp-bar/index.d.ts

@@ -2,3 +2,4 @@ export * from './tree-exp-bar';
 export * from './list-exp-bar';
 export * from './grid-exp-bar';
 export * from './data-view-exp-bar';
+export * from './calendar-exp-bar';

package/es/control/exp-bar/index.mjs

@@ -2,6 +2,9 @@ export { IBizTreeExpBarControl } from './tree-exp-bar/index.mjs';
 export { IBizListExpBarControl } from './list-exp-bar/index.mjs';
 export { IBizGridExpBarControl } from './grid-exp-bar/index.mjs';
 export { IBizDataViewExpBarControl } from './data-view-exp-bar/index.mjs';
+export { IBizCalendarExpBarControl } from './calendar-exp-bar/index.mjs';
 export { TreeExpBarProvider } from './tree-exp-bar/tree-exp-bar.provider.mjs';
 export { TreeExpBarController } from './tree-exp-bar/tree-exp-bar.controller.mjs';
 export { ListExpBarProvider } from './list-exp-bar/list-exp-bar.provider.mjs';
+export { CalendarExpBarProvider } from './calendar-exp-bar/calendar-exp-bar.provider.mjs';
+export { CalendarExpBarController } from './calendar-exp-bar/calendar-exp-bar.controller.mjs';

package/es/control/exp-bar/tree-exp-bar/tree-exp-bar.controller.d.ts

@@ -1,4 +1,4 @@
-import { INavViewMsg, ITreeController, ITreeExpBarController, ITreeExpBarEvent, ITreeExpBarState } from '@ibiz-template/runtime';
+import { INavViewMsg, ITreeController, ITreeEvent, ITreeExpBarController, ITreeExpBarEvent, ITreeExpBarState, ITreeNodeData } from '@ibiz-template/runtime';
 import { IDETreeNode, ITreeExpBar } from '@ibiz/model-core';
 import { ExpBarControlController } from '../exp-bar.controller';
 /**
@@ -10,6 +10,13 @@ import { ExpBarControlController } from '../exp-bar.controller';
  * @implements {ITreeExpBarController}
  */
 export declare class TreeExpBarController extends ExpBarControlController<ITreeExpBar, ITreeExpBarState, ITreeExpBarEvent> implements ITreeExpBarController {
+    /**
+     * 默认展开节点集合
+     * @author lxm
+     * @date 2023-08-08 05:35:12
+     * @type {string[]}
+     */
+    defaultExpandedKeys?: string[];
     get xDataController(): ITreeController;
     /**
      * 导航栏key
@@ -18,7 +25,7 @@ export declare class TreeExpBarController extends ExpBarControlController<ITreeE
      * @date 2023-07-10 03:07:11
      * @memberof TreeExpBarController
      */
-    navKeyName: string;
+    navKeyName: "id";
     /**
      * 获取指定节点模型
      *
@@ -27,6 +34,15 @@ export declare class TreeExpBarController extends ExpBarControlController<ITreeE
      * @memberof TreeExpBarController
      */
     getNodeModel(nodeId: string): IDETreeNode | undefined;
+    /**
+     * 多数据激活
+     *
+     * @author zk
+     * @date 2023-05-29 03:05:36
+     * @param {IData} data
+     * @memberof ExpBarControlController
+     */
+    xDataActive(event: ITreeEvent['onActive']['event']): void;
     /**
      *  获取导航视图
      *
@@ -36,7 +52,7 @@ export declare class TreeExpBarController extends ExpBarControlController<ITreeE
      * @return {*}  {Promise<INavViewMsg>}
      * @memberof TabExpPanelController
      */
-    getNavViewMsg(data: IData[]): INavViewMsg | undefined;
+    getNavViewMsg(data: ITreeNodeData[], context: IContext, params: IParams): INavViewMsg | undefined;
     /**
      * 设置多数据默认选中
      *
@@ -46,4 +62,5 @@ export declare class TreeExpBarController extends ExpBarControlController<ITreeE
      * @memberof ExpBarControlController
      */
     setNavPosDefaultOpenView(): void;
+    protected onCreated(): Promise<void>;
 }

package/es/control/exp-bar/tree-exp-bar/tree-exp-bar.controller.mjs

@@ -10,6 +10,13 @@ var __publicField = (obj, key, value) => {
 class TreeExpBarController extends ExpBarControlController {
   constructor() {
     super(...arguments);
+    /**
+     * 默认展开节点集合
+     * @author lxm
+     * @date 2023-08-08 05:35:12
+     * @type {string[]}
+     */
+    __publicField(this, "defaultExpandedKeys");
     /**
      * 导航栏key
      *
@@ -48,6 +55,18 @@ class TreeExpBarController extends ExpBarControlController {
     }
     return nodeModel;
   }
+  /**
+   * 多数据激活
+   *
+   * @author zk
+   * @date 2023-05-29 03:05:36
+   * @param {IData} data
+   * @memberof ExpBarControlController
+   */
+  xDataActive(event) {
+    const { nodeData } = event;
+    super.xDataActive({ ...event, data: [nodeData] });
+  }
   /**
    *  获取导航视图
    *
@@ -57,28 +76,27 @@ class TreeExpBarController extends ExpBarControlController {
    * @return {*}  {Promise<INavViewMsg>}
    * @memberof TabExpPanelController
    */
-  getNavViewMsg(data) {
-    if (!data[0]) {
-      return void 0;
+  getNavViewMsg(data, context, params) {
+    if (data.length === 0) {
+      return;
     }
-    const item = data[0];
-    const nodeModel = this.getNodeModel(item.nodeId);
+    const node = data[0];
+    const nodeId = node.id;
+    const deData = node.deData || node;
+    const nodeModel = this.getNodeModel(node.nodeId);
     if (nodeModel) {
-      const { context, params } = this.prepareParams(nodeModel, [
-        item.deData ? item.deData : item
-      ]);
-      context.currentSrfNav = item[this.navKeyName];
+      const result = this.prepareParams(nodeModel, [deData], context, params);
+      result.context.currentSrfNav = nodeId;
       return {
-        key: item[this.navKeyName],
-        context,
-        params,
-        viewId: nodeModel.navAppViewId
+        key: nodeId,
+        viewId: nodeModel.navAppViewId,
+        ...result
       };
     }
     return {
-      key: item[this.navKeyName],
-      context: this.context,
-      params: this.params
+      key: nodeId,
+      context,
+      params
     };
   }
   /**
@@ -90,18 +108,24 @@ class TreeExpBarController extends ExpBarControlController {
    * @memberof ExpBarControlController
    */
   setNavPosDefaultOpenView() {
-    const expandedNode = [];
-    this.state.srfnav.split(":").forEach((item, index) => {
-      if (index === 0) {
-        expandedNode.push(item);
-      } else {
-        expandedNode.push(`${expandedNode[index - 1]}:${item}`);
-      }
-    });
-    this.xDataController.setExpandedKeys(expandedNode);
     this.setDefaultXDataSelect({ [this.navKeyName]: this.state.srfnav });
     this.setDefaultOpenView([{ [this.navKeyName]: this.state.srfnav }]);
   }
+  async onCreated() {
+    await super.onCreated();
+    if (this.state.srfnav) {
+      const expandedKeys = [];
+      this.state.srfnav.split(":").forEach((item, index) => {
+        if (index === 0) {
+          expandedKeys.push(item);
+        } else {
+          expandedKeys.push(`${expandedKeys[index - 1]}:${item}`);
+        }
+      });
+      expandedKeys.pop();
+      this.defaultExpandedKeys = expandedKeys;
+    }
+  }
 }
 
 export { TreeExpBarController };

package/es/control/exp-bar/tree-exp-bar/tree-exp-bar.mjs

@@ -62,7 +62,8 @@ const TreeExpBarControl = /* @__PURE__ */ defineComponent({
             "params": this.c.params,
             "modelData": XDataModel,
             "singleSelect": true,
-            "mdctrlActiveMode": 1
+            "mdctrlActiveMode": 1,
+            "default-expanded-keys": this.c.defaultExpandedKeys
           }, null);
         };
       }

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

@@ -13,11 +13,7 @@ export declare const FormControl: import("vue").DefineComponent<{
     FormDetail: {
         (_props: {
             modelData: IDEFormDetail | IDEFormDetail[];
-        }): (VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }> | VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }>[] | undefined)[];
+        }): (VNode | VNode[] | undefined)[];
         props: string[];
     };
     slotProps: IData;

package/es/control/form/form-detail/form-mdctrl/form-mdctrl-form/form-mdctrl-form.mjs

@@ -30,10 +30,11 @@ const FormMDCtrlForm = /* @__PURE__ */ defineComponent({
     const renderContent = () => {
       if (c.controlModel && c.provider) {
         return c.state.data.map((item, index) => {
-          var _a;
           const tempContext = c.parent.form.context.clone();
-          const codeName = calcDeCodeNameById((_a = c.model.contentControl) == null ? void 0 : _a.appDataEntityId);
-          tempContext[codeName] = item.srfkey;
+          if (c.model.contentControl) {
+            const codeName = calcDeCodeNameById(c.model.contentControl.appDataEntityId);
+            tempContext[codeName] = item.srfkey;
+          }
           const controlProps = {
             modelData: c.controlModel,
             context: tempContext,

package/es/control/form/form-detail/form-page/form-page.mjs

@@ -52,9 +52,9 @@ const FormPage = /* @__PURE__ */ defineComponent({
         label: () => {
           return createVNode("span", {
             "class": c.labelClass
-          }, [c.model.sysImage && createVNode(resolveComponent("iBizIcon"), {
+          }, [c.model.sysImage ? createVNode(resolveComponent("iBizIcon"), {
             "icon": c.model.sysImage
-          }, null), c.model.showCaption && c.model.caption]);
+          }, null) : null, c.model.caption]);
         }
       });
     })) ? _slot : {

package/es/control/grid/grid/grid-control.util.d.ts

@@ -1,4 +1,5 @@
 import { ControlVO } from '@ibiz-template/runtime';
+import { Ref } from 'vue';
 import { GridController } from './grid.controller';
 /**
  * 适配element的table的事件
@@ -10,7 +11,7 @@ import { GridController } from './grid.controller';
  * @returns {*}
  */
 export declare function useITableEvent(c: GridController): {
-    tableRef: import("vue").Ref<IData | undefined>;
+    tableRef: Ref<IData | undefined>;
     onRowClick: (data: ControlVO) => void;
     onDbRowClick: (data: ControlVO) => void;
     onSelectionChange: (selection: ControlVO[]) => void;

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

@@ -1,5 +1,5 @@
 import { IDEGrid, IDEGridColumn } from '@ibiz/model-core';
-import { ControlVO, GridNotifyState, IGridColumnProvider, IGridController, IGridEvent, IGridState, MDControlController, MDCtrlLoadParams } from '@ibiz-template/runtime';
+import { CodeListItem, ControlVO, GridNotifyState, IGridColumnProvider, IGridController, IGridEvent, IGridState, MDControlController, MDCtrlLoadParams } from '@ibiz-template/runtime';
 import { GridFieldColumnController } from '../grid-column/grid-field-column/grid-field-column.controller';
 import { GridColumnController } from './grid-column.controller';
 import { GridRowState } from './grid-row.state';
@@ -23,6 +23,20 @@ export declare class GridController extends MDControlController<IDEGrid, IGridSt
      * @type {EntityService}
      */
     service: GridService;
+    /**
+     * 是否有配置宽度自适应列
+     *
+     * @type {boolean}
+     * @memberof GridController
+     */
+    hasAdaptiveColumn: boolean;
+    /**
+     * 是否有多级表头
+     * @author lxm
+     * @date 2023-08-07 02:26:16
+     * @type {boolean}
+     */
+    isMultistageHeader: boolean;
     /**
      * 所有表格列控制器集合
      *
@@ -74,12 +88,34 @@ export declare class GridController extends MDControlController<IDEGrid, IGridSt
         [key: string]: IGridColumnProvider;
     };
     /**
-     * 是否有配置宽度自适应列
-     *
+     * 分组属性列控制器
+     * @author lxm
+     * @date 2023-08-07 09:45:30
+     * @type {string}
+     */
+    groupFieldColumn?: GridFieldColumnController;
+    /**
+     * 分组代码表项集合
+     * @author lxm
+     * @date 2023-08-07 09:09:42
+     * @type {readonly}
+     */
+    get groupCodeListItems(): Readonly<CodeListItem[]> | undefined;
+    /**
+     * 是否启用表格聚合
+     * @author lxm
+     * @date 2023-08-07 04:10:55
+     * @readonly
      * @type {boolean}
-     * @memberof GridController
      */
-    hasAdaptiveColumn: boolean;
+    get enableAgg(): boolean;
+    /**
+     * 聚合行标题
+     * @author lxm
+     * @date 2023-08-07 04:11:00
+     * @type {string}
+     */
+    aggTitle: string;
     protected initState(): void;
     /**
      * 初始化方法
@@ -90,7 +126,39 @@ export declare class GridController extends MDControlController<IDEGrid, IGridSt
      * @returns {*}  {Promise<void>}
      */
     protected onCreated(): Promise<void>;
+    /**
+     * 初始化表格分组
+     * @author lxm
+     * @date 2023-08-07 09:10:17
+     * @protected
+     * @return {*}  {Promise<void>}
+     */
+    protected initGroup(): Promise<void>;
     afterLoad(args: MDCtrlLoadParams, items: ControlVO[]): Promise<ControlVO[]>;
+    /**
+     * 计算分组数据
+     * @author lxm
+     * @date 2023-08-07 02:16:39
+     * @protected
+     * @param {IData[]} items
+     */
+    protected calcGroupData(items: IData[]): void;
+    /**
+     * 加载远程聚合数据
+     * @author lxm
+     * @date 2023-08-07 05:35:36
+     * @protected
+     * @return {*}  {Promise<void>}
+     */
+    protected loadRemoteAgg(): Promise<void>;
+    /**
+     * 计算当前页的聚合数据
+     * @author lxm
+     * @date 2023-08-07 04:22:09
+     * @protected
+     * @param {IData[]} items
+     */
+    protected calcAggResult(items: IData[]): void;
     /**
      * 后台删除结束后界面删除逻辑
      *