@ibiz-template/vue3-components 0.6.3 → 0.6.4

package/lib/editor/date-picker/ibiz-date-picker/ibiz-date-picker.cjs

@@ -100,6 +100,11 @@ const IBizDatePicker = /* @__PURE__ */ vue.defineComponent({
     }, {
       immediate: true
     });
+    const handleKeyUp = (e) => {
+      if (e && e.code === "Enter") {
+        emit("enter", e);
+      }
+    };
     return {
       ns,
       c,
@@ -114,7 +119,8 @@ const IBizDatePicker = /* @__PURE__ */ vue.defineComponent({
       onBlur,
       isEditable,
       setEditable,
-      showFormDefaultContent
+      showFormDefaultContent,
+      handleKeyUp
     };
   },
   render() {
@@ -150,7 +156,8 @@ const IBizDatePicker = /* @__PURE__ */ vue.defineComponent({
       "class": this.ns.b("form-default-content")
     }, [this.formatValue ? this.formatValue : "-"]);
     return vue.createVNode("div", {
-      "class": [this.ns.b(), this.disabled ? this.ns.m("disabled") : "", this.readonly ? this.ns.m("readonly") : "", this.ns.e(this.editorModel.editorType), this.ns.is("editable", this.isEditable), this.ns.is("show-default", this.showFormDefaultContent)]
+      "class": [this.ns.b(), this.disabled ? this.ns.m("disabled") : "", this.readonly ? this.ns.m("readonly") : "", this.ns.e(this.editorModel.editorType), this.ns.is("editable", this.isEditable), this.ns.is("show-default", this.showFormDefaultContent)],
+      "onKeyup": this.handleKeyUp
     }, [this.showFormDefaultContent && formDefaultContent, this.readonly ? readonlyContent : editContent]);
   }
 });

package/lib/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.cjs

@@ -117,6 +117,11 @@ const IBizDateRangePicker = /* @__PURE__ */ vue.defineComponent({
       }
       return null;
     });
+    const handleKeyUp = (e) => {
+      if (e && e.code === "Enter") {
+        emit("enter", e);
+      }
+    };
     return {
       ns,
       c,
@@ -135,7 +140,8 @@ const IBizDateRangePicker = /* @__PURE__ */ vue.defineComponent({
       valueText,
       isEditable,
       setEditable,
-      showFormDefaultContent
+      showFormDefaultContent,
+      handleKeyUp
     };
   },
   render() {
@@ -175,7 +181,8 @@ const IBizDateRangePicker = /* @__PURE__ */ vue.defineComponent({
       "unlink-panels": this.unlinkPanels
     }, null) : "-"]);
     return vue.createVNode("div", {
-      "class": [this.ns.b(), this.disabled ? this.ns.m("disabled") : "", this.readonly ? this.ns.m("readonly") : "", this.ns.is("editable", this.isEditable), this.ns.is("show-default", this.showFormDefaultContent)]
+      "class": [this.ns.b(), this.disabled ? this.ns.m("disabled") : "", this.readonly ? this.ns.m("readonly") : "", this.ns.is("editable", this.isEditable), this.ns.is("show-default", this.showFormDefaultContent)],
+      "onKeyup": this.handleKeyUp
     }, [this.showFormDefaultContent && formDefaultContent, this.readonly ? readonlyContent : editContent]);
   }
 });

package/lib/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.cjs

@@ -243,6 +243,7 @@ const IBizDropdown = /* @__PURE__ */ vue.defineComponent({
       "loading": this.isLoading,
       "onBlur": this.onBlur,
       "onFocus": this.onFocus,
+      "onKeyup": this.handleKeyUp,
       "onVisibleChange": this.onVisibleChange,
       "props": {
         class: this.customNodeClass

package/lib/editor/text-box/ibiz-input-ip/ibiz-input-ip.cjs

@@ -78,6 +78,11 @@ const IBizInputIP = /* @__PURE__ */ vue.defineComponent({
         }
       }, 0);
     };
+    const handleKeyUp = (e) => {
+      if (e && e.code === "Enter") {
+        emit("enter", e);
+      }
+    };
     return {
       ns,
       c,
@@ -88,7 +93,8 @@ const IBizInputIP = /* @__PURE__ */ vue.defineComponent({
       secIp,
       thirdIp,
       forIp,
-      showFormDefaultContent
+      showFormDefaultContent,
+      handleKeyUp
     };
   },
   render() {
@@ -101,6 +107,7 @@ const IBizInputIP = /* @__PURE__ */ vue.defineComponent({
       "readonly": this.readonly,
       "onFocus": this.getFocus,
       "onBlur": this.blur,
+      "onKeyup": this.handleKeyUp,
       "maxlength": 3,
       "modelValue": this.firstIp,
       "onUpdate:modelValue": ($event) => this.firstIp = $event
@@ -111,6 +118,7 @@ const IBizInputIP = /* @__PURE__ */ vue.defineComponent({
       "readonly": this.readonly,
       "onFocus": this.getFocus,
       "onBlur": this.blur,
+      "onKeyup": this.handleKeyUp,
       "maxlength": 3,
       "modelValue": this.secIp,
       "onUpdate:modelValue": ($event) => this.secIp = $event
@@ -121,6 +129,7 @@ const IBizInputIP = /* @__PURE__ */ vue.defineComponent({
       "readonly": this.readonly,
       "onFocus": this.getFocus,
       "onBlur": this.blur,
+      "onKeyup": this.handleKeyUp,
       "maxlength": 3,
       "modelValue": this.thirdIp,
       "onUpdate:modelValue": ($event) => this.thirdIp = $event
@@ -131,6 +140,7 @@ const IBizInputIP = /* @__PURE__ */ vue.defineComponent({
       "readonly": this.readonly,
       "onFocus": this.getFocus,
       "onBlur": this.blur,
+      "onKeyup": this.handleKeyUp,
       "maxlength": 3,
       "modelValue": this.forIp,
       "onUpdate:modelValue": ($event) => this.forIp = $event

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

@@ -27,16 +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) {
-      if (redirectUrl.startsWith("view://")) {
-        this.openRedirectView(message, redirectUrl);
-      } else if (redirectUrl.startsWith("route://")) {
-        const routeUrl = "/".concat(redirectUrl.split("route://")[1]);
-        this.router.push(routeUrl);
-      }
-      return true;
-    }
-    return false;
+    return this.openViewByUrl(redirectUrl);
   }
   /**
    * 解析url并打开对应视图，打开视图前会先标记已读
@@ -48,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/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/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.3",
+  "version": "0.6.4",
   "description": "使用 rollup 编译 vue 组件或者 jsx",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -32,10 +32,10 @@
     "@ibiz-template-plugin/gantt": "0.1.3-alpha.41",
     "@ibiz-template/core": "0.6.3",
     "@ibiz-template/devtool": "0.0.1-dev.6",
-    "@ibiz-template/model-helper": "0.6.3",
-    "@ibiz-template/runtime": "0.6.3",
+    "@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.3",
+    "@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",