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

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

@@ -128,6 +128,7 @@ class AuthGuard {
     }
     if (viewModel.accUserMode !== 3) {
       this.throw401();
+      return;
     }
     if (!authInfo) {
       const loginResult = await ibiz.auth.anonymousLogin();

package/es/web-app/util/unauthorized-handler/unauthorized-handler.d.ts

@@ -10,6 +10,13 @@ import { IErrorHandler } from '@ibiz-template/runtime';
  */
 export declare class UnauthorizedHandler implements IErrorHandler {
     match(error: unknown): boolean;
+    /**
+     * @description 是否存在403错误未处理
+     * @protected
+     * @type {boolean}
+     * @memberof UnauthorizedHandler
+     */
+    protected hasPermErrPending: boolean;
     /**
      * oauth登录处理
      *

package/es/web-app/util/unauthorized-handler/unauthorized-handler.mjs

@@ -2,7 +2,22 @@ import qs from 'qs';
 import { HttpError, RuntimeError, UrlHelper, LoginMode } from '@ibiz-template/core';
 
 "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 UnauthorizedHandler {
+  constructor() {
+    /**
+     * @description 是否存在403错误未处理
+     * @protected
+     * @type {boolean}
+     * @memberof UnauthorizedHandler
+     */
+    __publicField(this, "hasPermErrPending", false);
+  }
   match(error) {
     return error instanceof HttpError && (error.status === 401 || error.status === 403);
   }
@@ -83,10 +98,15 @@ class UnauthorizedHandler {
    */
   async handle403(error) {
     if (error.tag === "APPINIT") {
+      if (this.hasPermErrPending) {
+        return;
+      }
+      this.hasPermErrPending = true;
       const result = await ibiz.confirm.warning({
         title: ibiz.i18n.t("webApp.unauthorizedHandler.forbiddenAccess"),
         desc: ibiz.i18n.t("webApp.unauthorizedHandler.logoutAccount")
       });
+      this.hasPermErrPending = false;
       if (result) {
         const bol = await ibiz.hub.controller.logout();
         if (bol) {
@@ -108,7 +128,8 @@ class UnauthorizedHandler {
     if (error instanceof HttpError) {
       if (error.status === 401) {
         const search = qs.parse(window.location.search.replace("?", ""));
-        if (search.isAnonymous) {
+        if ((search.isAnonymous || ibiz.env.enableAnonymous) && // 匿名登录获取视图模型发生异常，走普通登录，防止循环执行
+        error.tag !== "APPINIT") {
           ibiz.auth.anonymousLogin().then((bol) => {
             if (bol) {
               window.location.reload();

package/lib/common/carousel/carousel.css

@@ -1 +1 @@
-.ibiz-carousel-component .el-carousel__container .el-carousel__item{display:flex;align-items:center;justify-content:center}.ibiz-carousel-component .el-carousel__container .el-carousel__item img{display:inline-block;width:100%;height:100%}
+.ibiz-carousel-component .el-carousel__container .el-carousel__item{display:flex;align-items:center;justify-content:center}.ibiz-carousel-component .el-carousel__container .el-carousel__item img{display:inline-block;width:100%;height:100%;-o-object-fit:contain;object-fit:contain}

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

@@ -84,15 +84,14 @@ const IBizControlNavigation = /* @__PURE__ */ vue.defineComponent({
       }
     });
     const renderNavView = () => {
-      if (navViewMsg.value) {
-        if (!navViewMsg.value.viewId)
-          return;
-        return vue.h(vue.resolveComponent("IBizViewShell"), {
-          ...navViewMsg.value,
-          isEmbedCtrlNav: isEmbedCtrlNav.value,
-          class: ns.e("nav-view")
-        });
-      }
+      var _a2;
+      if (!((_a2 = navViewMsg.value) == null ? void 0 : _a2.viewId))
+        return;
+      return vue.h(vue.resolveComponent("IBizViewShell"), {
+        ...navViewMsg.value,
+        isEmbedCtrlNav: isEmbedCtrlNav.value,
+        class: ns.e("nav-view")
+      });
     };
     return {
       ns,

package/lib/common/control-navigation/provider/calendar-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";
@@ -14,17 +15,29 @@ class CalendarNavigationProvider extends navigationBase_provider.NavgationBasePr
     super(...arguments);
     __publicField(this, "keyName", "navId");
   }
+  /**
+   * @description 通过栈数据导航
+   * - 特殊处理仅使用开始时间绘制的日历
+   * @memberof CalendarNavigationProvider
+   */
   onNavDataByStack() {
-    const { items } = this.controller.state;
-    const navData = this.navStack.map((key) => items.find((item) => item.navId === key)).find((item) => item !== void 0) || items[0];
+    var _a;
+    const { controlParams, state, model } = this.controller;
+    const calendarStyle = (_a = model.calendarStyle) == null ? void 0 : _a.toLowerCase();
+    const items = state.items.filter((item) => {
+      if (calendarStyle === "month" && controlParams.showmode !== "daterange" || calendarStyle === "user")
+        return runtime.compareDateEqualByScale(
+          item.beginTime,
+          state.selectedDate,
+          calendarStyle === "user" ? "week" : "month"
+        );
+      return true;
+    });
+    const navData = this.navStack.map((key) => items.find((item) => item[this.keyName] === key)).find((item) => item !== void 0) || items[0];
     if (navData) {
-      const date = new Date(navData.beginTime);
-      this.controller.setSelectDate(date);
-      this.controller.setNavData(navData);
+      this.setNavData(navData);
     } else {
-      this.navStack = [];
-      this.controller.setSelectDate(/* @__PURE__ */ new Date());
-      this.navViewMsg.value = void 0;
+      this.clearNavigation();
     }
   }
   getNavViewMsg(item) {

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

@@ -1,5 +1,6 @@
 'use strict';
 
+var runtime = require('@ibiz-template/runtime');
 var navigationBase_provider = require('./navigation-base.provider.cjs');
 
 "use strict";
@@ -12,37 +13,72 @@ var __publicField = (obj, key, value) => {
 class MapNavigationProvider extends navigationBase_provider.NavgationBaseProvider {
   constructor() {
     super(...arguments);
-    __publicField(this, "keyName", "id");
+    __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[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, _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,
-        this.controller.context,
-        this.controller.params
+        { ...item._deData, areaCode, areaLevel },
+        tempContext,
+        tempParams
       );
+      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/data-import2/data-import2.cjs

@@ -236,8 +236,9 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
       }
       columnMappingListQuery();
     });
+    const uploadHeaders = ibiz.util.file.getUploadHeaders();
     const headers = vue.ref({
-      ["".concat(ibiz.env.tokenHeader, "Authorization")]: "".concat(ibiz.env.tokenPrefix, "Bearer ").concat(core.getAppCookie(core.CoreConst.TOKEN))
+      ...uploadHeaders
     });
     const UploadUrl = vue.computed(() => {
       let uploadFileUrl;

package/lib/common/editor-empty-text/editor-empty-text.cjs

@@ -0,0 +1,33 @@
+'use strict';
+
+var vue = require('vue');
+var vue3Util = require('@ibiz-template/vue3-util');
+require('./editor-empty-text.css');
+
+"use strict";
+const IBizEditorEmptyText = /* @__PURE__ */ vue.defineComponent({
+  name: "IBizEditorEmptyText",
+  props: {
+    showPlaceholder: {
+      type: Boolean,
+      default: false
+    },
+    placeHolder: {
+      type: String,
+      default: ""
+    }
+  },
+  setup() {
+    const ns = vue3Util.useNamespace("editor-empty-text");
+    return {
+      ns
+    };
+  },
+  render() {
+    return vue.createVNode("span", {
+      "class": [this.ns.b(), this.ns.is("placeholder", this.showPlaceholder)]
+    }, [this.showPlaceholder && this.placeHolder ? this.placeHolder : ibiz.config.common.emptyText]);
+  }
+});
+
+exports.IBizEditorEmptyText = IBizEditorEmptyText;

package/lib/common/editor-empty-text/editor-empty-text.css

@@ -0,0 +1 @@
+.ibiz-editor-empty-text.is-placeholder{color:var(--ibiz-color-text-3);white-space:nowrap}

package/lib/common/grid-setting/grid-setting.cjs

@@ -26,11 +26,15 @@ const IBizGridSetting = /* @__PURE__ */ vue.defineComponent({
     const ns = vue3Util.useNamespace("grid-setting");
     const c = props.controller;
     const dragColumnStates = vue.computed(() => {
-      return props.columnStates.map((item) => {
-        return {
-          ...item
-        };
+      const result = [];
+      props.columnStates.forEach((item) => {
+        if (!item.uaColumn) {
+          result.push({
+            ...item
+          });
+        }
       });
+      return result;
     });
     const isDraggable = vue.computed(() => {
       return false;

package/lib/common/index.cjs

@@ -36,10 +36,14 @@ var controlNavigation = require('./control-navigation/control-navigation.cjs');
 var ganttSetting = require('./gantt-setting/gantt-setting.cjs');
 var navSplit = require('./nav-split/nav-split.cjs');
 var cropping = require('./cropping/cropping.cjs');
+var editorEmptyText = require('./editor-empty-text/editor-empty-text.cjs');
+var kanbenSetting = require('./kanben-setting/kanben-setting.cjs');
 
 "use strict";
 const IBizCommonComponents = {
   install: (v) => {
+    v.component(kanbenSetting.IBizKanbanSetting.name, kanbenSetting.IBizKanbanSetting);
+    v.component(editorEmptyText.IBizEditorEmptyText.name, editorEmptyText.IBizEditorEmptyText);
     v.component(cropping.IBizCropping.name, cropping.IBizCropping);
     v.component(vue3Util.IBizControlBase.name, vue3Util.IBizControlBase);
     v.component(quickEdit.IBizQuickEdit.name, quickEdit.IBizQuickEdit);

package/lib/common/kanben-setting/kanben-setting.cjs

@@ -0,0 +1,67 @@
+'use strict';
+
+var vue = require('vue');
+var vue3Util = require('@ibiz-template/vue3-util');
+require('./kanben-setting.css');
+
+"use strict";
+const IBizKanbanSetting = /* @__PURE__ */ vue.defineComponent({
+  name: "IBizKanbanSetting",
+  props: {
+    controller: {
+      type: Object,
+      required: true
+    },
+    buttonStyle: {
+      type: Object,
+      default: () => ({
+        circle: false,
+        type: "info"
+      })
+    }
+  },
+  setup(props) {
+    const ns = vue3Util.useNamespace("kanban-setting");
+    const groups = vue.computed(() => {
+      return props.controller.state.groups;
+    });
+    return {
+      ns,
+      groups
+    };
+  },
+  render() {
+    return vue.createVNode("div", {
+      "class": this.ns.b()
+    }, [vue.createVNode(vue.resolveComponent("el-popover"), {
+      "trigger": "click",
+      "placement": "bottom",
+      "popper-class": this.ns.e("popover")
+    }, {
+      reference: () => {
+        return vue.createVNode(vue.resolveComponent("el-button"), this.buttonStyle, {
+          default: () => [vue.createVNode("ion-icon", {
+            "name": "options-outline",
+            "title": ibiz.i18n.t("component.kanbanSetting.hideGroup")
+          }, null)]
+        });
+      },
+      default: () => {
+        return vue.createVNode("div", {
+          "class": this.ns.em("popover", "content")
+        }, [this.groups.map((group) => {
+          return vue.createVNode(vue.resolveComponent("el-checkbox"), {
+            "size": "small",
+            "label": group.caption,
+            "model-value": !group.hidden,
+            "onChange": (val) => {
+              group.hidden = !val;
+            }
+          }, null);
+        })]);
+      }
+    })]);
+  }
+});
+
+exports.IBizKanbanSetting = IBizKanbanSetting;

package/lib/common/kanben-setting/kanben-setting.css

@@ -0,0 +1 @@
+.ibiz-kanban-setting__popover--content{display:flex;flex-direction:column;width:100%;max-height:500px;overflow-y:auto}

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, {
@@ -46,9 +51,8 @@ const IBizMapChart = /* @__PURE__ */ vue.defineComponent({
       historyNames,
       changeMap,
       getCityName,
-      goBack,
-      refresh
-    } = mapManager.useMapManager(options, (mapName) => {
+      goBack
+    } = mapManager.useMapManager(props.controller, options, (mapName) => {
       const {
         visualMap,
         pointSymbol,
@@ -56,8 +60,8 @@ const IBizMapChart = /* @__PURE__ */ vue.defineComponent({
         hoverAreaColor,
         areaBorderColor
       } = options.value;
-      const areaData2 = props.areaData || [];
-      const pointData2 = props.pointData || [];
+      const areaData = props.areaData || [];
+      const pointData = props.pointData || [];
       const result = {
         geo: {
           map: mapName
@@ -127,7 +131,7 @@ const IBizMapChart = /* @__PURE__ */ vue.defineComponent({
             select: {
               disabled: true
             },
-            data: areaData2.map((item) => ({
+            data: areaData.map((item) => ({
               name: "".concat(item._areaCode),
               value: item._value,
               _id: item._id
@@ -163,7 +167,7 @@ const IBizMapChart = /* @__PURE__ */ vue.defineComponent({
                 return find == null ? void 0 : find._tooltip;
               }
             },
-            data: pointData2.map((item) => {
+            data: pointData.map((item) => {
               return {
                 _id: item._id,
                 symbol: item._symbol ? "image://".concat(item._symbol) : void 0,
@@ -178,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;
@@ -194,13 +195,6 @@ const IBizMapChart = /* @__PURE__ */ vue.defineComponent({
     vue.onMounted(() => {
       changeMap(options.value.defaultAreaCode, true);
     });
-    const {
-      areaData,
-      pointData
-    } = vue.toRefs(props);
-    vue.watch([areaData, pointData], () => {
-      refresh();
-    });
     return {
       ns,
       chartRef,

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)) {