@ibiz-template/vue3-components 0.7.41-alpha.16 → 0.7.41-alpha.18

package/es/view-engine/calendar-view.engine.d.ts

@@ -1,7 +1,17 @@
-import { ViewController, ICalendarViewEvent, ICalendarViewState, MDViewEngine, EventBase } from '@ibiz-template/runtime';
+import { ViewController, ICalendarViewEvent, ICalendarViewState, MDViewEngine, EventBase, IUIActionResult } from '@ibiz-template/runtime';
 import { IAppDECalendarView } from '@ibiz/model-core';
 export declare class CalendarViewEngine extends MDViewEngine {
     protected view: ViewController<IAppDECalendarView, ICalendarViewState, ICalendarViewEvent>;
     protected onXDataActive(event: EventBase): Promise<void>;
     onCreated(): Promise<void>;
+    protected openData(args: {
+        data: IData[];
+        event?: MouseEvent;
+        context?: IContext;
+        params?: IParams;
+    }): Promise<IUIActionResult>;
+    protected newData(args: {
+        data: IData[];
+        event?: MouseEvent;
+    }): Promise<IUIActionResult>;
 }

package/es/view-engine/calendar-view.engine.mjs

@@ -13,6 +13,16 @@ class CalendarViewEngine extends MDViewEngine {
     }
     this.view.slotProps.calendar.mdctrlActiveMode = model.mdctrlActiveMode;
   }
+  async openData(args) {
+    const { data, event } = args;
+    const result = await this.xdataControl.openData(data[0], event);
+    return result;
+  }
+  async newData(args) {
+    const { data, event } = args;
+    const result = await this.xdataControl.newData(data[0], event);
+    return result;
+  }
 }
 
 export { CalendarViewEngine };

package/es/view-engine/chart-exp-view.engine.d.ts

@@ -1,6 +1,7 @@
-import { ViewController, ViewEngineBase, IChartExpBarController, IChartExpViewEvent, IChartExpViewState } from '@ibiz-template/runtime';
+import { ViewController, IChartExpViewEvent, IChartExpViewState } from '@ibiz-template/runtime';
 import { IAppDEChartExplorerView } from '@ibiz/model-core';
-export declare class ChartExpViewEngine extends ViewEngineBase {
+import { ExpViewEngine } from './exp-view.engine';
+export declare class ChartExpViewEngine extends ExpViewEngine {
     /**
      * 图表导航视图控制器
      *
@@ -14,11 +15,10 @@ export declare class ChartExpViewEngine extends ViewEngineBase {
      */
     protected view: ViewController<IAppDEChartExplorerView, IChartExpViewState, IChartExpViewEvent>;
     /**
-     * 图表导航栏
-     *
+     * @description 导航栏部件名称
      * @readonly
+     * @type {string}
      * @memberof ChartExpViewEngine
      */
-    get chartExpBar(): IChartExpBarController;
-    onCreated(): Promise<void>;
+    get expBarName(): string;
 }

package/es/view-engine/chart-exp-view.engine.mjs

@@ -1,24 +1,15 @@
-import { ViewEngineBase } from '@ibiz-template/runtime';
+import { ExpViewEngine } from './exp-view.engine.mjs';
 
 "use strict";
-class ChartExpViewEngine extends ViewEngineBase {
+class ChartExpViewEngine extends ExpViewEngine {
   /**
-   * 图表导航栏
-   *
+   * @description 导航栏部件名称
    * @readonly
+   * @type {string}
    * @memberof ChartExpViewEngine
    */
-  get chartExpBar() {
-    return this.view.getController("chartexpbar");
-  }
-  async onCreated() {
-    await super.onCreated();
-    const { childNames } = this.view;
-    childNames.push("chartexpbar");
-    if (!this.view.slotProps.chartexpbar) {
-      this.view.slotProps.chartexpbar = {};
-    }
-    this.view.slotProps.chartexpbar.srfnav = this.view.state.srfnav;
+  get expBarName() {
+    return "chartexpbar";
   }
 }
 

package/es/view-engine/edit-view.engine.d.ts

@@ -56,6 +56,17 @@ export declare class EditViewEngine extends DEMainViewEngine {
      * @memberof EditViewEngine
      */
     saveAndNew(): Promise<void>;
+    /**
+     * @description 取消变更
+     * @param {({
+     *       targetState: 'INIT' | 'UNDO' | 'REDO';
+     *     })} [_args={ targetState: 'INIT' }] 目标状态，初始化状态|撤销上一步操作|重做下一步操作
+     * @returns {*}  {Promise<void>}
+     * @memberof EditViewEngine
+     */
+    cancelChanges(_args?: {
+        targetState: 'INIT' | 'UNDO' | 'REDO';
+    }): Promise<void>;
     /**
      * 工作流启动
      *

package/es/view-engine/edit-view.engine.mjs

@@ -261,6 +261,18 @@ class EditViewEngine extends DEMainViewEngine {
     this.view.context[calcDeCodeNameById(this.view.model.appDataEntityId)] = void 0;
     await this.form.load();
   }
+  /**
+   * @description 取消变更
+   * @param {({
+   *       targetState: 'INIT' | 'UNDO' | 'REDO';
+   *     })} [_args={ targetState: 'INIT' }] 目标状态，初始化状态|撤销上一步操作|重做下一步操作
+   * @returns {*}  {Promise<void>}
+   * @memberof EditViewEngine
+   */
+  async cancelChanges(_args = { targetState: "INIT" }) {
+    await super.cancelChanges(_args);
+    await this.form.cancelChanges(_args.targetState);
+  }
   /**
    * 工作流启动
    *

package/es/view-engine/gantt-view.engine.d.ts

@@ -1,9 +1,9 @@
-import { MDViewEngine, ViewController, IGanttViewState, IGanttViewEvent, IGanttController, EventBase, IApiGanttViewCall } from '@ibiz-template/runtime';
+import { ViewController, IGanttViewState, IGanttViewEvent, IGanttController, IApiGanttViewCall } from '@ibiz-template/runtime';
 import { IAppDEGanttView } from '@ibiz/model-core';
-export declare class GanttViewEngine extends MDViewEngine {
+import { TreeGridExViewEngine } from './tree-grid-ex-view.engine';
+export declare class GanttViewEngine extends TreeGridExViewEngine {
     protected view: ViewController<IAppDEGanttView, IGanttViewState, IGanttViewEvent>;
     get gantt(): IGanttController;
     call(key: keyof IApiGanttViewCall, args: any): Promise<IData | null | undefined>;
-    protected onXDataActive(event: EventBase): Promise<void>;
     onCreated(): Promise<void>;
 }

package/es/view-engine/gantt-view.engine.mjs

@@ -1,8 +1,8 @@
-import { RuntimeError } from '@ibiz-template/core';
-import { MDViewEngine, SysUIActionTag } from '@ibiz-template/runtime';
+import { SysUIActionTag } from '@ibiz-template/runtime';
+import { TreeGridExViewEngine } from './tree-grid-ex-view.engine.mjs';
 
 "use strict";
-class GanttViewEngine extends MDViewEngine {
+class GanttViewEngine extends TreeGridExViewEngine {
   get gantt() {
     return this.view.getController("gantt");
   }
@@ -23,51 +23,8 @@ class GanttViewEngine extends MDViewEngine {
       this.gantt.saveAll();
       return null;
     }
-    if (key === SysUIActionTag.EXPAND) {
-      const { srfcollapsetag } = args.params || {};
-      let tag = srfcollapsetag || "";
-      if (!tag) {
-        const { selectedData } = this.gantt.state;
-        const selectedGroup = selectedData.filter((x) => !x._leaf);
-        if (selectedGroup.length > 0) {
-          tag = selectedGroup[0].srfnodeid;
-        }
-      }
-      if (!tag) {
-        throw new RuntimeError(ibiz.i18n.t("viewEngine.noExpandTag"));
-      }
-      this.gantt.changeCollapse({ tag, expand: true });
-      return null;
-    }
-    if (key === SysUIActionTag.COLLAPSE) {
-      const { srfcollapsetag } = args.params || {};
-      let tag = srfcollapsetag || "";
-      if (!tag) {
-        const { selectedData } = this.gantt.state;
-        const selectedGroup = selectedData.filter((x) => !x._leaf);
-        if (selectedGroup.length > 0) {
-          tag = selectedGroup[0].srfnodeid;
-        }
-      }
-      if (!tag) {
-        throw new RuntimeError(ibiz.i18n.t("viewEngine.noCollapseTag"));
-      }
-      this.gantt.changeCollapse({ tag, expand: false });
-      return null;
-    }
-    if (key === SysUIActionTag.EXPANDALL) {
-      this.gantt.changeCollapse({ expand: true });
-      return null;
-    }
-    if (key === SysUIActionTag.COLLAPSEALL) {
-      this.gantt.changeCollapse({ expand: false });
-      return null;
-    }
     return super.call(key, args);
   }
-  // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
-  async onXDataActive(event) {
-  }
   async onCreated() {
     super.onCreated();
     const { model } = this.view;

package/es/view-engine/login-view.engine.d.ts

@@ -37,6 +37,16 @@ export declare class LoginViewEngine extends ViewEngineBase {
     onDestroyed(): Promise<void>;
     call(key: keyof IApiLoginViewCall, args?: IData): Promise<IData | null | undefined>;
     login(args: IData): Promise<void>;
-    cancelChanges(): Promise<void>;
+    /**
+     * @description 取消变更
+     * @param {({
+     *       targetState: 'INIT' | 'UNDO' | 'REDO';
+     *     })} [_args={ targetState: 'INIT' }] 目标状态，初始化状态|撤销上一步操作|重做下一步操作
+     * @returns {*}  {Promise<void>}
+     * @memberof LoginViewEngine
+     */
+    cancelChanges(_args?: {
+        targetState: 'INIT' | 'UNDO' | 'REDO';
+    }): Promise<void>;
     private enterKeyListener;
 }

package/es/view-engine/login-view.engine.mjs

@@ -30,6 +30,13 @@ class LoginViewEngine extends ViewEngineBase {
             }
           ]
         };
+        const targetID = event.target.dataset.id;
+        if (targetID) {
+          const targetPanelItem = this.view.layoutPanel.findPanelItemByName(targetID);
+          if (targetPanelItem) {
+            args.data = [targetPanelItem.data];
+          }
+        }
         await this.login(args);
       }
     });
@@ -59,10 +66,6 @@ class LoginViewEngine extends ViewEngineBase {
       await this.login(args);
       return null;
     }
-    if (key === SysUIActionTag.CANCEL_CHANGES) {
-      await this.cancelChanges();
-      return null;
-    }
     return super.call(key, args);
   }
   async login(args) {
@@ -112,7 +115,15 @@ class LoginViewEngine extends ViewEngineBase {
       }
     }
   }
-  async cancelChanges() {
+  /**
+   * @description 取消变更
+   * @param {({
+   *       targetState: 'INIT' | 'UNDO' | 'REDO';
+   *     })} [_args={ targetState: 'INIT' }] 目标状态，初始化状态|撤销上一步操作|重做下一步操作
+   * @returns {*}  {Promise<void>}
+   * @memberof LoginViewEngine
+   */
+  async cancelChanges(_args = { targetState: "INIT" }) {
     if (this.view.layoutPanel) {
       Object.keys(this.view.layoutPanel.panelItems).forEach((key) => {
         const controller = this.view.layoutPanel.panelItems[key];

package/es/view-engine/mpickup-view-engine.d.ts

@@ -1,4 +1,4 @@
-import { ViewController, IMPickupViewState, IMPickupViewEvent, IListController, IApiMPickupViewCall } from '@ibiz-template/runtime';
+import { ViewController, IListController, IMPickupViewState, IMPickupViewEvent, IApiMPickupViewCall } from '@ibiz-template/runtime';
 import { IAppDEPickupView } from '@ibiz/model-core';
 import { PickupViewEngine } from './pickup-view.engine';
 /**
@@ -109,6 +109,13 @@ export declare class MPickupViewEngine extends PickupViewEngine {
      * @memberof MPickupViewEngine
      */
     protected removeSelection(): void;
+    /**
+     * @description 设置选中数据
+     * @protected
+     * @param {IData[]} items
+     * @memberof MPickupViewEngine
+     */
+    protected setSelectedData(items: IData[]): void;
     /**
      * 提交
      *

package/es/view-engine/mpickup-view-engine.mjs

@@ -33,10 +33,6 @@ class MPickupViewEngine extends PickupViewEngine {
     }
     const { childNames } = this.view;
     childNames.push("simplelist");
-    if (this.view.params.selecteddata) {
-      this.selectData = JSON.parse(this.view.params.selecteddata);
-      delete this.view.params.selecteddata;
-    }
     if (!this.view.slotProps.simplelist) {
       this.view.slotProps.simplelist = {};
     }
@@ -61,7 +57,7 @@ class MPickupViewEngine extends PickupViewEngine {
     this.simpleList.evt.on("onActive", (event) => {
       this.simpleListActive(event.data);
     });
-    this.simpleList.setData(this.selectData);
+    this.setSelectedData(this.selectData);
   }
   async call(key, args) {
     if (key === SysUIActionTag.CANCEL) {
@@ -117,7 +113,7 @@ class MPickupViewEngine extends PickupViewEngine {
         items.splice(index, 1);
       }
     });
-    this.simpleList.setData(items);
+    this.setSelectedData(items);
   }
   /**
    * 添加选中
@@ -142,7 +138,7 @@ class MPickupViewEngine extends PickupViewEngine {
     const allData = this.simpleList.getAllData();
     const items = [...allData, ...data];
     const uniqueItems = this.handleUniqueItems(items);
-    this.simpleList.setData(uniqueItems);
+    this.setSelectedData(uniqueItems);
   }
   /**
    * 去重数组
@@ -178,7 +174,7 @@ class MPickupViewEngine extends PickupViewEngine {
    * @memberof MPickupViewEngine
    */
   removeAll() {
-    this.simpleList.setData([]);
+    this.setSelectedData([]);
   }
   /**
    * 删除选中
@@ -198,6 +194,16 @@ class MPickupViewEngine extends PickupViewEngine {
         items.splice(index, 1);
       }
     });
+    this.setSelectedData(items);
+  }
+  /**
+   * @description 设置选中数据
+   * @protected
+   * @param {IData[]} items
+   * @memberof MPickupViewEngine
+   */
+  setSelectedData(items) {
+    super.setSelectedData(items);
     this.simpleList.setData(items);
   }
   /**

package/es/view-engine/pickup-view.engine.d.ts

@@ -1,4 +1,4 @@
-import { ViewEngineBase, ViewController, IPickupViewPanelController, IPickupViewState, IPickupViewEvent, IApiPickupViewCall } from '@ibiz-template/runtime';
+import { ViewEngineBase, ViewController, IPickupViewState, IPickupViewEvent, IApiPickupViewCall, IPickupViewPanelController } from '@ibiz-template/runtime';
 import { IAppDEPickupView } from '@ibiz/model-core';
 export declare class PickupViewEngine extends ViewEngineBase {
     /**
@@ -37,6 +37,13 @@ export declare class PickupViewEngine extends ViewEngineBase {
      * @memberof PickupViewEngine
      */
     onMounted(): Promise<void>;
+    /**
+     * @description 设置选中数据
+     * @protected
+     * @param {IData[]} items
+     * @memberof PickupViewEngine
+     */
+    protected setSelectedData(items: IData[]): void;
     /**
      *  选则面板激活数据
      *

package/es/view-engine/pickup-view.engine.mjs

@@ -39,6 +39,10 @@ class PickupViewEngine extends ViewEngineBase {
     await super.onCreated();
     const { childNames } = this.view;
     childNames.push("pickupviewpanel");
+    if (this.view.params.selecteddata) {
+      this.selectData = JSON.parse(this.view.params.selecteddata);
+      delete this.view.params.selecteddata;
+    }
   }
   /**
    * 视图mounted生命周期执行逻辑
@@ -55,6 +59,17 @@ class PickupViewEngine extends ViewEngineBase {
     this.pickupViewPanel.evt.on("onDataActive", (event) => {
       this.pickupViewPanelDataActive(event.data);
     });
+    this.setSelectedData(this.selectData);
+  }
+  /**
+   * @description 设置选中数据
+   * @protected
+   * @param {IData[]} items
+   * @memberof PickupViewEngine
+   */
+  setSelectedData(items) {
+    this.selectData = items;
+    this.pickupViewPanel.setSelectedData(items);
   }
   /**
    *  选则面板激活数据

package/es/view-engine/tab-exp-view.engine.mjs

@@ -167,7 +167,7 @@ class TabExpViewEngine extends ViewEngineBase {
   calcViewHeaderVisible() {
     let showHeader = super.calcViewHeaderVisible();
     const { tabLayout } = this.view.model;
-    if (tabLayout === void 0 || tabLayout === "TOP" && getControl(this.view.model, "tabexppanel")) {
+    if (tabLayout === void 0 || ["TOP", "TOP_DROPDOWNLIST"].includes(tabLayout) && getControl(this.view.model, "tabexppanel")) {
       showHeader = true;
     }
     return showHeader;

package/es/view-engine/tab-search-view.engine.mjs

@@ -113,8 +113,10 @@ class TabSearchViewEngine extends TabExpViewEngine {
         }
       }
     }
-    this.searchBar.placeHolder = caption || "";
-    this.searchBar.state.quickSearchPlaceHolder = caption || "";
+    if (this.searchBar) {
+      this.searchBar.placeHolder = caption || "";
+      this.searchBar.state.quickSearchPlaceHolder = caption || "";
+    }
   }
   async call(key, args) {
     if (key === SysUIActionTag.SEARCH) {

package/es/view-engine/tree-view.engine.d.ts

@@ -1,8 +1,18 @@
-import { ViewController, ITreeViewEvent, ITreeViewState, MDViewEngine, ITreeController, IApiTreeViewCall } from '@ibiz-template/runtime';
+import { ViewController, ITreeViewEvent, ITreeViewState, MDViewEngine, IApiTreeViewCall, IUIActionResult, ITreeController } from '@ibiz-template/runtime';
 import { IAppDETreeView } from '@ibiz/model-core';
 export declare class TreeViewEngine extends MDViewEngine {
     protected view: ViewController<IAppDETreeView, ITreeViewState, ITreeViewEvent>;
-    get tree(): ITreeController;
     onCreated(): Promise<void>;
+    get tree(): ITreeController;
     call(key: keyof IApiTreeViewCall, args: any): Promise<IData | null | undefined>;
+    protected openData(args: {
+        data: IData[];
+        event?: MouseEvent;
+        context?: IContext;
+        params?: IParams;
+    }): Promise<IUIActionResult>;
+    protected newData(args: {
+        data: IData[];
+        event?: MouseEvent;
+    }): Promise<IUIActionResult>;
 }

package/es/view-engine/tree-view.engine.mjs

@@ -3,31 +3,37 @@ import { RuntimeError } from '@ibiz-template/core';
 
 "use strict";
 class TreeViewEngine extends MDViewEngine {
-  get tree() {
-    return this.view.getController("tree");
-  }
   async onCreated() {
     await super.onCreated();
     if (!this.view.slotProps.tree) {
       this.view.slotProps.tree = {};
     }
   }
+  get tree() {
+    return this.view.getController("tree");
+  }
   async call(key, args) {
     var _a;
     if (key === SysUIActionTag.REFRESH_ALL) {
-      await this.tree.refresh();
+      await this.xdataControl.refresh();
       return null;
     }
     if (key === SysUIActionTag.REFRESH) {
       if ((_a = args == null ? void 0 : args.data) == null ? void 0 : _a[0]) {
-        await this.tree.refreshNodeChildren(args.data[0], false);
+        await this.xdataControl.refreshNodeChildren(
+          args.data[0],
+          false
+        );
       } else {
-        await this.tree.refresh();
+        await this.xdataControl.refresh();
       }
       return null;
     }
     if (key === SysUIActionTag.REFRESH_PARENT) {
-      await this.tree.refreshNodeChildren(args.data[0], true);
+      await this.xdataControl.refreshNodeChildren(
+        args.data[0],
+        true
+      );
       return null;
     }
     if (key === SysUIActionTag.EXPAND) {
@@ -40,7 +46,10 @@ class TreeViewEngine extends MDViewEngine {
       if (!tag) {
         throw new RuntimeError(ibiz.i18n.t("viewEngine.noExpandTag"));
       }
-      this.tree.changeCollapse({ tag, expand: true });
+      this.xdataControl.changeCollapse({
+        tag,
+        expand: true
+      });
       return null;
     }
     if (key === SysUIActionTag.COLLAPSE) {
@@ -53,19 +62,38 @@ class TreeViewEngine extends MDViewEngine {
       if (!tag) {
         throw new RuntimeError(ibiz.i18n.t("viewEngine.noCollapseTag"));
       }
-      this.tree.changeCollapse({ tag, expand: false });
+      this.xdataControl.changeCollapse({
+        tag,
+        expand: false
+      });
       return null;
     }
     if (key === SysUIActionTag.EXPANDALL) {
-      this.tree.changeCollapse({ expand: true });
+      this.xdataControl.changeCollapse({ expand: true });
       return null;
     }
     if (key === SysUIActionTag.COLLAPSEALL) {
-      this.tree.changeCollapse({ expand: false });
+      this.xdataControl.changeCollapse({ expand: false });
       return null;
     }
     return super.call(key, args);
   }
+  async openData(args) {
+    const { data, event } = args;
+    const result = await this.xdataControl.openData(
+      data[0],
+      event
+    );
+    return result;
+  }
+  async newData(args) {
+    const { data, event } = args;
+    const result = await this.xdataControl.newData(
+      data[0],
+      event
+    );
+    return result;
+  }
 }
 
 export { TreeViewEngine };

package/lib/common/control-navigation/provider/calendar-navigation.provider.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+var dayjs = require('dayjs');
 var navigationBase_provider = require('./navigation-base.provider.cjs');
 
 "use strict";
@@ -19,7 +20,8 @@ class CalendarNavigationProvider extends navigationBase_provider.NavgationBasePr
     const navData = this.navStack.map((key) => items.find((item) => item.navId === key)).find((item) => item !== void 0) || items[0];
     if (navData) {
       const date = new Date(navData.beginTime);
-      this.controller.setSelectDate(date);
+      if (dayjs(date).isValid())
+        this.controller.setSelectDate(date);
       this.controller.setNavData(navData);
     } else {
       this.navStack = [];

package/lib/common/control-navigation/provider/index.cjs

@@ -10,7 +10,7 @@ function getNavigationProvider(controller) {
   const { controlType } = controller.model;
   if (controlType === "CALENDAR")
     return new calendarNavigation_provider.CalendarNavigationProvider(controller);
-  if (controlType === "TREEVIEW")
+  if (controlType === "TREEVIEW" || controlType === "TREEGRIDEX")
     return new treeNavigation_provider.TreeNavigationProvider(controller);
   if (controlType === "MAP")
     return new mapNavigation_provider.MapNavigationProvider(controller);

package/lib/common/control-navigation/provider/map-navigation.provider.cjs

@@ -14,6 +14,19 @@ class MapNavigationProvider extends navigationBase_provider.NavgationBaseProvide
     super(...arguments);
     __publicField(this, "keyName", "id");
   }
+  /**
+   * @description 导航数据变化
+   * @param {IMapEvent['onNavDataChange']['event']} event
+   * @memberof MapNavigationProvider
+   */
+  onNavDataChange(event) {
+    var _a;
+    const { navData } = event;
+    if (((_a = this.navViewMsg.value) == null ? void 0 : _a.key) !== navData._id) {
+      this.navStack.unshift(navData[this.keyName]);
+      this.navViewMsg.value = this.getNavViewMsg(navData);
+    }
+  }
   onNavDataByStack() {
     const { items } = this.controller.state;
     const navData = this.navStack.map((key) => items.find((item) => item._id === key)).find((item) => item !== void 0) || items[0];
@@ -25,15 +38,21 @@ class MapNavigationProvider extends navigationBase_provider.NavgationBaseProvide
     }
   }
   getNavViewMsg(item) {
+    var _a;
     const { sysMapItems } = this.model;
+    const { areaCode, areaLevel } = item;
     const itemModel = sysMapItems == null ? void 0 : sysMapItems.find((_item) => _item.id === item._mapItemId);
     if (itemModel) {
       const { context, params } = this.prepareParams(
         itemModel,
-        item._deData,
+        { ...item._deData, areaCode, areaLevel },
         this.controller.context,
         this.controller.params
       );
+      if ((_a = itemModel.itemStyle) == null ? void 0 : _a.startsWith("REGION")) {
+        params.srfareacode = areaCode;
+        params.srfarealevel = areaLevel;
+      }
       return {
         params,
         context,