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

package/es/common/map-chart-user/map-chart-user.util.mjs

@@ -57,7 +57,7 @@ const getCssVarByName = (name) => {
 const getPointStaticOption = (params) => {
   const { pointSymbol } = params;
   const ns = useNamespace("map-chart-user");
-  const textColor = getCssVarByName(ns.cssVarName("color-text-1"));
+  const textColor = getCssVarByName(ns.cssVarName("color-danger"));
   const fontSize = getCssVarByName(ns.cssVarName("font-size-header-4"));
   const options = {
     type: "scatter",

package/es/control/app-menu/app-menu.d.ts

@@ -1,7 +1,7 @@
 import { Namespace } from '@ibiz-template/core';
 import { IAppMenu } from '@ibiz/model-core';
-import { PropType, Ref } from 'vue';
-import { AppMenuController, IControlProvider } from '@ibiz-template/runtime';
+import { Ref, PropType } from 'vue';
+import { IControlProvider, AppMenuController } from '@ibiz-template/runtime';
 import './app-menu.scss';
 export declare const AppMenuControl: import("vue").DefineComponent<{
     /**

package/es/control/app-menu/app-menu.mjs

@@ -1,6 +1,6 @@
 import { isVNode, resolveComponent, createVNode, ref, watch, onUnmounted, computed, onMounted, nextTick, mergeProps, defineComponent } from 'vue';
 import { RuntimeError, showTitle, findRecursiveChild } from '@ibiz-template/core';
-import { useControlController, useNamespace } from '@ibiz-template/vue3-util';
+import { useControlController, useNamespace, route2routePath } from '@ibiz-template/vue3-util';
 import { createUUID } from 'qx-util';
 import { AppMenuController, formatSeparator, ViewCallTag } from '@ibiz-template/runtime';
 import { useRoute } from 'vue-router';
@@ -259,24 +259,32 @@ const AppMenuControl = /* @__PURE__ */ defineComponent({
     const calcCurMenu = () => {
       const allItems = c.getAllItems();
       return allItems.find((item) => {
-        if (item.itemType === "MENUITEM" && item.appFuncId) {
+        var _a;
+        if (item.itemType !== "MENUITEM" || !item.appFuncId)
+          return false;
+        if (ibiz.config.appMenu.echoMode === "VIEW") {
           const app = ibiz.hub.getApp(item.appId);
-          if (!app) {
+          if (!app)
             return false;
-          }
           const func = app.getAppFunc(item.appFuncId);
-          if (func && func.appViewId && route.params.view2) {
+          if (func && func.appViewId && (route == null ? void 0 : route.params.view2)) {
             return func.appViewId.split(".")[1] === route.params.view2;
           }
+        } else {
+          if (!route) {
+            return false;
+          }
+          const routePath = route2routePath(route);
+          if (routePath.pathNodes.length > 1)
+            return item.id === ((_a = routePath.pathNodes[1].params) == null ? void 0 : _a.srfmenuitem);
         }
         return false;
       });
     };
     const onClick = async (id, event) => {
       const activeMenu = calcCurMenu();
-      if (activeMenu && activeMenu.id === id) {
+      if (activeMenu && activeMenu.id === id)
         return;
-      }
       defaultActive.value = id;
       const menu = c.getAllItems().find((m) => m.id === id);
       if ((menu == null ? void 0 : menu.itemType) === "RAWITEM" || c.runMode === "DESIGN") {
@@ -285,7 +293,7 @@ const AppMenuControl = /* @__PURE__ */ defineComponent({
       await c.onClickMenuItem(id, event);
     };
     if (c.runMode !== "DESIGN") {
-      watch(() => route.params.view2, (newVal, oldVal) => {
+      watch(() => route == null ? void 0 : route.params.view2, (newVal, oldVal) => {
         if (newVal !== oldVal && ibiz.config.appMenu.enableEcho) {
           const activeMenu = calcCurMenu();
           defaultActive.value = activeMenu ? activeMenu.id : "";
@@ -301,7 +309,7 @@ const AppMenuControl = /* @__PURE__ */ defineComponent({
       const defaultActiveMenuItem = allItems.find((item) => {
         return item.openDefault && !item.hidden;
       });
-      if (defaultActiveMenuItem && !route.params.view2 && !route.fullPath.includes("404")) {
+      if (defaultActiveMenuItem && !(route == null ? void 0 : route.params.view2) && !(route == null ? void 0 : route.fullPath.includes("404"))) {
         defaultActive.value = defaultActiveMenuItem.id;
         onClick(defaultActive.value);
       } else if (ibiz.config.appMenu.enableEcho) {

package/es/control/calendar/calendar.mjs

@@ -546,13 +546,17 @@ const CalendarControl = /* @__PURE__ */ defineComponent({
           const {
             data
           } = value;
-          this.c.onRowClick(data[0]);
+          const item = data[0];
+          if (item)
+            this.c.onRowClick(item);
         },
         "onEventDblClick": (value) => {
           const {
             data
           } = value;
-          this.c.onDbRowClick(data[0]);
+          const item = data[0];
+          if (item)
+            this.c.onDbRowClick(item);
         }
       }, _isSlot(slots) ? slots : {
         default: () => [slots]

package/es/control/calendar/components/calendar-daily/use-calendar-daily.mjs

@@ -125,7 +125,7 @@ const useCalendarDaily = (props, emit) => {
       const difference = new Date(endTime).getTime() - new Date(startTime).getTime();
       height = Math.floor(difference / (1e3 * 60));
     }
-    if (height < 3) {
+    if (height < 30) {
       height = "auto";
     }
     return height;

package/es/control/calendar/components/calendar-week/use-calendar-week.mjs

@@ -151,7 +151,7 @@ const useCalendarWeek = (props, emit) => {
           const width = "".concat(percentage, "%");
           const styleLeft = "".concat(index * percentage, "%");
           Object.assign(tempEventContent, { width, styleLeft });
-          let height = 3;
+          let height = "auto";
           let styleTop = 60;
           let timeRange = "";
           if (isToday(event.beginTime, event.endTime)) {
@@ -299,8 +299,8 @@ const useCalendarWeek = (props, emit) => {
       const difference = new Date(endTime).getTime() - new Date(startTime).getTime();
       height = Math.floor(difference / (1e3 * 60));
     }
-    if (height < 3) {
-      height = 3;
+    if (height < 30) {
+      height = "auto";
     }
     return height;
   };

package/es/control/drtab/drtab-control.util.mjs

@@ -1,5 +1,5 @@
 import { ref, watch, watchEffect, onUnmounted } from 'vue';
-import { defaultNamespace } from '../../node_modules/.pnpm/@ibiz-template_core@0.7.40_axios@1.6.8_lodash-es@4.17.21_qs@6.11.2_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.mjs';
+import { defaultNamespace } from '../../node_modules/.pnpm/@ibiz-template_core@0.7.41-alpha.2_axios@1.6.8_lodash-es@4.17.21_qs@6.11.2_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.mjs';
 
 "use strict";
 function useAppDRTab(c, controlRef, counterData) {

package/es/control/kanban/kanban.mjs

@@ -235,7 +235,12 @@ const KanbanControl = /* @__PURE__ */ defineComponent({
       const findIndex = c.state.selectedData.findIndex((data) => {
         return data.srfkey === item.srfkey;
       });
-      const cardClass = [ns.b("item"), ns.is("selected", findIndex !== -1), ns.is("disabled", disabled.value)];
+      const cardClass = [
+        ns.b("item"),
+        ns.is("selected", findIndex !== -1),
+        // 数据更新时不允许拖拽，鼠标变为禁用
+        ns.is("disabled", c.state.draggable && c.state.updating)
+      ];
       const cardStyle = {};
       if (c.model.cardWidth) {
         cardStyle.width = "".concat(c.model.cardWidth, "px");

package/es/util/fullscreen/fullscreen-util.mjs

@@ -1,6 +1,6 @@
 import { createApp } from 'vue';
 import ElementPlus from 'element-plus';
-import { defaultNamespace } from '../../node_modules/.pnpm/@ibiz-template_core@0.7.40_axios@1.6.8_lodash-es@4.17.21_qs@6.11.2_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.mjs';
+import { defaultNamespace } from '../../node_modules/.pnpm/@ibiz-template_core@0.7.41-alpha.2_axios@1.6.8_lodash-es@4.17.21_qs@6.11.2_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.mjs';
 import { IBizFullscreenToolbar } from '../../common/fullscreen-toolbar/fullscreen-toolbar.mjs';
 
 "use strict";

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

@@ -15,6 +15,7 @@ const RouterShell = /* @__PURE__ */ defineComponent({
     }
   },
   setup(props) {
+    var _a;
     const route = useRoute();
     const router = useRouter();
     const viewData = ref({});
@@ -29,11 +30,13 @@ const RouterShell = /* @__PURE__ */ defineComponent({
           context.destroy();
       }
     };
-    const routeDepth = props.modal.routeDepth;
+    const routeDepth = (_a = props.modal) == null ? void 0 : _a.routeDepth;
     onUnmounted(() => {
       destroyContext();
     });
     const calcViewData = async () => {
+      if (!routeDepth)
+        return;
       try {
         const _viewData = await parseRouteViewData(route, routeDepth);
         const _context = IBizContext.create(_viewData.context);
@@ -60,7 +63,7 @@ const RouterShell = /* @__PURE__ */ defineComponent({
     });
     const routeModal = new Modal({
       mode: ViewMode.ROUTE,
-      routeDepth: routeDepth + 1
+      routeDepth: (routeDepth || 0) + 1
     });
     onActivated(() => {
       isActivated.value = true;
@@ -77,9 +80,8 @@ const RouterShell = /* @__PURE__ */ defineComponent({
     };
   },
   render() {
-    if (!this.isLoaded) {
+    if (!this.isLoaded)
       return null;
-    }
     const {
       context,
       params,

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

@@ -59,7 +59,7 @@ const getCssVarByName = (name) => {
 const getPointStaticOption = (params) => {
   const { pointSymbol } = params;
   const ns = vue3Util.useNamespace("map-chart-user");
-  const textColor = getCssVarByName(ns.cssVarName("color-text-1"));
+  const textColor = getCssVarByName(ns.cssVarName("color-danger"));
   const fontSize = getCssVarByName(ns.cssVarName("font-size-header-4"));
   const options = {
     type: "scatter",

package/lib/control/app-menu/app-menu.cjs

@@ -261,24 +261,32 @@ const AppMenuControl = /* @__PURE__ */ vue.defineComponent({
     const calcCurMenu = () => {
       const allItems = c.getAllItems();
       return allItems.find((item) => {
-        if (item.itemType === "MENUITEM" && item.appFuncId) {
+        var _a;
+        if (item.itemType !== "MENUITEM" || !item.appFuncId)
+          return false;
+        if (ibiz.config.appMenu.echoMode === "VIEW") {
           const app = ibiz.hub.getApp(item.appId);
-          if (!app) {
+          if (!app)
             return false;
-          }
           const func = app.getAppFunc(item.appFuncId);
-          if (func && func.appViewId && route.params.view2) {
+          if (func && func.appViewId && (route == null ? void 0 : route.params.view2)) {
             return func.appViewId.split(".")[1] === route.params.view2;
           }
+        } else {
+          if (!route) {
+            return false;
+          }
+          const routePath = vue3Util.route2routePath(route);
+          if (routePath.pathNodes.length > 1)
+            return item.id === ((_a = routePath.pathNodes[1].params) == null ? void 0 : _a.srfmenuitem);
         }
         return false;
       });
     };
     const onClick = async (id, event) => {
       const activeMenu = calcCurMenu();
-      if (activeMenu && activeMenu.id === id) {
+      if (activeMenu && activeMenu.id === id)
         return;
-      }
       defaultActive.value = id;
       const menu = c.getAllItems().find((m) => m.id === id);
       if ((menu == null ? void 0 : menu.itemType) === "RAWITEM" || c.runMode === "DESIGN") {
@@ -287,7 +295,7 @@ const AppMenuControl = /* @__PURE__ */ vue.defineComponent({
       await c.onClickMenuItem(id, event);
     };
     if (c.runMode !== "DESIGN") {
-      vue.watch(() => route.params.view2, (newVal, oldVal) => {
+      vue.watch(() => route == null ? void 0 : route.params.view2, (newVal, oldVal) => {
         if (newVal !== oldVal && ibiz.config.appMenu.enableEcho) {
           const activeMenu = calcCurMenu();
           defaultActive.value = activeMenu ? activeMenu.id : "";
@@ -303,7 +311,7 @@ const AppMenuControl = /* @__PURE__ */ vue.defineComponent({
       const defaultActiveMenuItem = allItems.find((item) => {
         return item.openDefault && !item.hidden;
       });
-      if (defaultActiveMenuItem && !route.params.view2 && !route.fullPath.includes("404")) {
+      if (defaultActiveMenuItem && !(route == null ? void 0 : route.params.view2) && !(route == null ? void 0 : route.fullPath.includes("404"))) {
         defaultActive.value = defaultActiveMenuItem.id;
         onClick(defaultActive.value);
       } else if (ibiz.config.appMenu.enableEcho) {

package/lib/control/calendar/calendar.cjs

@@ -548,13 +548,17 @@ const CalendarControl = /* @__PURE__ */ vue.defineComponent({
           const {
             data
           } = value;
-          this.c.onRowClick(data[0]);
+          const item = data[0];
+          if (item)
+            this.c.onRowClick(item);
         },
         "onEventDblClick": (value) => {
           const {
             data
           } = value;
-          this.c.onDbRowClick(data[0]);
+          const item = data[0];
+          if (item)
+            this.c.onDbRowClick(item);
         }
       }, _isSlot(slots) ? slots : {
         default: () => [slots]

package/lib/control/calendar/components/calendar-daily/use-calendar-daily.cjs

@@ -127,7 +127,7 @@ const useCalendarDaily = (props, emit) => {
       const difference = new Date(endTime).getTime() - new Date(startTime).getTime();
       height = Math.floor(difference / (1e3 * 60));
     }
-    if (height < 3) {
+    if (height < 30) {
       height = "auto";
     }
     return height;

package/lib/control/calendar/components/calendar-week/use-calendar-week.cjs

@@ -153,7 +153,7 @@ const useCalendarWeek = (props, emit) => {
           const width = "".concat(percentage, "%");
           const styleLeft = "".concat(index * percentage, "%");
           Object.assign(tempEventContent, { width, styleLeft });
-          let height = 3;
+          let height = "auto";
           let styleTop = 60;
           let timeRange = "";
           if (util.isToday(event.beginTime, event.endTime)) {
@@ -301,8 +301,8 @@ const useCalendarWeek = (props, emit) => {
       const difference = new Date(endTime).getTime() - new Date(startTime).getTime();
       height = Math.floor(difference / (1e3 * 60));
     }
-    if (height < 3) {
-      height = 3;
+    if (height < 30) {
+      height = "auto";
     }
     return height;
   };

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

@@ -1,7 +1,7 @@
 'use strict';
 
 var vue = require('vue');
-var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.40_axios@1.6.8_lodash-es@4.17.21_qs@6.11.2_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
+var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.41-alpha.2_axios@1.6.8_lodash-es@4.17.21_qs@6.11.2_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
 
 "use strict";
 function useAppDRTab(c, controlRef, counterData) {

package/lib/control/kanban/kanban.cjs

@@ -237,7 +237,12 @@ const KanbanControl = /* @__PURE__ */ vue.defineComponent({
       const findIndex = c.state.selectedData.findIndex((data) => {
         return data.srfkey === item.srfkey;
       });
-      const cardClass = [ns.b("item"), ns.is("selected", findIndex !== -1), ns.is("disabled", disabled.value)];
+      const cardClass = [
+        ns.b("item"),
+        ns.is("selected", findIndex !== -1),
+        // 数据更新时不允许拖拽，鼠标变为禁用
+        ns.is("disabled", c.state.draggable && c.state.updating)
+      ];
       const cardStyle = {};
       if (c.model.cardWidth) {
         cardStyle.width = "".concat(c.model.cardWidth, "px");

package/lib/util/fullscreen/fullscreen-util.cjs

@@ -2,7 +2,7 @@
 
 var vue = require('vue');
 var ElementPlus = require('element-plus');
-var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.40_axios@1.6.8_lodash-es@4.17.21_qs@6.11.2_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
+var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.41-alpha.2_axios@1.6.8_lodash-es@4.17.21_qs@6.11.2_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
 var fullscreenToolbar = require('../../common/fullscreen-toolbar/fullscreen-toolbar.cjs');
 
 "use strict";

package/lib/web-app/components/router-shell/router-shell.cjs

@@ -17,6 +17,7 @@ const RouterShell = /* @__PURE__ */ vue.defineComponent({
     }
   },
   setup(props) {
+    var _a;
     const route = vueRouter.useRoute();
     const router = vueRouter.useRouter();
     const viewData = vue.ref({});
@@ -31,11 +32,13 @@ const RouterShell = /* @__PURE__ */ vue.defineComponent({
           context.destroy();
       }
     };
-    const routeDepth = props.modal.routeDepth;
+    const routeDepth = (_a = props.modal) == null ? void 0 : _a.routeDepth;
     vue.onUnmounted(() => {
       destroyContext();
     });
     const calcViewData = async () => {
+      if (!routeDepth)
+        return;
       try {
         const _viewData = await vue3Util.parseRouteViewData(route, routeDepth);
         const _context = core.IBizContext.create(_viewData.context);
@@ -62,7 +65,7 @@ const RouterShell = /* @__PURE__ */ vue.defineComponent({
     });
     const routeModal = new runtime.Modal({
       mode: runtime.ViewMode.ROUTE,
-      routeDepth: routeDepth + 1
+      routeDepth: (routeDepth || 0) + 1
     });
     vue.onActivated(() => {
       isActivated.value = true;
@@ -79,9 +82,8 @@ const RouterShell = /* @__PURE__ */ vue.defineComponent({
     };
   },
   render() {
-    if (!this.isLoaded) {
+    if (!this.isLoaded)
       return null;
-    }
     const {
       context,
       params,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.41-alpha.0",
+  "version": "0.7.41-alpha.2",
   "description": "web端组件库(vue3)",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -34,14 +34,14 @@
     "@ibiz-template-plugin/gantt": "0.1.8-alpha.198",
     "@ibiz-template-plugin/bi-report": "0.0.26",
     "@ibiz-template-plugin/data-view": "0.0.4",
-    "@ibiz-template/core": "0.7.40",
+    "@ibiz-template/core": "0.7.41-alpha.2",
     "@ibiz-template/devtool": "0.0.11",
-    "@ibiz-template/model-helper": "0.7.41-alpha.0",
-    "@ibiz-template/runtime": "0.7.41-alpha.0",
+    "@ibiz-template/model-helper": "0.7.41-alpha.2",
+    "@ibiz-template/runtime": "0.7.41-alpha.2",
     "@ibiz-template/theme": "0.7.39",
-    "@ibiz-template/vue3-util": "0.7.41-alpha.0",
+    "@ibiz-template/vue3-util": "0.7.41-alpha.2",
     "@ibiz-template/web-theme": "3.4.0",
-    "@ibiz/model-core": "^0.1.75",
+    "@ibiz/model-core": "^0.1.76",
     "@imengyu/vue3-context-menu": "^1.3.5",
     "@monaco-editor/loader": "^1.4.0",
     "@wangeditor/editor": "^5.1.23",
@@ -106,7 +106,7 @@
     "@ibiz-template/runtime": "^0.7.0",
     "@ibiz-template/theme": "^0.7.0",
     "@ibiz-template/vue3-util": "^0.7.0",
-    "@ibiz/model-core": "^0.1.75",
+    "@ibiz/model-core": "^0.1.76",
     "@imengyu/vue3-context-menu": "^1.3.3",
     "@monaco-editor/loader": "^1.3.3",
     "@wangeditor/editor": "^5.1.23",