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

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

@@ -1,33 +1,15 @@
-import { ViewEngineBase } from '@ibiz-template/runtime';
+import { ExpViewEngine } from './exp-view.engine.mjs';
 
 "use strict";
-class CalendarExpViewEngine extends ViewEngineBase {
+class CalendarExpViewEngine extends ExpViewEngine {
   /**
-   * 树导航栏
-   *
+   * @description 导航栏部件名称
    * @readonly
+   * @type {string}
    * @memberof CalendarExpViewEngine
    */
-  get calendarExpBar() {
-    return this.view.getController(
-      "calendarexpbar"
-    );
-  }
-  async onCreated() {
-    await super.onCreated();
-    const { childNames } = this.view;
-    childNames.push("calendarexpbar");
-    if (!this.view.slotProps.calendarexpbar) {
-      this.view.slotProps.calendarexpbar = {};
-    }
-    this.view.slotProps.calendarexpbar.srfnav = this.view.state.srfnav;
-  }
-  async onMounted() {
-    await super.onMounted();
-    const { model } = this.view;
-    if (!this.view.state.noLoadDefault && model.loadDefault) {
-      this.calendarExpBar.load();
-    }
+  get expBarName() {
+    return "calendarexpbar";
   }
 }
 

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/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

@@ -66,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) {
@@ -119,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/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,

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

@@ -6,6 +6,8 @@ var vue = require('vue');
 var ramda = require('ramda');
 var vue3Util = require('@ibiz-template/vue3-util');
 var runtime = require('@ibiz-template/runtime');
+var core = require('@ibiz-template/core');
+var lodashEs = require('lodash-es');
 var mapChartUser_util = require('./map-chart-user.util.cjs');
 var mapUserManager = require('./map-user-manager.cjs');
 require('./map-chart-user.css');
@@ -33,6 +35,8 @@ const IBizMapChartUser = /* @__PURE__ */ vue.defineComponent({
     const ns = vue3Util.useNamespace("map-chart-user");
     const c = props.controller;
     let option = mapChartUser_util.defaultOpts;
+    const mapRef = vue.ref();
+    const isFull = vue.ref(false);
     if (c.controlParams.defaultopts) {
       const data = JSON.parse(c.controlParams.defaultopts);
       option = ramda.mergeDeepLeft(data, option);
@@ -42,9 +46,12 @@ const IBizMapChartUser = /* @__PURE__ */ vue.defineComponent({
         return ramda.isNil(z) ? x : z;
       }, option, props.options);
     });
+    let cleanup = core.NOOP;
     const {
       chartRef,
       historyNames,
+      processing,
+      areaLevelMap,
       changeMap,
       getCityInfo,
       goBack
@@ -58,13 +65,21 @@ const IBizMapChartUser = /* @__PURE__ */ vue.defineComponent({
         ...mapChartUser_util.getPointStaticOption(options.value),
         ...mapChartUser_util.getPointOption(pointData, areaData)
       };
+      const {
+        top,
+        bottom
+      } = options.value;
       const areaOption = {
+        top,
+        bottom,
         ...mapChartUser_util.getAreaStaticOption(options.value),
         ...mapChartUser_util.getAreaOption(mapName, pointData, areaData, cityInfo)
       };
       const result = {
         geo: {
-          map: mapName
+          map: mapName,
+          top,
+          bottom
         },
         tooltip,
         visualMap,
@@ -82,24 +97,85 @@ const IBizMapChartUser = /* @__PURE__ */ vue.defineComponent({
       const areaCode = c.state.strAreaCode ? "".concat(name) : Number(name);
       c.state.areaCode = areaCode;
       changeMap(name, areaCode, true);
+      c.evt.on("onDrillDown", async (args) => {
+        if (!processing.value) {
+          const {
+            data
+          } = args;
+          const code = data.areaCode;
+          const curAreaCode = c.state.strAreaCode ? "".concat(code) : Number(code);
+          const areaLevel = areaLevelMap.get(lodashEs.toNumber(curAreaCode)) || "";
+          c.state.areaCode = curAreaCode;
+          c.state.areaLevel = areaLevel;
+          await changeMap(code, code);
+        }
+      });
+      c.evt.on("onBackClick", () => {
+        if (!processing.value) {
+          goBack();
+        }
+      });
+      cleanup = core.listenJSEvent(window, "resize", () => {
+        if (isFull.value) {
+          isFull.value = ibiz.fullscreenUtil.isFullScreen;
+        }
+      });
     });
+    vue.onBeforeUnmount(() => {
+      if (cleanup !== core.NOOP) {
+        cleanup();
+      }
+    });
+    const onBack = async () => {
+      processing.value = true;
+      await c.evt.emit("onBackClick", void 0);
+      goBack();
+      processing.value = false;
+    };
+    const toggleFullScreen = () => {
+      if (mapRef.value) {
+        if (isFull.value) {
+          ibiz.fullscreenUtil.closeElementFullscreen();
+        } else {
+          ibiz.fullscreenUtil.openElementFullscreen(mapRef.value);
+        }
+        isFull.value = !isFull.value;
+      }
+    };
     return {
       ns,
+      c,
+      mapRef,
       chartRef,
       historyNames,
-      goBack
+      isFull,
+      onBack,
+      toggleFullScreen
     };
   },
   render() {
+    const {
+      enabledFullScreen
+    } = this.c.state;
     return vue.createVNode("div", {
-      "class": this.ns.b()
-    }, [vue.createVNode("div", {
+      "class": this.ns.b(),
+      "ref": "mapRef"
+    }, [enabledFullScreen ? vue.createVNode(vue.resolveComponent("el-button"), {
+      "type": "info",
+      "class": this.ns.e("fullscreen"),
+      "onClick": this.toggleFullScreen,
+      "title": this.isFull ? ibiz.i18n.t("app.cancelFullscreen") : ibiz.i18n.t("app.fullscreen")
+    }, {
+      default: () => [vue.createVNode("ion-icon", {
+        "name": this.isFull ? "contract-outline" : "expand-outline"
+      }, null)]
+    }) : null, vue.createVNode("div", {
       "class": this.ns.e("chart"),
       "ref": "chartRef"
     }, null), this.historyNames.length > 1 && vue.createVNode("div", {
       "class": this.ns.e("goback"),
       "onClick": () => {
-        this.goBack();
+        this.onBack();
       }
     }, [ibiz.i18n.t("app.return")])]);
   }

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__popper{padding:var(--ibiz-spacing-base)}
+.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)}

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

@@ -38,7 +38,30 @@ const defaultOpts = {
   /** 地图json数据基础路径 */
   jsonBaseUrl: "".concat(ibiz.env.assetsUrl, "/json/map"),
   /** 默认打开的区域编码 */
-  defaultAreaCode: 1e5
+  defaultAreaCode: 1e5,
+  // 距离底部距离
+  bottom: 20,
+  // 距离顶部距离
+  top: 20
+};
+const getItemStyle = (item) => {
+  const itemStyle = [];
+  if (item._color) {
+    itemStyle.push("color:".concat(item._color));
+  }
+  if (item._bgcolor) {
+    itemStyle.push("background:".concat(item._bgcolor));
+  }
+  if (item._borderColor) {
+    itemStyle.push("border-color:".concat(item._borderColor));
+  }
+  if (item._borderWidth) {
+    itemStyle.push("border-width:".concat(item._borderWidth, "px"));
+  }
+  if (item._borderWidth && item._borderColor) {
+    itemStyle.push("border-style:solid");
+  }
+  return itemStyle.join(";");
 };
 const findData = (id, type, pointData = [], areaData = []) => {
   if (type === "area") {
@@ -100,7 +123,21 @@ const getPointOption = (pointData, areaData) => {
         return;
       }
       const find = findData(params.data._id, "point", pointData, areaData);
-      return '<div style="color:'.concat(find._color, ";background: ").concat(find._bgcolor, '" class="').concat(find._className, " ").concat(ns.e("popper"), '">').concat(find == null ? void 0 : find._tooltip, "</div>");
+      if (!find) {
+        return;
+      }
+      const { _deData: data } = find;
+      let text = data.srfmajortext;
+      if (find._value) {
+        text = "".concat(data.srfmajortext, ": ").concat(find._value);
+      }
+      if (find._tooltip) {
+        text = find._tooltip;
+      }
+      const style = getItemStyle(find);
+      return '<div style="'.concat(style, '" class="').concat(find._className, " ").concat(ns.e(
+        "popper"
+      ), '">').concat(text, "</div>");
     },
     padding: 0
   };
@@ -159,7 +196,21 @@ const getAreaOption = (mapName, pointData, areaData, cityInfo = []) => {
         return;
       }
       const find = findData(params.data._id, "area", pointData, areaData);
-      return '<div style="color:'.concat(find._color, ";background: ").concat(find._bgcolor, '" class="').concat(find._className, " ").concat(ns.e("popper"), '">').concat(find == null ? void 0 : find._tooltip, "</div>");
+      if (!find || !find._tooltip && !find._value) {
+        return;
+      }
+      const { _deData: data } = find;
+      let text = data.srfmajortext;
+      if (find._value) {
+        text = "".concat(data.srfmajortext, ": ").concat(find._value);
+      }
+      if (find._tooltip) {
+        text = find._tooltip;
+      }
+      const style = getItemStyle(find);
+      return '<div style="'.concat(style, '" class="').concat(find._className, " ").concat(ns.e(
+        "popper"
+      ), '">').concat(text, "</div>");
     },
     padding: 0
   };