@ibiz-template/vue3-components 0.7.41-alpha.19 → 0.7.41-alpha.20

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

@@ -1,5 +1,6 @@
 'use strict';
 
+var runtime = require('@ibiz-template/runtime');
 var navigationBase_provider = require('./navigation-base.provider.cjs');
 
 "use strict";
@@ -12,7 +13,7 @@ var __publicField = (obj, key, value) => {
 class MapNavigationProvider extends navigationBase_provider.NavgationBaseProvider {
   constructor() {
     super(...arguments);
-    __publicField(this, "keyName", "id");
+    __publicField(this, "keyName", "_id");
   }
   /**
    * @description 导航数据变化
@@ -22,46 +23,62 @@ class MapNavigationProvider extends navigationBase_provider.NavgationBaseProvide
   onNavDataChange(event) {
     var _a;
     const { navData } = event;
-    if (((_a = this.navViewMsg.value) == null ? void 0 : _a.key) !== navData._id) {
+    if (((_a = this.navViewMsg.value) == null ? void 0 : _a.key) !== navData[this.keyName]) {
       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];
+    const navData = this.navStack.map((key) => items.find((item) => item[this.keyName] === key)).find((item) => item !== void 0) || items[0];
     if (navData) {
-      this.controller.setNavData(navData);
+      if (navData._itemStyle.startsWith("REGION")) {
+        const data = { ...navData };
+        if (navData._areaCode) {
+          data.areaCode = this.controller.state.strAreaCode ? "".concat(navData._areaCode) : Number(navData._areaCode);
+          data.areaLevel = runtime.getAreaLevelByCode(navData._areaCode.toString());
+        }
+        this.setNavData(data);
+      } else {
+        this.setNavData(navData);
+      }
     } else {
-      this.navStack = [];
-      this.navViewMsg.value = void 0;
+      this.clearNavigation();
     }
   }
   getNavViewMsg(item) {
-    var _a;
+    var _a, _b;
     const { sysMapItems } = this.model;
     const { areaCode, areaLevel } = item;
     const itemModel = sysMapItems == null ? void 0 : sysMapItems.find((_item) => _item.id === item._mapItemId);
     if (itemModel) {
+      const tempContext = this.controller.context.clone();
+      const tempParams = { ...this.controller.params };
+      if ((_a = itemModel.itemStyle) == null ? void 0 : _a.startsWith("POINT")) {
+        const deName = runtime.calcDeCodeNameById(itemModel.appDataEntityId);
+        tempContext[deName] = item._deData.srfkey;
+      }
+      if ((_b = itemModel.itemStyle) == null ? void 0 : _b.startsWith("REGION")) {
+        tempParams.srfareacode = areaCode;
+        tempParams.srfarealevel = areaLevel;
+        tempParams.srfarealevelnum = areaLevel ? runtime.getAreaLevelNum(areaLevel) : 1;
+      }
       const { context, params } = this.prepareParams(
         itemModel,
         { ...item._deData, areaCode, areaLevel },
-        this.controller.context,
-        this.controller.params
+        tempContext,
+        tempParams
       );
-      if ((_a = itemModel.itemStyle) == null ? void 0 : _a.startsWith("REGION")) {
-        params.srfareacode = areaCode;
-        params.srfarealevel = areaLevel;
-      }
+      Object.assign(params, tempParams);
       return {
         params,
         context,
-        key: item._id,
+        key: item[this.keyName],
         viewId: itemModel.navAppViewId
       };
     }
     return {
-      key: item._id,
+      key: item[this.keyName],
       context: this.controller.context,
       params: this.controller.params
     };

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

@@ -90,6 +90,26 @@ class NavgationBaseProvider {
     const tempParams = { ...resultParams };
     return { context: tempContext, params: tempParams };
   }
+  /**
+   * @description 清空导航
+   * @protected
+   * @memberof NavgationBaseProvider
+   */
+  clearNavigation() {
+    this.navStack = [];
+    this.controller.setSelection([]);
+    this.navViewMsg.value = void 0;
+  }
+  /**
+   * @description 设置导航数据
+   * @protected
+   * @param {IData} data
+   * @memberof NavgationBaseProvider
+   */
+  setNavData(data) {
+    this.controller.setNavData(data);
+    this.controller.setSelection([data]);
+  }
   /**
    * 通过栈数据导航
    *
@@ -98,16 +118,11 @@ class NavgationBaseProvider {
   onNavDataByStack() {
     const { items } = this.controller.state;
     const navData = this.navStack.map((key) => items.find((item) => item[this.keyName] === key)).find((item) => item !== void 0) || items[0];
-    setTimeout(() => {
-      if (navData) {
-        this.controller.setNavData(navData);
-        this.controller.setSelection([navData]);
-      } else {
-        this.navStack = [];
-        this.controller.setSelection([]);
-        this.navViewMsg.value = void 0;
-      }
-    });
+    if (navData) {
+      this.setNavData(navData);
+    } else {
+      this.clearNavigation();
+    }
   }
   /**
    * 导航数据变化

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

@@ -40,14 +40,11 @@ class TreeNavigationProvider extends navigationBase_provider.NavgationBaseProvid
       }
       return this.navNodeModelIds.includes(node._nodeId);
     });
-    const navData = this.navStack.map((key) => items.find((item) => item._id === key)).find((item) => item !== void 0) || defaultNav;
+    const navData = this.navStack.map((key) => items.find((item) => item[this.keyName] === key)).find((item) => item !== void 0) || defaultNav;
     if (navData) {
-      this.controller.setSelection([navData]);
-      this.controller.setNavData(navData);
+      this.setNavData(navData);
     } else {
-      this.navStack = [];
-      this.controller.setSelection([]);
-      this.navViewMsg.value = void 0;
+      this.clearNavigation();
     }
   }
   getNavViewMsg(item) {
@@ -66,14 +63,14 @@ class TreeNavigationProvider extends navigationBase_provider.NavgationBaseProvid
         _params
       );
       return {
-        key: item._id,
+        key: item[this.keyName],
         context,
         params,
         viewId: nodeModel.navAppViewId
       };
     }
     return {
-      key: item._id,
+      key: item[this.keyName],
       context: _context,
       params: _params
     };

package/lib/common/map-chart/map-chart.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var vue = require('vue');
 var ramda = require('ramda');
 var vue3Util = require('@ibiz-template/vue3-util');
+var runtime = require('@ibiz-template/runtime');
 var mapChart_util = require('./map-chart.util.cjs');
 var mapManager = require('./map-manager.cjs');
 require('./map-chart.css');
@@ -22,6 +23,10 @@ const IBizMapChart = /* @__PURE__ */ vue.defineComponent({
     options: {
       type: Object,
       default: () => ({})
+    },
+    controller: {
+      type: runtime.MapController,
+      required: true
     }
   },
   setup(props, {
@@ -47,7 +52,7 @@ const IBizMapChart = /* @__PURE__ */ vue.defineComponent({
       changeMap,
       getCityName,
       goBack
-    } = mapManager.useMapManager(options, (mapName) => {
+    } = mapManager.useMapManager(props.controller, options, (mapName) => {
       const {
         visualMap,
         pointSymbol,
@@ -177,9 +182,6 @@ const IBizMapChart = /* @__PURE__ */ vue.defineComponent({
       return result;
     }, (name, e) => {
       switch (name) {
-        case "mapChange":
-          emit("mapChange", e);
-          break;
         case "pointClick":
           emit("pointClick", findData(e._id, "point"));
           break;

package/lib/common/map-chart/map-manager.cjs

@@ -5,7 +5,7 @@ var vue = require('vue');
 var mapJson = require('./map-json.cjs');
 
 "use strict";
-function useMapManager(opts, calcEchartsOpts, emit) {
+function useMapManager(controller, opts, calcEchartsOpts, emit) {
   const mapInfos = /* @__PURE__ */ new Map();
   const currentName = vue.ref("");
   const historyNames = vue.ref([]);
@@ -46,9 +46,8 @@ function useMapManager(opts, calcEchartsOpts, emit) {
   };
   const changeMap = async (name, isInit = false) => {
     if (!isInit) {
-      emit("mapChange", {
-        areaCode: opts.value.strAreaCode ? "".concat(name) : Number(name)
-      });
+      const areaCode = opts.value.strAreaCode ? "".concat(name) : Number(name);
+      await controller.onMapChange(areaCode);
     }
     const strName = "".concat(name);
     if (!mapInfos.has(strName)) {

package/lib/common/map-chart-user/map-chart-user.cjs

@@ -96,6 +96,7 @@ const IBizMapChartUser = /* @__PURE__ */ vue.defineComponent({
       const name = options.value.defaultAreaCode;
       const areaCode = c.state.strAreaCode ? "".concat(name) : Number(name);
       c.state.areaCode = areaCode;
+      c.state.areaLevel = runtime.getAreaLevelByCode(areaCode.toString());
       changeMap(name, areaCode, true);
       c.evt.on("onDrillDown", async (args) => {
         if (!processing.value) {

package/lib/common/map-chart-user/map-chart-user.css

@@ -1 +1 @@
-.ibiz-map-chart-user{position:relative;min-width:300px;min-height:300px}.ibiz-map-chart-user__chart{width:100%;height:100%}.ibiz-map-chart-user__goback{position:absolute;top:60px;right:0;width:100px;height:100px;font-size:var(--ibiz-font-size-header-4);color:var(--ibiz-color-link);text-decoration:underline;letter-spacing:6px;cursor:pointer}.ibiz-map-chart-user__fullscreen{position:absolute;top:var(--ibiz-spacing-tight);right:var(--ibiz-spacing-tight);z-index:9}.ibiz-map-chart-user__popper{padding:var(--ibiz-spacing-tight)}
+.ibiz-map-chart-user{position:relative;min-width:300px;min-height:300px}.ibiz-map-chart-user__chart{width:100%;height:100%}.ibiz-map-chart-user__goback{position:absolute;top:60px;right:0;width:100px;height:100px;font-size:var(--ibiz-font-size-header-4);color:var(--ibiz-color-link);text-decoration:underline;letter-spacing:6px;cursor:pointer}.ibiz-map-chart-user__fullscreen{position:absolute;top:var(--ibiz-spacing-tight);right:var(--ibiz-spacing-tight);z-index:9}.ibiz-map-chart-user__popper{padding:var(--ibiz-spacing-tight);white-space:pre}

package/lib/common/map-chart-user/map-user-manager.cjs

@@ -57,7 +57,7 @@ function useMapManager(controller, opts, calcEchartsOpts) {
       await registerMap(strName);
     }
     if (!isInit) {
-      controller.onMapChange(areaCode);
+      await controller.onMapChange(areaCode);
     } else {
       const areaLevel = areaLevelMap.get(lodashEs.toNumber(areaCode)) || "";
       controller.state.areaLevel = areaLevel;

package/lib/control/calendar/calendar.cjs

@@ -684,21 +684,25 @@ const CalendarControl = /* @__PURE__ */ vue.defineComponent({
     return vue.createVNode(vue.resolveComponent("iBizControlNavigation"), {
       "controller": this.c
     }, {
-      default: () => [vue.createVNode(vue.resolveComponent("iBizControlBase"), {
-        "controller": this.c
-      }, {
-        default: () => [renderCalendar(), this.c.state.enableNavView && this.c.state.showNavIcon ? !this.c.state.showNavView ? vue.createVNode("ion-icon", {
-          "class": this.ns.e("nav-icon"),
-          "title": ibiz.i18n.t("component.controlNavigation.showNav"),
-          "name": "eye-outline",
-          "onClick": () => this.c.onShowNavViewChange()
-        }, null) : vue.createVNode("ion-icon", {
-          "class": this.ns.e("nav-icon"),
-          "title": ibiz.i18n.t("component.controlNavigation.hiddenNav"),
-          "name": "eye-off-outline",
-          "onClick": () => this.c.onShowNavViewChange()
-        }, null) : null]
-      })]
+      default: () => {
+        var _a;
+        return [vue.createVNode(vue.resolveComponent("iBizControlBase"), {
+          "controller": this.c,
+          "class": this.ns.e((_a = this.c.model.calendarStyle) == null ? void 0 : _a.toLowerCase())
+        }, {
+          default: () => [renderCalendar(), this.c.state.enableNavView && this.c.state.showNavIcon ? !this.c.state.showNavView ? vue.createVNode("ion-icon", {
+            "class": this.ns.e("nav-icon"),
+            "title": ibiz.i18n.t("component.controlNavigation.showNav"),
+            "name": "eye-outline",
+            "onClick": () => this.c.onShowNavViewChange()
+          }, null) : vue.createVNode("ion-icon", {
+            "class": this.ns.e("nav-icon"),
+            "title": ibiz.i18n.t("component.controlNavigation.hiddenNav"),
+            "name": "eye-off-outline",
+            "onClick": () => this.c.onShowNavViewChange()
+          }, null) : null]
+        })];
+      }
     });
   }
 });

package/lib/control/calendar/calendar.css

@@ -1 +1 @@
-.ibiz-control-calendar{--ibiz-control-calendar-text-color:var(--ibiz-color-text-0);--ibiz-control-calendar-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-active-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-border-color:var(--ibiz-color-primary-active);--ibiz-control-calendar-font-size:var(--ibiz-font-size-small);--ibiz-control-calendar-item-padding:var(--ibiz-spacing-tight);--ibiz-control-calendar-border-radius:var(--ibiz-border-radius-small);--ibiz-control-calendar-margin:var(--ibiz-spacing-extra-tight);position:relative;width:100%;height:100%}.ibiz-control-calendar__nav-icon{position:absolute;top:18px;right:0;color:var(--ibiz-color-primary);cursor:pointer}.ibiz-control-calendar__calendar-item{display:flex;align-items:center;padding:var(--ibiz-control-calendar-item-padding)}.ibiz-control-calendar__icon{width:var(--ibiz-width-icon-small);height:var(--ibiz-width-icon-small);margin-right:var(--ibiz-spacing-base-tight);border-radius:var(--ibiz-border-radius-circle)}.ibiz-control-calendar-content{display:flex;flex-direction:column;width:100%;height:100%}.ibiz-control-calendar-content .el-calendar{display:flex;flex-direction:column;height:100%}.ibiz-control-calendar-content .el-calendar__header{flex-wrap:nowrap}.ibiz-control-calendar-content .el-calendar-table,.ibiz-control-calendar-content .el-calendar-table .el-calendar-day{width:100%;height:100%;min-height:90px;cursor:pointer}.ibiz-control-calendar-content .el-calendar-table{flex:1;width:-moz-fit-content;width:fit-content}.ibiz-control-calendar-content .el-calendar-table .el-calendar-day:hover{cursor:pointer;background-color:var(--el-calendar-selected-bg-color)}.ibiz-control-calendar-content .el-calendar__body{display:flex;flex:1;padding:0;overflow:auto}.ibiz-control-calendar-content.is-show-date-range .el-calendar-day{padding:var(--ibiz-spacing-tight) 0}.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item{width:calc(100% + 1px);min-height:34px;border-radius:0}.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item.is-begin-time{width:100%;margin-left:var(--ibiz-spacing-super-tight);border-radius:var(--ibiz-spacing-extra-tight) 0 0 var(--ibiz-spacing-extra-tight)}.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item.is-begin-time.is-end-time{width:calc(100% - var(--ibiz-spacing-super-tight) * 2);border-radius:var(--ibiz-spacing-extra-tight)}.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item.is-end-time{width:calc(100% - var(--ibiz-spacing-super-tight));border-radius:0 var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-extra-tight) 0}.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item.is-active{border-right:none;border-left:none}.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item.is-active.is-begin-time{border-left:solid .5px var(--ibiz-control-calendar-item-active-border-color,var(--ibiz-control-calendar-border-color))}.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item.is-active.is-end-time{border-right:solid .5px var(--ibiz-control-calendar-item-active-border-color,var(--ibiz-control-calendar-border-color))}.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item.is-hidden{position:relative;z-index:-1;opacity:0}.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item.is-no-begin-time,.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item.is-no-end-time{width:calc(100% - var(--ibiz-spacing-super-tight) * 2);margin-left:var(--ibiz-spacing-super-tight);border-radius:var(--ibiz-spacing-extra-tight)}.ibiz-control-calendar-more{width:100%;font-size:var(--ibiz-font-size-small);border-radius:var(--ibiz-spacing-extra-tight)}.ibiz-control-calendar-more:hover{background-color:var(--ibiz-control-calendar-hover-bg-color)}.ibiz-control-calendar-item{--ibiz-control-calendar-text-color:var(--ibiz-color-text-0);--ibiz-control-calendar-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-active-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-border-color:var(--ibiz-color-primary-active);--ibiz-control-calendar-font-size:var(--ibiz-font-size-small);--ibiz-control-calendar-item-padding:var(--ibiz-spacing-tight);--ibiz-control-calendar-border-radius:var(--ibiz-border-radius-small);--ibiz-control-calendar-margin:var(--ibiz-spacing-extra-tight);--ibiz-control-calendar-item-color:none;--ibiz-color-text-2:var(--ibiz-control-calendar-item-color);--ibiz-editor-default-text-color:var(--ibiz-control-calendar-item-color);height:100%;padding:var(--ibiz-control-calendar-item-padding);margin-bottom:var(--ibiz-control-calendar-margin);overflow:hidden;font-size:var(--ibiz-control-calendar-font-size);color:var(--ibiz-control-calendar-text-color);text-overflow:ellipsis;white-space:nowrap;cursor:pointer;border:solid .5px transparent;border-radius:var(--ibiz-control-calendar-border-radius)}.ibiz-control-calendar-item:hover{background-color:var(--ibiz-control-calendar-hover-bg-color)}.ibiz-control-calendar-item.is-active{background-color:var(--ibiz-control-calendar-active-bg-color);border:solid .5px var(--ibiz-control-calendar-item-active-border-color,var(--ibiz-control-calendar-border-color))}.ibiz-control-calendar-date-text{--ibiz-control-calendar-text-color:var(--ibiz-color-text-0);--ibiz-control-calendar-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-active-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-border-color:var(--ibiz-color-primary-active);--ibiz-control-calendar-font-size:var(--ibiz-font-size-small);--ibiz-control-calendar-item-padding:var(--ibiz-spacing-tight);--ibiz-control-calendar-border-radius:var(--ibiz-border-radius-small);--ibiz-control-calendar-margin:var(--ibiz-spacing-extra-tight);padding-bottom:var(--ibiz-control-calendar-item-padding);margin:0;text-align:center}.ibiz-control-calendar-day{height:-moz-fit-content;height:fit-content}.ibiz-control-calendar-content-title{line-height:var(--ibiz-editor-default-line-height);white-space:nowrap}.ibiz-control-calendar-content-header{--ibiz-control-calendar-text-color:var(--ibiz-color-text-0);--ibiz-control-calendar-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-active-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-border-color:var(--ibiz-color-primary-active);--ibiz-control-calendar-font-size:var(--ibiz-font-size-small);--ibiz-control-calendar-item-padding:var(--ibiz-spacing-tight);--ibiz-control-calendar-border-radius:var(--ibiz-border-radius-small);--ibiz-control-calendar-margin:var(--ibiz-spacing-extra-tight);display:flex;align-items:center}.ibiz-control-calendar-content-header>*+*{margin-left:var(--ibiz-control-calendar-item-padding)}.ibiz-control-calendar-content-header .el-button-group{display:flex}.ibiz-control-calendar-legend{display:flex;justify-content:center;width:100%}.ibiz-control-calendar-legend__item{display:flex;align-items:center;padding:0 var(--ibiz-spacing-tight);line-height:1em;cursor:pointer}.ibiz-control-calendar-legend__item--tip{display:inline-block;width:1.5em;height:.9em;margin-right:var(--ibiz-spacing-extra-tight);border-radius:var(--ibiz-border-radius-extra-small)}.ibiz-control-calendar-legend__item--text{display:inline-block;width:auto;max-width:100px;overflow:hidden;text-align:left;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-calendar-timeline-content{height:100%;overflow:auto}.ibiz-control-calendar-timeline-content .el-timeline{padding-left:0}
+.ibiz-control-calendar{--ibiz-control-calendar-text-color:var(--ibiz-color-text-0);--ibiz-control-calendar-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-active-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-border-color:var(--ibiz-color-primary-active);--ibiz-control-calendar-font-size:var(--ibiz-font-size-small);--ibiz-control-calendar-item-padding:var(--ibiz-spacing-tight);--ibiz-control-calendar-border-radius:var(--ibiz-border-radius-small);--ibiz-control-calendar-margin:var(--ibiz-spacing-extra-tight);position:relative;width:100%;height:100%}.ibiz-control-calendar__nav-icon{position:absolute;top:18px;right:0;color:var(--ibiz-color-primary);cursor:pointer}.ibiz-control-calendar__calendar-item{display:flex;align-items:center;padding:var(--ibiz-control-calendar-item-padding)}.ibiz-control-calendar__icon{width:var(--ibiz-width-icon-small);height:var(--ibiz-width-icon-small);margin-right:var(--ibiz-spacing-base-tight);border-radius:var(--ibiz-border-radius-circle)}.ibiz-control-calendar__user .ibiz-control-calendar__nav-icon{top:9px}.ibiz-control-calendar__day .ibiz-control-calendar__nav-icon,.ibiz-control-calendar__week .ibiz-control-calendar__nav-icon{top:28px;right:10px}.ibiz-control-calendar-content{display:flex;flex-direction:column;width:100%;height:100%}.ibiz-control-calendar-content .el-calendar{display:flex;flex-direction:column;height:100%}.ibiz-control-calendar-content .el-calendar__header{flex-wrap:nowrap}.ibiz-control-calendar-content .el-calendar-table,.ibiz-control-calendar-content .el-calendar-table .el-calendar-day{width:100%;height:100%;min-height:90px;cursor:pointer}.ibiz-control-calendar-content .el-calendar-table{flex:1;width:-moz-fit-content;width:fit-content}.ibiz-control-calendar-content .el-calendar-table .el-calendar-day:hover{cursor:pointer;background-color:var(--el-calendar-selected-bg-color)}.ibiz-control-calendar-content .el-calendar__body{display:flex;flex:1;padding:0;overflow:auto}.ibiz-control-calendar-content.is-show-date-range .el-calendar-day{padding:var(--ibiz-spacing-tight) 0}.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item{width:calc(100% + 1px);min-height:34px;border-radius:0}.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item.is-begin-time{width:100%;margin-left:var(--ibiz-spacing-super-tight);border-radius:var(--ibiz-spacing-extra-tight) 0 0 var(--ibiz-spacing-extra-tight)}.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item.is-begin-time.is-end-time{width:calc(100% - var(--ibiz-spacing-super-tight) * 2);border-radius:var(--ibiz-spacing-extra-tight)}.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item.is-end-time{width:calc(100% - var(--ibiz-spacing-super-tight));border-radius:0 var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-extra-tight) 0}.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item.is-active{border-right:none;border-left:none}.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item.is-active.is-begin-time{border-left:solid .5px var(--ibiz-control-calendar-item-active-border-color,var(--ibiz-control-calendar-border-color))}.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item.is-active.is-end-time{border-right:solid .5px var(--ibiz-control-calendar-item-active-border-color,var(--ibiz-control-calendar-border-color))}.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item.is-hidden{position:relative;z-index:-1;opacity:0}.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item.is-no-begin-time,.ibiz-control-calendar-content.is-show-date-range .ibiz-control-calendar-item.is-no-end-time{width:calc(100% - var(--ibiz-spacing-super-tight) * 2);margin-left:var(--ibiz-spacing-super-tight);border-radius:var(--ibiz-spacing-extra-tight)}.ibiz-control-calendar-more{width:100%;font-size:var(--ibiz-font-size-small);border-radius:var(--ibiz-spacing-extra-tight)}.ibiz-control-calendar-more:hover{background-color:var(--ibiz-control-calendar-hover-bg-color)}.ibiz-control-calendar-item{--ibiz-control-calendar-text-color:var(--ibiz-color-text-0);--ibiz-control-calendar-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-active-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-border-color:var(--ibiz-color-primary-active);--ibiz-control-calendar-font-size:var(--ibiz-font-size-small);--ibiz-control-calendar-item-padding:var(--ibiz-spacing-tight);--ibiz-control-calendar-border-radius:var(--ibiz-border-radius-small);--ibiz-control-calendar-margin:var(--ibiz-spacing-extra-tight);--ibiz-control-calendar-item-color:none;--ibiz-color-text-2:var(--ibiz-control-calendar-item-color);--ibiz-editor-default-text-color:var(--ibiz-control-calendar-item-color);height:100%;padding:var(--ibiz-control-calendar-item-padding);margin-bottom:var(--ibiz-control-calendar-margin);overflow:hidden;font-size:var(--ibiz-control-calendar-font-size);color:var(--ibiz-control-calendar-text-color);text-overflow:ellipsis;white-space:nowrap;cursor:pointer;border:solid .5px transparent;border-radius:var(--ibiz-control-calendar-border-radius)}.ibiz-control-calendar-item:hover{background-color:var(--ibiz-control-calendar-hover-bg-color)}.ibiz-control-calendar-item.is-active{background-color:var(--ibiz-control-calendar-active-bg-color);border:solid .5px var(--ibiz-control-calendar-item-active-border-color,var(--ibiz-control-calendar-border-color))}.ibiz-control-calendar-date-text{--ibiz-control-calendar-text-color:var(--ibiz-color-text-0);--ibiz-control-calendar-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-active-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-border-color:var(--ibiz-color-primary-active);--ibiz-control-calendar-font-size:var(--ibiz-font-size-small);--ibiz-control-calendar-item-padding:var(--ibiz-spacing-tight);--ibiz-control-calendar-border-radius:var(--ibiz-border-radius-small);--ibiz-control-calendar-margin:var(--ibiz-spacing-extra-tight);padding-bottom:var(--ibiz-control-calendar-item-padding);margin:0;text-align:center}.ibiz-control-calendar-day{height:-moz-fit-content;height:fit-content}.ibiz-control-calendar-content-title{line-height:var(--ibiz-editor-default-line-height);white-space:nowrap}.ibiz-control-calendar-content-header{--ibiz-control-calendar-text-color:var(--ibiz-color-text-0);--ibiz-control-calendar-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-active-bg-color:var(--ibiz-color-fill-0);--ibiz-control-calendar-border-color:var(--ibiz-color-primary-active);--ibiz-control-calendar-font-size:var(--ibiz-font-size-small);--ibiz-control-calendar-item-padding:var(--ibiz-spacing-tight);--ibiz-control-calendar-border-radius:var(--ibiz-border-radius-small);--ibiz-control-calendar-margin:var(--ibiz-spacing-extra-tight);display:flex;align-items:center}.ibiz-control-calendar-content-header>*+*{margin-left:var(--ibiz-control-calendar-item-padding)}.ibiz-control-calendar-content-header .el-button-group{display:flex}.ibiz-control-calendar-legend{display:flex;justify-content:center;width:100%}.ibiz-control-calendar-legend__item{display:flex;align-items:center;padding:0 var(--ibiz-spacing-tight);line-height:1em;cursor:pointer}.ibiz-control-calendar-legend__item--tip{display:inline-block;width:1.5em;height:.9em;margin-right:var(--ibiz-spacing-extra-tight);border-radius:var(--ibiz-border-radius-extra-small)}.ibiz-control-calendar-legend__item--text{display:inline-block;width:auto;max-width:100px;overflow:hidden;text-align:left;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-calendar-timeline-content{height:100%;overflow:auto}.ibiz-control-calendar-timeline-content .el-timeline{padding-left:0}

package/lib/control/grid/grid/grid-control.util.cjs

@@ -279,31 +279,37 @@ function useITableEvent(c) {
     if (!forbidChange && !c.state.isLoading)
       c.setSelection(selection);
   }
+  const elSelection = vue.computed(() => {
+    const items = [];
+    const keys = c.state.selectedData.map((selected) => selected.srfkey);
+    if (tableRef.value)
+      core.recursiveIterate(
+        { children: tableRef.value.store.states.data.value },
+        (item) => {
+          if (keys.includes(item.srfkey))
+            items.push(item);
+        }
+      );
+    return items;
+  });
   vue.watch(
     [
       () => tableRef.value,
       () => c.state.isLoaded,
       () => c.state.selectedData
     ],
-    ([table, isLoaded, newVal]) => {
+    ([table, isLoaded, _newVal]) => {
       if (!isLoaded || !table)
         return;
-      if (c.state.singleSelect) {
-        if (newVal[0]) {
-          tableRef.value.setCurrentRow(newVal[0], true);
+      forbidChange = true;
+      setTimeout(() => {
+        if (c.state.singleSelect) {
+          table.setCurrentRow(elSelection.value[0]);
         } else {
-          tableRef.value.setCurrentRow();
+          table.store.states.selection.value = elSelection.value;
         }
-      } else {
-        forbidChange = true;
-        tableRef.value.clearSelection();
-        setTimeout(() => {
-          newVal.forEach(
-            (item) => tableRef.value.toggleRowSelection(item, true)
-          );
-          forbidChange = false;
-        });
-      }
+        forbidChange = false;
+      });
     }
   );
   function onSortChange(opts) {
@@ -348,9 +354,8 @@ function useITableEvent(c) {
     let activeClassName = "";
     if (c.state.selectedData.length > 0) {
       c.state.selectedData.forEach((data) => {
-        if (data === row) {
+        if (data === row || data.srfkey === row.srfkey)
           activeClassName = "current-row";
-        }
       });
     }
     const rowState = c.findRowState(row);
@@ -448,22 +453,17 @@ function useAppGridPagination(c) {
 }
 function useAppGridBase(c, props, tableRef) {
   const initSimpleData = () => {
-    if (!props.data) {
+    if (!props.data)
       return;
-    }
-    c.state.items = props.data;
+    const items = props.data.map((item) => new runtime.ControlVO(item));
+    c.state.items = items;
     if (c.runMode === "DESIGN") {
-      c.state.simpleData = props.data;
+      c.state.simpleData = items;
       c.state.total = props.data.length;
       c.state.curPage = 1;
       c.state.items = lodashEs.chunk(c.state.simpleData, c.state.size)[c.state.curPage - 1] || [];
     }
-    c.state.rows = c.state.items.map((item) => {
-      const row = new runtime.GridRowState(new runtime.ControlVO(item), c);
-      return row;
-    });
-    c.calcAggResult(c.state.items);
-    c.calcTotalData();
+    c.afterLoad({ isInitialLoad: true }, c.state.items);
   };
   const defaultSort = vue.computed(() => {
     var _a;
@@ -484,9 +484,8 @@ function useAppGridBase(c, props, tableRef) {
   vue.watch(
     () => props.data,
     () => {
-      if (props.isSimple) {
+      if (props.isSimple)
         initSimpleData();
-      }
     },
     {
       deep: true
@@ -503,6 +502,7 @@ function useAppGridBase(c, props, tableRef) {
         if (grouprowmode === "NEWROW") {
           result.push({
             ...item,
+            srfkey: item.key,
             tempsrfkey: item.key,
             isGroupRow: true
           });

package/lib/control/grid/grid/grid.cjs

@@ -572,37 +572,40 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
         "style": this.headerCssVars
       }, {
         default: () => [vue.createVNode(vue.resolveComponent("el-table"), vue.mergeProps({
+          "border": true,
           "ref": "tableRef",
+          "data": this.tableData,
+          "row-key": "tempsrfkey",
+          "tooltip-effect": "light",
           "class": this.ns.e("table"),
+          "scrollbar-always-on": true,
+          "onRowClick": this.onRowClick,
+          "span-method": this.spanMethod,
           "default-sort": this.defaultSort,
-          "border": true,
-          "show-header": !this.c.state.hideHeader,
           "show-summary": this.c.enableAgg,
+          "onSortChange": this.onSortChange,
+          "onRowDblclick": this.onDbRowClick,
           "summary-method": this.summaryMethod,
-          "highlight-current-row": state.singleSelect,
-          "row-class-name": this.handleRowClassName,
-          "header-cell-class-name": this.handleHeaderCellClassName,
-          "row-key": "tempsrfkey",
-          "data": this.tableData,
+          "onHeaderDragend": this.headerDragend,
           "default-expand-all": defaultExpandAll,
-          "span-method": this.spanMethod,
-          "onRowClick": this.onRowClick,
-          "onRowDblclick": this.onDbRowClick,
+          "show-header": !this.c.state.hideHeader,
+          "row-class-name": this.handleRowClassName,
+          "highlight-current-row": state.singleSelect,
+          "expandRowKeys": this.c.state.expandRowKeys,
           "onSelectionChange": this.onSelectionChange,
-          "onSortChange": this.onSortChange,
-          "onHeaderDragend": this.headerDragend,
-          "tooltip-effect": "light",
-          "scrollbar-always-on": true
+          "header-cell-class-name": this.handleHeaderCellClassName,
+          "onExpandChange": (row, expanded) => this.c.expandChange(row, expanded)
         }, this.$attrs, renderAttrs(this.c.model, {
           ...this.c.getEventArgs()
         })), {
           empty: this.renderNoData,
           default: () => {
             return [this.c.enableRowEditOrder && this.renderDragIconColumn(), !state.singleSelect && vue.createVNode(vue.resolveComponent("el-table-column"), {
-              "class-name": this.ns.e("selection"),
-              "type": "selection",
               "width": "55",
-              "align": "center"
+              "align": "center",
+              "type": "selection",
+              "reserve-selection": true,
+              "class-name": this.ns.e("selection")
             }, null), this.renderRowDetail(), this.renderColumns.map((model, index) => {
               return this.renderTableColumn(model, index);
             })];

package/lib/control/map/map.cjs

@@ -86,35 +86,37 @@ const MapControl = /* @__PURE__ */ vue.defineComponent({
     const {
       state
     } = this.c;
-    if (!state.isCreated || !state.isLoaded)
+    if (!state.isCreated)
       return;
+    let content;
+    if (state.isLoaded) {
+      content = this.mapStyle === "USER" ? vue.createVNode(vue.resolveComponent("iBizMapChartUser"), {
+        "areaData": state.areaData,
+        "pointData": state.pointData,
+        "options": this.mapOpts,
+        "class": this.ns.e("map"),
+        "controller": this.c
+      }, null) : vue.createVNode(vue.resolveComponent("iBizMapChart"), {
+        "controller": this.c,
+        "areaData": state.areaData,
+        "pointData": state.pointData,
+        "options": this.mapOpts,
+        "class": this.ns.e("map"),
+        "onPointClick": (e) => {
+          this.c.onPointClick(e);
+        },
+        "onAreaClick": (e) => {
+          this.c.onAreaClick(e, "", "");
+        }
+      }, null);
+    }
     return vue.createVNode(vue.resolveComponent("iBizControlNavigation"), {
       "controller": this.c
     }, {
       default: () => [vue.createVNode(vue.resolveComponent("iBizControlBase"), {
         "controller": this.c
       }, {
-        default: () => [this.mapStyle === "USER" ? vue.createVNode(vue.resolveComponent("iBizMapChartUser"), {
-          "areaData": state.areaData,
-          "pointData": state.pointData,
-          "options": this.mapOpts,
-          "class": this.ns.e("map"),
-          "controller": this.c
-        }, null) : vue.createVNode(vue.resolveComponent("iBizMapChart"), {
-          "areaData": state.areaData,
-          "pointData": state.pointData,
-          "options": this.mapOpts,
-          "class": this.ns.e("map"),
-          "onMapChange": (e) => {
-            this.c.onMapChange(e.areaCode);
-          },
-          "onPointClick": (e) => {
-            this.c.onPointClick(e);
-          },
-          "onAreaClick": (e) => {
-            this.c.onAreaClick(e, "", "");
-          }
-        }, null), this.c.state.enableNavView && this.c.state.showNavIcon ? !this.c.state.showNavView ? vue.createVNode("ion-icon", {
+        default: () => [content, this.c.state.enableNavView && this.c.state.showNavIcon ? !this.c.state.showNavView ? vue.createVNode("ion-icon", {
           "class": this.ns.e("nav-icon"),
           "title": ibiz.i18n.t("component.controlNavigation.showNav"),
           "name": "eye-outline",

package/lib/control/tree/tree.cjs

@@ -399,16 +399,6 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
         addLoadMoreNode(item.level === 0 ? (_b = (_a = c.state.rootNodes) == null ? void 0 : _a[0]) == null ? void 0 : _b._id : (_c = item.data) == null ? void 0 : _c._id, item);
       });
     };
-    vue.watch(() => c.state.selectedData, () => {
-      var _a;
-      if (!treeRef.value)
-        return;
-      if (c.state.singleSelect) {
-        treeRef.value.setCurrentKey((_a = c.state.selectedData[0]) == null ? void 0 : _a._id);
-      } else {
-        treeRef.value.setCheckedKeys(c.state.selectedData.map((item) => item._id));
-      }
-    });
     const onCheck = (nodeData, opts) => {
       const {
         checkedNodes
@@ -427,9 +417,7 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
       if (((_a = treeRef.value) == null ? void 0 : _a.getCurrentKey()) === nodeData._id && !readonly.value) {
         editCurrentNodeText();
       }
-      if (!c.state.singleSelect) {
-        (_b = treeRef.value) == null ? void 0 : _b.setCurrentKey(nodeData._id);
-      }
+      (_b = treeRef.value) == null ? void 0 : _b.setCurrentKey(nodeData._id);
       if (c.state.navigational) {
         const nodeModel = c.getNodeModel(nodeData._nodeId);
         if (!(nodeModel == null ? void 0 : nodeModel.navAppViewId)) {
@@ -438,7 +426,7 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
         }
       }
       if (props.isSimple) {
-        treeRef.value.setCurrentKey((data == null ? void 0 : data._id) || void 0);
+        treeRef.value.setCurrentKey(data == null ? void 0 : data._id);
       } else {
         c.onTreeNodeClick(nodeData, evt);
       }