@ibiz-template/vue3-components 0.6.2 → 0.6.4

package/lib/panel-component/panel-static-carousel/panel-static-carousel.cjs

@@ -0,0 +1,82 @@
+'use strict';
+
+var vue = require('vue');
+var runtime = require('@ibiz-template/runtime');
+var vue3Util = require('@ibiz-template/vue3-util');
+require('./panel-static-carousel.css');
+
+"use strict";
+const PanelStaticCarousel = /* @__PURE__ */ vue.defineComponent({
+  name: "IBizPanelStaticCarousel",
+  props: {
+    modelData: {
+      type: Object,
+      required: true
+    },
+    controller: {
+      type: runtime.PanelItemController,
+      required: true
+    }
+  },
+  setup(props) {
+    var _a;
+    const ns = vue3Util.useNamespace("panel-static-carousel");
+    const model = props.modelData;
+    const carouselData = vue.ref([]);
+    const isAuto = vue.ref(true);
+    const timeSpan = vue.ref(3e3);
+    const getSwipeConfig = (swipeData) => {
+      const autoPlay = swipeData.find((item) => Object.is(item.key, "autoplay"));
+      if (autoPlay) {
+        isAuto.value = !!Object.is(autoPlay.value, "1");
+      }
+      const span = swipeData.find((item) => Object.is(item.key, "timespan"));
+      if (span) {
+        timeSpan.value = Number(span.value) || 0;
+      }
+    };
+    if ((_a = model.rawItem) == null ? void 0 : _a.rawItemParams) {
+      let swipeData = [];
+      const imgData = model.rawItem.rawItemParams;
+      const configItem = imgData.findIndex((item) => Object.is(item.key, "autoplay"));
+      if (configItem > -1) {
+        swipeData = imgData.slice(0, -2);
+        getSwipeConfig(imgData.slice(-2));
+      } else {
+        swipeData = imgData;
+        getSwipeConfig(imgData);
+      }
+      carouselData.value = swipeData.map((item) => {
+        const {
+          id,
+          key,
+          sysImage
+        } = item;
+        return {
+          id,
+          name: key,
+          imgUrl: sysImage == null ? void 0 : sysImage.imagePath,
+          cssClass: sysImage == null ? void 0 : sysImage.cssClass,
+          linkPath: item.linkPath
+        };
+      });
+    }
+    return {
+      ns,
+      carouselData,
+      isAuto,
+      timeSpan
+    };
+  },
+  render() {
+    return vue.createVNode("div", {
+      "class": this.ns.b()
+    }, [vue.createVNode(vue.resolveComponent("iBizCarouselComponent"), {
+      "carouselData": this.carouselData,
+      "isAuto": this.isAuto,
+      "timeSpan": this.timeSpan
+    }, null)]);
+  }
+});
+
+exports.PanelStaticCarousel = PanelStaticCarousel;

package/lib/panel-component/panel-static-carousel/panel-static-carousel.provider.cjs

@@ -0,0 +1,23 @@
+'use strict';
+
+var runtime = require('@ibiz-template/runtime');
+
+"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 PanelStaticCarouselProvider {
+  constructor() {
+    __publicField(this, "component", "IBizPanelStaticCarousel");
+  }
+  async createController(panelItem, panel, parent) {
+    const c = new runtime.PanelItemController(panelItem, panel, parent);
+    await c.init();
+    return c;
+  }
+}
+
+exports.PanelStaticCarouselProvider = PanelStaticCarouselProvider;

package/lib/panel-component/user-message/internal-message/common/internal-message-default/internal-message-default.provider.cjs

@@ -3,6 +3,7 @@
 var core = require('@ibiz-template/core');
 var runtime = require('@ibiz-template/runtime');
 var vue = require('vue');
+var vueRouter = require('vue-router');
 var internalMessageDefault = require('./internal-message-default.cjs');
 
 "use strict";
@@ -15,6 +16,7 @@ var __publicField = (obj, key, value) => {
 class InternalMessageDefaultProvider {
   constructor() {
     __publicField(this, "component", internalMessageDefault.InternalMessageDefault);
+    __publicField(this, "router", vueRouter.useRouter());
   }
   render(props) {
     return vue.h(this.component, {
@@ -25,11 +27,7 @@ class InternalMessageDefaultProvider {
   async onClick(message, _event) {
     await ibiz.hub.notice.internalMessage.markRead(message);
     const redirectUrl = ibiz.env.isMob ? message.mobile_url : message.url;
-    if (redirectUrl) {
-      this.openRedirectView(message, redirectUrl);
-      return true;
-    }
-    return false;
+    return this.openViewByUrl(redirectUrl);
   }
   /**
    * 解析url并打开对应视图，打开视图前会先标记已读
@@ -41,13 +39,32 @@ class InternalMessageDefaultProvider {
    */
   async openRedirectView(msg, redirectUrl) {
     await ibiz.hub.notice.internalMessage.markRead(msg);
-    const { viewId, context, params } = runtime.parseViewProtocol(redirectUrl);
-    ibiz.commands.execute(
-      runtime.OpenAppViewCommand.TAG,
-      viewId,
-      core.IBizContext.create(context),
-      params
-    );
+    this.openViewByUrl(redirectUrl);
+  }
+  /**
+   * 解析url并打开对应视图
+   * @param {string} redirectUrl
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2024-03-04 11:16:40
+   */
+  openViewByUrl(redirectUrl) {
+    if (redirectUrl) {
+      if (redirectUrl.startsWith("view://")) {
+        const { viewId, context, params } = runtime.parseViewProtocol(redirectUrl);
+        ibiz.commands.execute(
+          runtime.OpenAppViewCommand.TAG,
+          viewId,
+          core.IBizContext.create(context),
+          params
+        );
+      } else if (redirectUrl.startsWith("route://")) {
+        const routeUrl = "/".concat(redirectUrl.split("route://")[1]);
+        this.router.push(routeUrl);
+      }
+      return true;
+    }
+    return false;
   }
 }
 

package/lib/panel-component/user-message/user-message.cjs

@@ -6,6 +6,8 @@ var runtime = require('@ibiz-template/runtime');
 require('./user-message.css');
 var asyncActionTab = require('./async-action/async-action-tab/async-action-tab.cjs');
 require('./internal-message/index.cjs');
+require('./internal-message/common/index.cjs');
+var internalMessageDefault_provider = require('./internal-message/common/internal-message-default/internal-message-default.provider.cjs');
 var internalMessageTab = require('./internal-message/internal-message-tab/internal-message-tab.cjs');
 
 "use strict";
@@ -27,6 +29,8 @@ const UserMessage = /* @__PURE__ */ vue.defineComponent({
     const noticeController = ibiz.hub.notice;
     const showPopover = vue.ref(false);
     let hiddenTime = 0;
+    noticeController.internalMessage.ns = ns;
+    noticeController.internalMessage.provider = new internalMessageDefault_provider.InternalMessageDefaultProvider();
     const currentTab = vue.ref("notification");
     const sysImage = props.modelData.sysImage || {
       imagePath: "svg/message.svg"
@@ -40,9 +44,6 @@ const UserMessage = /* @__PURE__ */ vue.defineComponent({
       noticeNum.value = total;
     };
     noticeController.evt.on("totalChange", onNumChange);
-    vue.onUnmounted(() => {
-      noticeController.evt.off("totalChange", onNumChange);
-    });
     const onBatchReadClick = () => {
       noticeController.internalMessage.batchMarkRead();
     };
@@ -67,6 +68,7 @@ const UserMessage = /* @__PURE__ */ vue.defineComponent({
       document.addEventListener("visibilitychange", handleVisibleChange);
     });
     vue.onUnmounted(() => {
+      noticeController.evt.off("totalChange", onNumChange);
       document.removeEventListener("visibilitychange", handleVisibleChange);
     });
     return {

package/lib/panel-component/user-message/user-message.css

@@ -1 +1 @@
-.ibiz-user-message{width:100%;height:100%;display:flex;align-items:center;justify-content:center}.ibiz-user-message__image{width:28px;height:28px;cursor:pointer}.ibiz-user-message__badge .el-badge__content{top:4px;right:calc(7px + var(--el-badge-size)/ 2);border-width:0}.ibiz-user-message-popover{width:500px!important;height:500px!important}.ibiz-user-message-popover.el-popover{padding-top:2px;padding-bottom:0}.ibiz-user-message-popover-content-box{position:relative;height:100%}.ibiz-user-message-popover-icons{position:absolute;top:10px;right:0}.ibiz-user-message-popover-icons .ibiz-user-message-popover-icons-read{cursor:pointer}.ibiz-user-message-popover-icons .ibiz-user-message-popover-icons-read:hover{color:var(--ibiz-color-primary)}.ibiz-user-message-popover-content{height:100%}.ibiz-user-message-popover-content>.el-tabs__content{height:calc(100% - 55px)}.ibiz-user-message-popover-content>.el-tabs__content>.el-tab-pane{height:100%;overflow:auto}
+.ibiz-user-message{width:100%;height:100%;display:flex;align-items:center;justify-content:center}.ibiz-user-message__image{width:28px;height:28px;cursor:pointer}.ibiz-user-message__badge .el-badge__content{top:4px;right:calc(7px + var(--el-badge-size)/ 2);border-width:0}.ibiz-user-message-popover{width:500px!important;height:500px!important}.ibiz-user-message-popover.el-popover{padding-top:2px;padding-bottom:0}.ibiz-user-message-popover-content-box{position:relative;height:100%}.ibiz-user-message-popover-icons{position:absolute;top:10px;right:0}.ibiz-user-message-popover-icons .ibiz-user-message-popover-icons-read{cursor:pointer}.ibiz-user-message-popover-icons .ibiz-user-message-popover-icons-read:hover{color:var(--ibiz-color-primary)}.ibiz-user-message-popover-content{height:100%}.ibiz-user-message-popover-content>.el-tabs__content{height:calc(100% - 55px)}.ibiz-user-message-popover-content>.el-tabs__content>.el-tab-pane{height:100%;overflow:auto}.ibiz-user-message-notice{padding:var(--ibiz-spacing-tight)}.ibiz-user-message-notice .el-notification__group{margin:0}

package/lib/util/app-modal/app-modal-component.cjs

@@ -49,7 +49,7 @@ const AppModalComponent = /* @__PURE__ */ vue.defineComponent({
       Object.assign(options.value, props.opts);
     }
     const modal = new runtime.Modal({
-      mode: runtime.ViewMode.MODAL,
+      mode: options.value.isRouteModal ? runtime.ViewMode.ROUTE_MODAL : runtime.ViewMode.MODAL,
       viewUsage: 2,
       dismiss: (data) => {
         zIndex.decrement();

package/lib/util/notification-util/notification-util.cjs

@@ -57,7 +57,9 @@ class NotificationUtil {
       dangerouslyUseHTMLString: !!params.isHtmlDesc,
       type: noticeType,
       position: params.position || "top-right",
-      duration
+      duration,
+      customClass: params.class,
+      onClick: params.onClick
     });
   }
   /**

package/lib/view-engine/edit-view.engine.cjs

@@ -60,13 +60,17 @@ class EditViewEngine extends runtime.ViewEngineBase {
     }
     this.view.slotProps.toolbar.manualCalcButtonState = true;
     modal.hooks.shouldDismiss.tapPromise(async (context) => {
-      if (this.form.state.modified && this.view.model.enableDirtyChecking === true) {
+      const uiDomain = ibiz.uiDomainManager.get(this.view.context.srfsessionid);
+      const isChange = (this.form.state.modified || uiDomain.dataModification) && this.view.model.enableDirtyChecking === true;
+      if (isChange && context.allowClose == null) {
         const isAllow = await ibiz.confirm.error({
           title: "\u5173\u95ED\u63D0\u9192",
           desc: "\u8868\u5355\u6570\u636E\u5DF2\u7ECF\u4FEE\u6539\uFF0C\u786E\u5B9A\u8981\u5173\u95ED\uFF1F"
         });
         if (!isAllow) {
           context.allowClose = false;
+        } else {
+          context.allowClose = true;
         }
       }
     });

package/lib/view-engine/opt-view.engine.cjs

@@ -32,13 +32,17 @@ class OptViewEngine extends runtime.ViewEngineBase {
     }
     this.view.slotProps.toolbar.manualCalcButtonState = true;
     modal.hooks.shouldDismiss.tapPromise(async (context) => {
-      if (this.form.state.modified && this.view.model.enableDirtyChecking === true) {
+      const uiDomain = ibiz.uiDomainManager.get(this.view.context.srfsessionid);
+      const isChange = (this.form.state.modified || uiDomain.dataModification) && this.view.model.enableDirtyChecking === true;
+      if (isChange && context.allowClose == null) {
         const isAllow = await ibiz.confirm.error({
           title: "\u5173\u95ED\u63D0\u9192",
           desc: "\u8868\u5355\u6570\u636E\u5DF2\u7ECF\u4FEE\u6539\uFF0C\u786E\u5B9A\u8981\u5173\u95ED\uFF1F"
         });
         if (!isAllow) {
           context.allowClose = false;
+        } else {
+          context.allowClose = true;
         }
       }
     });

package/lib/view-engine/tree-grid-view.engine.cjs

@@ -16,6 +16,14 @@ class TreeGridViewEngine extends gridView_engine.GridViewEngine {
   get xdataControlName() {
     return "treegrid";
   }
+  async onCreated() {
+    await super.onCreated();
+    if (!this.view.slotProps.treegrid) {
+      this.view.slotProps.treegrid = this.view.slotProps.grid;
+    } else {
+      Object.assign(this.view.slotProps.treegrid, this.view.slotProps.grid);
+    }
+  }
 }
 
 exports.TreeGridViewEngine = TreeGridViewEngine;

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

@@ -94,7 +94,8 @@ const ModalRouterShell = /* @__PURE__ */ vue.defineComponent({
       const opts = {
         width: (appView == null ? void 0 : appView.width) || "80%",
         height: (appView == null ? void 0 : appView.height) || "80%",
-        footerHide: true
+        footerHide: true,
+        isRouteModal: true
       };
       overlay = ibiz.overlay.createModal(component, void 0, opts);
       overlay.present();

package/lib/web-app/main.cjs

@@ -10,6 +10,7 @@ require('./util/index.cjs');
 var index = require('./router/index.cjs');
 require('../util/index.cjs');
 require('./guard/index.cjs');
+var unauthorizedHandler = require('./util/unauthorized-handler/unauthorized-handler.cjs');
 var dynaAuthGuard = require('./guard/auth-guard/dyna-auth-guard.cjs');
 var openViewUtil = require('../util/open-view-util/open-view-util.cjs');
 var messageUtil = require('../util/message-util/message-util.cjs');
@@ -19,7 +20,6 @@ var notificationUtil = require('../util/notification-util/notification-util.cjs'
 var loadingUtil = require('../util/loading-util/loading-util.cjs');
 var noticeUtil = require('../util/notice-util/notice-util.cjs');
 var overlayController = require('../util/overlay-controller/overlay-controller.cjs');
-var unauthorizedHandler = require('./util/unauthorized-handler/unauthorized-handler.cjs');
 
 "use strict";
 async function runApp(plugins, opts) {
@@ -33,6 +33,7 @@ async function runApp(plugins, opts) {
   core.install();
   runtime.install();
   ibiz.plugin = new vue3Util.PluginFactory();
+  ibiz.util.error.register(new unauthorizedHandler.UnauthorizedHandler());
   const app = createVueApp.createVueApp(App.default);
   vue3Util.OverlayContainer.createVueApp = createVueApp.createVueApp;
   window.onerror = function(_event, _source, _lineno, _colno, error) {
@@ -66,7 +67,6 @@ async function runApp(plugins, opts) {
   ibiz.util.text.format = (value, code) => {
     return app.config.globalProperties.$textFormat(value, code);
   };
-  ibiz.util.error.register(new unauthorizedHandler.UnauthorizedHandler());
   await ibiz.i18n.init();
   app.mount("#app");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "使用 rollup 编译 vue 组件或者 jsx",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -30,12 +30,12 @@
     "@floating-ui/dom": "^1.5.3",
     "@ibiz-template-plugin/ai-chat": "^0.0.1",
     "@ibiz-template-plugin/gantt": "0.1.3-alpha.41",
-    "@ibiz-template/core": "0.6.2",
-    "@ibiz-template/devtool": "0.0.1-dev.4",
-    "@ibiz-template/model-helper": "0.6.2",
-    "@ibiz-template/runtime": "0.6.2",
+    "@ibiz-template/core": "0.6.3",
+    "@ibiz-template/devtool": "0.0.1-dev.6",
+    "@ibiz-template/model-helper": "0.6.4",
+    "@ibiz-template/runtime": "0.6.4",
     "@ibiz-template/theme": "^0.6.0",
-    "@ibiz-template/vue3-util": "0.6.2",
+    "@ibiz-template/vue3-util": "0.6.4",
     "@ibiz-template/web-theme": "^1.1.11",
     "@ibiz/model-core": "^0.1.14",
     "@imengyu/vue3-context-menu": "^1.3.5",

package/dist/chart-fWcrZRts.js

@@ -1 +0,0 @@
-System.register(["vue","@ibiz-template/vue3-util","echarts","@ibiz-template/runtime"],(function(e){"use strict";var t,r,o,n,c,a,i,l,u;return{setters:[function(e){t=e.defineComponent,r=e.ref,o=e.onMounted,n=e.createVNode,c=e.resolveComponent},function(e){a=e.useControlController,i=e.useNamespace},function(e){l=e.init},function(e){u=e.ChartController}],execute:function(){e("default",t({name:"IBizChartControl",props:{modelData:{type:Object,required:!0},context:{type:Object,required:!0},params:{type:Object,default:()=>({})},provider:{type:Object},mdctrlActiveMode:{type:Number,default:void 0},loadDefault:{type:Boolean,default:!0}},setup(){const e=a(((...e)=>new u(...e))),t=i("control-".concat(e.model.controlType.toLowerCase())),n=r();return o((()=>{const t=l(n.value);e.initChart(t)})),{c:e,ns:t,chartRef:n}},render(){return n(c("iBizControlBase"),{controller:this.c},{default:()=>[n("div",{ref:"chartRef",class:this.ns.e("chart")},[ibiz.i18n.t("control.chart.chartPlaceholder")])]})}}))}}}));