@ibiz-template/vue3-components 0.7.40-alpha.9 → 0.7.41-alpha.0

package/es/view-engine/md-custom-view.engine.d.ts

@@ -0,0 +1,81 @@
+import { IViewEvent, IViewState, ViewEngineBase, IUIActionResult, ViewController, IControlController } from '@ibiz-template/runtime';
+import { IControl, IMDControl, IAppDECustomView } from '@ibiz/model-core';
+export declare class MDCustomViewEngine extends ViewEngineBase {
+    protected view: ViewController<IAppDECustomView, IViewState, IViewEvent>;
+    /**
+     * 部件集合
+     *
+     * @type {IControl[]}
+     * @memberof MDCustomViewEngine
+     */
+    controls: IControl[];
+    /**
+     * 视图created生命周期执行逻辑
+     *
+     * @return {*}  {Promise<void>}
+     * @memberof MDCustomViewEngine
+     */
+    onCreated(): Promise<void>;
+    /**
+     * 视图mounted生命周期执行逻辑
+     *
+     * @return {*}  {Promise<void>}
+     * @memberof MDCustomViewEngine
+     */
+    onMounted(): Promise<void>;
+    /**
+     * @description 初始化部件激活模式
+     * @memberof MDCustomViewEngine
+     */
+    initMDCtrlActiveMode(): void;
+    /**
+     * 计算工具栏按钮状态
+     *
+     * @param {IMDControl} control 数据部件模型
+     * @param {(IData | undefined)} data 数据
+     * @memberof MDCustomViewEngine
+     */
+    calcToolbarButtonState(control: IMDControl, data: IData | undefined): void;
+    /**
+     * 执行视图预置界面行为能力
+     *
+     * @param {string} key
+     * @param {*} args
+     * @return {*}  {(Promise<IData | null | undefined>)}
+     * @memberof MDCustomViewEngine
+     */
+    call(key: string, args: any): Promise<IData | null | undefined>;
+    /**
+     * @description 打开编辑数据视图
+     * @protected
+     * @param {{
+     *     data: IData[];
+     *     event?: MouseEvent;
+     *     context?: IContext;
+     *     params?: IParams;
+     *   }} args
+     * @returns {*}  {Promise<IUIActionResult>}
+     * @memberof MDCustomViewEngine
+     */
+    protected openData(args: {
+        data: IData[];
+        ctrl?: IControlController;
+        event?: MouseEvent;
+        context?: IContext;
+        params?: IParams;
+    }): Promise<IUIActionResult>;
+    /**
+     * 打开编辑数据视图
+     *
+     * @author lxm
+     * @date 2022-09-01 18:09:19
+     * @param {IData} data
+     * @param {MouseEvent} [event]
+     * @returns {*}
+     */
+    protected newData(args: {
+        data: IData[];
+        event?: MouseEvent;
+        copyMode?: boolean;
+    }): Promise<IUIActionResult>;
+}

package/es/view-engine/md-custom-view.engine.mjs

@@ -0,0 +1,206 @@
+import { RuntimeModelError } from '@ibiz-template/core';
+import { ViewEngineBase, getControlsByView, SysUIActionTag, calcDeCodeNameById } from '@ibiz-template/runtime';
+import { clone } from 'lodash-es';
+
+"use strict";
+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 MDCustomViewEngine extends ViewEngineBase {
+  constructor() {
+    super(...arguments);
+    /**
+     * 部件集合
+     *
+     * @type {IControl[]}
+     * @memberof MDCustomViewEngine
+     */
+    __publicField(this, "controls", []);
+  }
+  /**
+   * 视图created生命周期执行逻辑
+   *
+   * @return {*}  {Promise<void>}
+   * @memberof MDCustomViewEngine
+   */
+  async onCreated() {
+    await super.onCreated();
+    this.controls = getControlsByView(this.view.model);
+    this.initMDCtrlActiveMode();
+  }
+  /**
+   * 视图mounted生命周期执行逻辑
+   *
+   * @return {*}  {Promise<void>}
+   * @memberof MDCustomViewEngine
+   */
+  async onMounted() {
+    await super.onMounted();
+    this.calcToolbarState = this.calcToolbarState.bind(this);
+    this.controls.forEach((ctrl) => {
+      const control = this.view.getController(
+        ctrl.name
+      );
+      control == null ? void 0 : control.evt.on(
+        "onLoadSuccess",
+        () => this.calcToolbarButtonState(ctrl, void 0)
+      );
+      control == null ? void 0 : control.evt.on(
+        "onSelectionChange",
+        (evt) => this.calcToolbarButtonState(ctrl, evt.data[0])
+      );
+      control == null ? void 0 : control.evt.on(
+        "onRefreshSuccess",
+        (evt) => this.calcToolbarButtonState(ctrl, evt.data[0])
+      );
+    });
+  }
+  /**
+   * @description 初始化部件激活模式
+   * @memberof MDCustomViewEngine
+   */
+  initMDCtrlActiveMode() {
+    const { model } = this.view;
+    this.controls.forEach((ctrl) => {
+      const name = ctrl.name || ctrl.id;
+      if (!this.view.slotProps[name]) {
+        this.view.slotProps[name] = {};
+      }
+      this.view.slotProps[name].mdctrlActiveMode = model.mdctrlActiveMode;
+    });
+  }
+  /**
+   * 计算工具栏按钮状态
+   *
+   * @param {IMDControl} control 数据部件模型
+   * @param {(IData | undefined)} data 数据
+   * @memberof MDCustomViewEngine
+   */
+  calcToolbarButtonState(control, data) {
+    const model = this.controls.find(
+      (ctrl) => {
+        var _a;
+        return ctrl.controlType === "TOOLBAR" && ((_a = ctrl.xdataControlName) == null ? void 0 : _a.toLowerCase()) === control.name;
+      }
+    );
+    if (model) {
+      const toolbar = this.view.getController(
+        model.name
+      );
+      toolbar == null ? void 0 : toolbar.calcButtonState(data, control.appDataEntityId);
+    }
+  }
+  /**
+   * 执行视图预置界面行为能力
+   *
+   * @param {string} key
+   * @param {*} args
+   * @return {*}  {(Promise<IData | null | undefined>)}
+   * @memberof MDCustomViewEngine
+   */
+  async call(key, args) {
+    var _a;
+    if (key === SysUIActionTag.REFRESH) {
+      await ((_a = this.viewLayoutPanel) == null ? void 0 : _a.load());
+      return null;
+    }
+    if (key === SysUIActionTag.EDIT || key === SysUIActionTag.VIEW) {
+      return this.openData(args);
+    }
+    if (key === SysUIActionTag.NEW) {
+      return this.newData(args);
+    }
+    return super.call(key, args);
+  }
+  /**
+   * @description 打开编辑数据视图
+   * @protected
+   * @param {{
+   *     data: IData[];
+   *     event?: MouseEvent;
+   *     context?: IContext;
+   *     params?: IParams;
+   *   }} args
+   * @returns {*}  {Promise<IUIActionResult>}
+   * @memberof MDCustomViewEngine
+   */
+  async openData(args) {
+    var _a, _b;
+    const { data, ctrl, event } = args;
+    const context = (args.context || this.view.context).clone();
+    let deName = (_a = data[0].srfdecodename) == null ? void 0 : _a.toLowerCase();
+    if (ctrl) {
+      context.srfnavctrlid = ctrl.ctrlId;
+      if (!deName) {
+        deName = calcDeCodeNameById(ctrl.model.appDataEntityId);
+      }
+    }
+    const params = args.params || this.view.params;
+    context[deName.toLowerCase()] = data[0].srfkey;
+    const result = await ((_b = this.view.scheduler) == null ? void 0 : _b.triggerCustom("opendata", {
+      context,
+      params,
+      data,
+      event,
+      view: this.view
+    }));
+    if (result === -1) {
+      throw new RuntimeModelError(
+        this.view.model,
+        ibiz.i18n.t("runtime.engine.logicOpendata")
+      );
+    } else {
+      return {
+        cancel: result ? !result.ok : true
+      };
+    }
+  }
+  /**
+   * 打开编辑数据视图
+   *
+   * @author lxm
+   * @date 2022-09-01 18:09:19
+   * @param {IData} data
+   * @param {MouseEvent} [event]
+   * @returns {*}
+   */
+  async newData(args) {
+    var _a, _b, _c;
+    const { data, event, copyMode } = args;
+    const openAppViewLogic = (_b = (_a = this.view.model.viewLayoutPanel) == null ? void 0 : _a.appViewLogics) == null ? void 0 : _b.find(
+      (item) => item.id === "newdata"
+    );
+    if (!openAppViewLogic) {
+      throw new RuntimeModelError(
+        this.view.model,
+        ibiz.i18n.t("runtime.engine.logicNewdata")
+      );
+    }
+    const params = clone(this.view.params);
+    if (copyMode) {
+      params.srfcopymode = copyMode;
+    }
+    const result = await ((_c = this.view.scheduler) == null ? void 0 : _c.triggerCustom("newdata", {
+      context: this.view.context,
+      params,
+      data,
+      event,
+      view: this.view
+    }));
+    if (result === -1) {
+      throw new RuntimeModelError(
+        this.view.model,
+        ibiz.i18n.t("runtime.engine.logicNewdata")
+      );
+    } else {
+      return {
+        cancel: result ? !result.ok : true
+      };
+    }
+  }
+}
+
+export { MDCustomViewEngine };

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

@@ -143,12 +143,17 @@ class TabExpViewEngine extends ViewEngineBase {
       case "TOP":
         deleteItems.splice(0, 1);
         break;
+      case "FLOW":
+      case "FLOW_NOHEADER":
+        break;
       default:
         deleteItems.splice(0, 1);
         break;
     }
-    setTabExpModelLayout(containerName);
-    findPanelItemsAndDelete(deleteItems);
+    if (tabLayout !== "FLOW" && tabLayout !== "FLOW_NOHEADER") {
+      setTabExpModelLayout(containerName);
+      findPanelItemsAndDelete(deleteItems);
+    }
   }
   /**
    * 计算视图头部元素的显示与否

package/es/web-app/App.mjs

@@ -1,5 +1,5 @@
-import { defineComponent, onUnmounted, createVNode, resolveComponent } from 'vue';
-import { Modal, ViewMode } from '@ibiz-template/runtime';
+import { onUnmounted, resolveComponent, createVNode, defineComponent } from 'vue';
+import { ViewMode, Modal } from '@ibiz-template/runtime';
 import { AppHooks } from '@ibiz-template/vue3-util';
 import './App.css';
 

package/es/web-app/components/modal-router-shell/modal-router-shell.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, ref, toRaw, onUnmounted, createVNode } from 'vue';
+import { ref, toRaw, onUnmounted, createVNode, defineComponent } from 'vue';
 import { parseRouteViewData, createOverlayView, routerCallback, route2routePath } from '@ibiz-template/vue3-util';
 import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { IBizContext } from '@ibiz-template/core';

package/es/web-app/components/router-shell/router-shell.mjs

@@ -1,7 +1,7 @@
-import { defineComponent, ref, toRaw, onUnmounted, watch, onActivated, onDeactivated, createVNode, Fragment, h, resolveComponent } from 'vue';
+import { ref, toRaw, onUnmounted, watch, onActivated, onDeactivated, Fragment, resolveComponent, h, createVNode, defineComponent } from 'vue';
 import { parseRouteViewData } from '@ibiz-template/vue3-util';
 import { useRoute, useRouter } from 'vue-router';
-import { Modal, ViewMode, RouteConst } from '@ibiz-template/runtime';
+import { ViewMode, Modal, RouteConst } from '@ibiz-template/runtime';
 import { IBizContext } from '@ibiz-template/core';
 import { mergeDeepLeft } from 'ramda';
 

package/es/web-app/guard/auth-guard/auth-guard.mjs

@@ -1,4 +1,4 @@
-import { RuntimeError, getAppCookie, CoreConst, HttpError } from '@ibiz-template/core';
+import { CoreConst, getAppCookie, RuntimeError, HttpError } from '@ibiz-template/core';
 import { mergeDeepRight } from 'ramda';
 import { AppHooks } from '@ibiz-template/vue3-util';
 import { updateDevToolConfig } from '@ibiz-template/devtool';
@@ -47,8 +47,9 @@ class AuthGuard {
       try {
         if (ibiz.env.enableAnonymous) {
           await this.anonymousValidate(context);
+        } else {
+          await this.appInit(context);
         }
-        await this.appInit(context);
       } catch (error) {
         result = false;
         error.tag = "APPINIT";
@@ -70,6 +71,39 @@ class AuthGuard {
   async anonymousValidate(context) {
     const authInfo = ibiz.auth.getAuthInfo();
     if (authInfo && !authInfo.isAnonymous) {
+      try {
+        await this.appInit(context);
+        return;
+      } catch (error) {
+        const { status } = error;
+        if (status === 401) {
+          const refreshToken = getAppCookie(CoreConst.REFRESH_TOKEN);
+          if (refreshToken) {
+            await ibiz.auth.refreshToken();
+            await this.appInit(context);
+            return;
+          }
+          ibiz.auth.clearAuthData();
+        } else {
+          throw error;
+        }
+      }
+    }
+    if (authInfo == null ? void 0 : authInfo.token) {
+      try {
+        await this.appInit(context);
+      } catch (error) {
+        const { status } = error;
+        if (status === 401) {
+          const loginResult = await ibiz.auth.anonymousLogin();
+          if (!loginResult) {
+            throw new RuntimeError(ibiz.i18n.t("webApp.authGuard.loginFailed"));
+          }
+          await this.appInit(context);
+        } else {
+          throw error;
+        }
+      }
       return;
     }
     await this.initModel(context, false);
@@ -101,6 +135,7 @@ class AuthGuard {
         throw new RuntimeError(ibiz.i18n.t("webApp.authGuard.loginFailed"));
       }
     }
+    await this.appInit(context);
   }
   /**
    * 应用参数初始化
@@ -138,7 +173,7 @@ class AuthGuard {
       }
     }
     await this.initModel(context);
-    await ibiz.auth.extendLogin();
+    await ibiz.auth.extendLogin(context);
     await ibiz.hub.notice.init();
     await ibiz.util.theme.initCustomTheme();
   }

package/es/web-app/main.mjs

@@ -34,6 +34,7 @@ async function runApp(plugins, opts) {
   });
   install();
   install$1();
+  AppHooks.appResorceInited.call(ibiz.hub);
   ibiz.util.getGlobalParam = () => {
     return useAppStore().appStore;
   };

package/es/web-app/router/index.mjs

@@ -1,4 +1,4 @@
-import { createRouter, createWebHashHistory } from 'vue-router';
+import { createWebHashHistory, createRouter } from 'vue-router';
 import qs from 'qs';
 import { AppRedirectView } from '@ibiz-template/vue3-util';
 import { RouteConst } from '@ibiz-template/runtime';

package/lib/_virtual/index.cjs

@@ -0,0 +1,5 @@
+'use strict';
+
+var dist = {exports: {}};
+
+exports.__module = dist;

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

@@ -40,6 +40,17 @@ const IBizControlNavigation = /* @__PURE__ */ vue.defineComponent({
     const navRenderMode = ((_a = controlParam == null ? void 0 : controlParam.ctrlParams) == null ? void 0 : _a.navRenderMode) ? controlParam.ctrlParams.navRenderMode : "RELOAD";
     const splitValue = vue.ref(0.5);
     const splitMode = vue.ref(["BOTTOM", "ANY_BOTTOM"].includes(navViewPos) ? "vertical" : "horizontal");
+    const style = vue.computed(() => {
+      const {
+        controlType,
+        height
+      } = props.controller.model;
+      if (controlType === "MAP" && splitMode.value === "vertical")
+        return {
+          height: "".concat(height ? height + (navViewMaxHeight || navViewHeight || 400) : 1e3, "px")
+        };
+      return void 0;
+    });
     vue.watch(() => provider.navViewMsg.value, async (newVal, oldVal) => {
       if (navRenderMode === "REDRAW" || !newVal || oldVal && newVal.viewId !== oldVal.viewId) {
         navViewMsg.value = newVal;
@@ -85,6 +96,7 @@ const IBizControlNavigation = /* @__PURE__ */ vue.defineComponent({
     };
     return {
       ns,
+      style,
       navStyle,
       provider,
       splitMode,
@@ -101,6 +113,7 @@ const IBizControlNavigation = /* @__PURE__ */ vue.defineComponent({
     } = this.controller;
     return vue.createVNode("div", {
       "ref": "outerWrapper",
+      "style": this.style,
       "class": [this.ns.b(), this.ns.e((_a = model.controlType) == null ? void 0 : _a.toLowerCase())]
     }, [state.enableNavView ? state.showNavView ? vue.createVNode(vue.resolveComponent("iBizNavSplit"), {
       "modelValue": this.splitValue,

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

@@ -40,9 +40,9 @@ class CalendarNavigationProvider extends navigationBase_provider.NavgationBasePr
         this.controller.params
       );
       return {
-        key: item.navId,
-        context,
         params,
+        context,
+        key: item.navId,
         viewId: itemModel.navAppViewId
       };
     }

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

@@ -3,16 +3,17 @@
 var navigationBase_provider = require('./navigation-base.provider.cjs');
 var calendarNavigation_provider = require('./calendar-navigation.provider.cjs');
 var treeNavigation_provider = require('./tree-navigation.provider.cjs');
+var mapNavigation_provider = require('./map-navigation.provider.cjs');
 
 "use strict";
 function getNavigationProvider(controller) {
   const { controlType } = controller.model;
-  if (controlType === "CALENDAR") {
+  if (controlType === "CALENDAR")
     return new calendarNavigation_provider.CalendarNavigationProvider(controller);
-  }
-  if (controlType === "TREEVIEW") {
+  if (controlType === "TREEVIEW")
     return new treeNavigation_provider.TreeNavigationProvider(controller);
-  }
+  if (controlType === "MAP")
+    return new mapNavigation_provider.MapNavigationProvider(controller);
   return new navigationBase_provider.NavgationBaseProvider(controller);
 }
 

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

@@ -0,0 +1,52 @@
+'use strict';
+
+var navigationBase_provider = require('./navigation-base.provider.cjs');
+
+"use strict";
+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 MapNavigationProvider extends navigationBase_provider.NavgationBaseProvider {
+  constructor() {
+    super(...arguments);
+    __publicField(this, "keyName", "id");
+  }
+  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];
+    if (navData) {
+      this.controller.setNavData(navData);
+    } else {
+      this.navStack = [];
+      this.navViewMsg.value = void 0;
+    }
+  }
+  getNavViewMsg(item) {
+    const { sysMapItems } = this.model;
+    const itemModel = sysMapItems == null ? void 0 : sysMapItems.find((_item) => _item.id === item._mapItemId);
+    if (itemModel) {
+      const { context, params } = this.prepareParams(
+        itemModel,
+        item._deData,
+        this.controller.context,
+        this.controller.params
+      );
+      return {
+        params,
+        context,
+        key: item._id,
+        viewId: itemModel.navAppViewId
+      };
+    }
+    return {
+      key: item._id,
+      context: this.controller.context,
+      params: this.controller.params
+    };
+  }
+}
+
+exports.MapNavigationProvider = MapNavigationProvider;

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

@@ -117,10 +117,10 @@ class NavgationBaseProvider {
    */
   onNavDataChange(event) {
     var _a;
-    const { navData, context, params } = event;
+    const { navData } = event;
     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, context, params);
+      this.navViewMsg.value = this.getNavViewMsg(navData);
     }
   }
   /**
@@ -132,9 +132,14 @@ class NavgationBaseProvider {
    * @return {*}  {INavViewMsg}
    * @memberof NavgationBaseProvider
    */
-  getNavViewMsg(data, context, params) {
+  getNavViewMsg(data) {
     const viewModelId = this.model.navAppViewId;
-    const result = this.prepareParams(this.model, data, context, params);
+    const result = this.prepareParams(
+      this.model,
+      data,
+      this.controller.context,
+      this.controller.params
+    );
     return {
       key: data[this.keyName],
       context: result.context,

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

@@ -182,14 +182,10 @@ const IBizMapChart = /* @__PURE__ */ vue.defineComponent({
           emit("mapChange", e);
           break;
         case "pointClick":
-          emit("pointClick", {
-            data: findData(e._id, "point")
-          });
+          emit("pointClick", findData(e._id, "point"));
           break;
         case "areaClick":
-          emit("areaClick", {
-            data: findData(e._id, "area")
-          });
+          emit("areaClick", findData(e._id, "area"));
           break;
         default:
           break;

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

@@ -28,7 +28,7 @@ const defaultOpts = {
   /** 点图标 */
   pointSymbol: "pin",
   /** 地图json数据基础路径 */
-  jsonBaseUrl: "./assets/json/map",
+  jsonBaseUrl: "".concat(ibiz.env.assetsUrl, "/json/map"),
   /** 默认打开的区域编码 */
   defaultAreaCode: 1e5
 };

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

@@ -36,7 +36,7 @@ const defaultOpts = {
   /** 点图标 */
   pointSymbol: "pin",
   /** 地图json数据基础路径 */
-  jsonBaseUrl: "./assets/json/map",
+  jsonBaseUrl: "".concat(ibiz.env.assetsUrl, "/json/map"),
   /** 默认打开的区域编码 */
   defaultAreaCode: 1e5
 };
@@ -167,7 +167,8 @@ const getAreaOption = (mapName, pointData, areaData, cityInfo = []) => {
     return {
       name: "".concat(item._areaCode),
       value: item._value,
-      _id: item._id
+      _id: item._id,
+      deData: item
     };
   });
   options.select = {

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

@@ -100,14 +100,14 @@ function useMapManager(controller, opts, calcEchartsOpts) {
         if (params.seriesType === "map") {
           const areaCode = opts.value.strAreaCode ? "".concat(params.name) : Number(params.name);
           controller.state.areaCode = areaCode;
+          const { pointData, areaData, enabledDrillDown } = controller.state;
           if (params.data) {
-            const { pointData, areaData } = controller.state;
             const data = mapChartUser_util.findData(params.data._id, "area", pointData, areaData);
             if (data) {
               controller.onAreaClick(data);
             }
           }
-          if (params.name !== currentName.value) {
+          if (params.name !== currentName.value && enabledDrillDown) {
             changeMap(params.name, areaCode);
           }
         }

package/lib/common/pql-editor/pql-editor.module.cjs

@@ -1,9 +1,9 @@
 'use strict';
 
 var editor = require('@wangeditor/editor');
-require('../../node_modules/.pnpm/snabbdom@3.6.2/node_modules/snabbdom/build/index.cjs');
+require('../../node_modules/.pnpm/snabbdom@3.5.1/node_modules/snabbdom/build/index.cjs');
 var index = require('./utils/index.cjs');
-var h = require('../../node_modules/.pnpm/snabbdom@3.6.2/node_modules/snabbdom/build/h.cjs');
+var h = require('../../node_modules/.pnpm/snabbdom@3.5.1/node_modules/snabbdom/build/h.cjs');
 
 "use strict";
 const pqlType = [