@ibiz-template/vue3-components 0.6.0-alpha.2 → 0.6.0-alpha.4

package/lib/control/toolbar/toolbar.cjs

@@ -40,6 +40,10 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
     },
     provider: {
       type: Object
+    },
+    manualCalcButtonState: {
+      type: Boolean,
+      default: false
     }
   },
   setup() {
@@ -64,6 +68,55 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
         })]);
       });
     };
+    const renderSubmenu = (item) => {
+      return vue.createVNode(vue.resolveComponent("el-sub-menu"), {
+        "class": ns.b("submenu"),
+        "index": item.id,
+        "title": item.tooltip,
+        "popper-class": ns.b("submenu-popper")
+      }, {
+        default: () => {
+          var _a;
+          return (_a = item.detoolbarItems) == null ? void 0 : _a.map((item2) => {
+            const actionId = item2.uiactionId;
+            if (item2.itemType === "SEPERATOR" || item2.itemType === "RAWITEM") {
+              return;
+            }
+            if (item2.itemType === "DEUIACTION" && c.state.buttonsState[item2.id].visible) {
+              let _slot2;
+              if (actionId === "exportexcel") {
+                return vue.createVNode(exportExcel.IBizExportExcel, {
+                  "class": [ns.e("menu-exportexcel")],
+                  "mode": "menu",
+                  "item": item2,
+                  "btnContent": btnContent,
+                  "size": btnSize.value,
+                  "controller": c,
+                  "onExportExcel": (e, data) => {
+                    handleClick(item2, e, data);
+                  }
+                }, null);
+              }
+              return vue.createVNode(vue.resolveComponent("el-menu-item"), {
+                "index": "menuitem".concat(item2.id),
+                "disabled": c.state.buttonsState[item2.id].disabled,
+                "title": item2.tooltip,
+                "onClick": (e) => handleClick(item2, e)
+              }, _isSlot(_slot2 = btnContent(item2)) ? _slot2 : {
+                default: () => [_slot2]
+              });
+            }
+            if (item2.itemType === "ITEMS") {
+              return renderSubmenu(item2);
+            }
+            return null;
+          });
+        },
+        title: () => {
+          return vue.createVNode("span", null, [btnContent(item)]);
+        }
+      });
+    };
     const renderToolbarItem = (item) => {
       const itemId = item.id;
       if (item.itemType === "SEPERATOR") {
@@ -79,7 +132,7 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
         }, [btnContent(item)]);
       }
       if (item.itemType === "DEUIACTION" && c.state.buttonsState[itemId].visible) {
-        let _slot2;
+        let _slot3;
         const actionId = item.uiactionId;
         if (actionId === "exportexcel") {
           return vue.createVNode(exportExcel.IBizExportExcel, {
@@ -102,46 +155,20 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
           "loading": c.state.buttonsState[itemId].loading,
           "disabled": c.state.buttonsState[itemId].disabled,
           "onClick": (e) => handleClick(item, e)
-        }, _isSlot(_slot2 = btnContent(item)) ? _slot2 : {
-          default: () => [_slot2]
+        }, _isSlot(_slot3 = btnContent(item)) ? _slot3 : {
+          default: () => [_slot3]
         })]);
       }
       if (item.itemType === "ITEMS") {
-        return vue.createVNode("div", {
-          "key": itemId,
-          "class": [ns.e("item"), ns.e("item-items")]
-        }, [vue.createVNode(vue.resolveComponent("el-dropdown"), {
-          "trigger": "click",
-          "placement": "bottom-start",
-          "popper-class": ns.b("dropdown")
-        }, {
-          default: () => {
-            let _slot3;
-            return vue.createVNode(vue.resolveComponent("el-button"), {
-              "title": item.tooltip,
-              "size": btnSize.value
-            }, _isSlot(_slot3 = btnContent(item)) ? _slot3 : {
-              default: () => [_slot3]
-            });
-          },
-          dropdown: () => {
-            return vue.createVNode(vue.resolveComponent("el-dropdown-menu"), null, {
-              default: () => {
-                var _a;
-                return [(_a = item.detoolbarItems) == null ? void 0 : _a.map((item2) => {
-                  let _slot4;
-                  return vue.createVNode(vue.resolveComponent("el-dropdown-item"), {
-                    "key": item2.id,
-                    "disabled": c.state.buttonsState[item2.id].disabled,
-                    "onClick": (e) => handleClick(item2, e)
-                  }, _isSlot(_slot4 = btnContent(item2)) ? _slot4 : {
-                    default: () => [_slot4]
-                  });
-                })];
-              }
-            });
-          }
-        })]);
+        let _slot4;
+        return vue.createVNode(vue.resolveComponent("el-menu"), {
+          "mode": "horizontal",
+          "class": [ns.e("menu")],
+          "ellipsis": false,
+          "menu-trigger": "hover"
+        }, _isSlot(_slot4 = renderSubmenu(item)) ? _slot4 : {
+          default: () => [_slot4]
+        });
       }
       return null;
     };

package/lib/control/toolbar/toolbar.css

@@ -1 +1 @@
-@charset "UTF-8";.ibiz-control-toolbar{--ibiz-control-toolbar-item-margin:0 var(--ibiz-spacing-extra-tight);--ibiz-control-toolbar-item-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-control-toolbar-icon-margin:0 var(--ibiz-spacing-extra-tight) 0 0;--ibiz-control-toolbar-icon-max-width:var(--ibiz-width-icon-medium);--ibiz-control-toolbar-icon-max-height:var(--ibiz-width-icon-medium);--ibiz-control-toolbar-separator-color:var(--ibiz-color-fill-2);display:flex}.ibiz-control-toolbar__item{display:flex;align-items:center;margin:var(--ibiz-control-toolbar-item-margin);overflow:hidden}.ibiz-control-toolbar__item .el-button{display:flex;align-items:center;justify-content:center;padding:var(--ibiz-control-toolbar-item-padding)}.ibiz-control-toolbar__item .el-button>span{display:flex;align-items:center;justify-content:center;font-size:var(--ibiz-font-size-regular);pointer-events:none}.ibiz-control-toolbar__item .el-button .ibiz-icon{display:flex;align-items:center;justify-content:center;width:var(--ibiz-control-toolbar-icon-max-width);height:var(--ibiz-control-toolbar-icon-max-height);margin:var(--ibiz-control-toolbar-icon-margin);font-size:var(--ibiz-font-size-regular)}.ibiz-control-toolbar__item.is-loading .el-button .ibiz-icon{display:none}.ibiz-control-toolbar__item-separator{color:var(--ibiz-control-toolbar-separator-color)}.ibiz-control-toolbar__item-separator+.ibiz-control-toolbar__item-separator,.ibiz-control-toolbar__item-separator:first-child{display:none}.ibiz-control-toolbar-dropdown{--ibiz-control-toolbar-item-margin:0 var(--ibiz-spacing-extra-tight);--ibiz-control-toolbar-item-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-control-toolbar-icon-margin:0 var(--ibiz-spacing-extra-tight) 0 0;--ibiz-control-toolbar-icon-max-width:var(--ibiz-width-icon-medium);--ibiz-control-toolbar-icon-max-height:var(--ibiz-width-icon-medium);--ibiz-control-toolbar-separator-color:var(--ibiz-color-fill-2)}.ibiz-control-toolbar-dropdown .ibiz-icon{display:flex;align-items:center;justify-content:center;width:var(--ibiz-control-toolbar-icon-max-width);height:var(--ibiz-control-toolbar-icon-max-height);margin:var(--ibiz-control-toolbar-icon-margin);font-size:var(--ibiz-font-size-regular)}
+@charset "UTF-8";.ibiz-control-toolbar{--ibiz-control-toolbar-item-margin:0 var(--ibiz-spacing-extra-tight);--ibiz-control-toolbar-item-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-control-toolbar-icon-margin:0 var(--ibiz-spacing-extra-tight) 0 0;--ibiz-control-toolbar-icon-max-width:var(--ibiz-width-icon-medium);--ibiz-control-toolbar-icon-max-height:var(--ibiz-width-icon-medium);--ibiz-control-toolbar-separator-color:var(--ibiz-color-fill-2);--ibiz-control-toolbar-menu-height:32px;display:flex}.ibiz-control-toolbar__item{display:flex;align-items:center;margin:var(--ibiz-control-toolbar-item-margin);overflow:hidden}.ibiz-control-toolbar__item .el-button{display:flex;align-items:center;justify-content:center;padding:var(--ibiz-control-toolbar-item-padding)}.ibiz-control-toolbar__item .el-button>span{display:flex;align-items:center;justify-content:center;font-size:var(--ibiz-font-size-regular);pointer-events:none}.ibiz-control-toolbar__item .el-button .ibiz-icon{display:flex;align-items:center;justify-content:center;width:var(--ibiz-control-toolbar-icon-max-width);height:var(--ibiz-control-toolbar-icon-max-height);margin:var(--ibiz-control-toolbar-icon-margin);font-size:var(--ibiz-font-size-regular)}.ibiz-control-toolbar__item.is-loading .el-button .ibiz-icon{display:none}.ibiz-control-toolbar__item-separator{color:var(--ibiz-control-toolbar-separator-color)}.ibiz-control-toolbar__item-separator+.ibiz-control-toolbar__item-separator,.ibiz-control-toolbar__item-separator:first-child{display:none}.ibiz-control-toolbar__menu.el-menu{height:var(--ibiz-control-toolbar-menu-height);margin:var(--ibiz-control-toolbar-item-margin);border:none}.ibiz-control-toolbar__menu .ibiz-control-toolbar-submenu .el-sub-menu__title{display:flex;align-items:center;justify-content:center;padding:var(--ibiz-control-toolbar-item-padding);font-size:var(--ibiz-font-size-regular);color:var(--ibiz-color-primary-text);background-color:var(--ibiz-color-primary);border-radius:var(--ibiz-border-radius-small)}.ibiz-control-toolbar__menu .ibiz-control-toolbar-submenu .el-sub-menu__title .el-sub-menu__icon-arrow{display:none}.ibiz-control-toolbar__menu .ibiz-control-toolbar-submenu .el-sub-menu__title>span{display:inline-block;line-height:1}.ibiz-control-toolbar__menu .ibiz-control-toolbar-submenu .el-sub-menu__title:hover{color:var(--ibiz-color-primary-hover-text);background-color:var(--ibiz-color-primary-hover)}.ibiz-control-toolbar__menu .ibiz-control-toolbar-submenu.is-active .el-sub-menu__title{color:var(--ibiz-color-primary-text)}.ibiz-control-toolbar-submenu-popper{--ibiz-control-toolbar-item-margin:0 var(--ibiz-spacing-extra-tight);--ibiz-control-toolbar-item-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-control-toolbar-icon-margin:0 var(--ibiz-spacing-extra-tight) 0 0;--ibiz-control-toolbar-icon-max-width:var(--ibiz-width-icon-medium);--ibiz-control-toolbar-icon-max-height:var(--ibiz-width-icon-medium);--ibiz-control-toolbar-separator-color:var(--ibiz-color-fill-2);--ibiz-control-toolbar-menu-height:32px;color:var(--ibiz-color-primary-text);background-color:var(--ibiz-color-primary)}.ibiz-control-toolbar-submenu-popper .el-menu .ibiz-control-toolbar-submenu .el-sub-menu__title{padding:0 10px;font-size:var(--ibiz-font-size-regular);color:var(--ibiz-color-primary-text);background-color:var(--ibiz-color-primary)}.ibiz-control-toolbar-submenu-popper .el-menu .ibiz-control-toolbar-submenu .el-sub-menu__title:hover{color:var(--ibiz-color-primary-hover-text);background-color:var(--ibiz-color-primary-hover)}.ibiz-control-toolbar-submenu-popper .el-menu .ibiz-control-toolbar-submenu.is-active .el-sub-menu__title{color:var(--ibiz-color-primary-text)}.ibiz-control-toolbar-submenu-popper .el-menu .el-menu-item{color:var(--ibiz-color-primary-text)}.ibiz-control-toolbar-submenu-popper .el-menu .el-menu-item .ibiz-icon{margin:var(--ibiz-control-toolbar-icon-margin)}.ibiz-control-toolbar-submenu-popper .el-menu .el-menu-item.is-active{color:var(--ibiz-color-primary-text)}.ibiz-control-toolbar-submenu-popper .el-menu .el-menu-item:hover{color:var(--ibiz-color-primary-hover-text);background-color:var(--ibiz-color-primary-hover)}

package/lib/control/tree/tree.cjs

@@ -122,7 +122,8 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
         _id: node._id,
         _uuid: node._uuid,
         _leaf: node._leaf,
-        _text: node._text
+        _text: node._text,
+        _disableSelect: node._disableSelect
       }));
     };
     c.evt.on("onAfterRefreshParent", (event) => {
@@ -459,7 +460,8 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
           "props": {
             label: "_text",
             children: "_children",
-            isLeaf: "_leaf"
+            isLeaf: "_leaf",
+            disabled: "_disableSelect"
           },
           "lazy": true,
           "load": this.loadData,
@@ -527,7 +529,7 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
               "onDblclick": (evt) => this.onNodeDbClick(nodeData, evt),
               "onClick": (evt) => this.onNodeClick(nodeData, evt),
               "onContextmenu": (evt) => this.onNodeContextmenu(nodeData, evt),
-              "class": [this.ns.b("node"), (_b = nodeModel.sysCss) == null ? void 0 : _b.cssName]
+              "class": [this.ns.b("node"), nodeData._disableSelect ? this.ns.bm("node", "disabled") : "", (_b = nodeModel.sysCss) == null ? void 0 : _b.cssName]
             }, [content, this.renderCounter(nodeModel), this.renderContextMenu(nodeModel, nodeData)]);
           }
         });

package/lib/control/tree/tree.css

@@ -1 +1 @@
-.ibiz-control-treeview{--ibiz-control-treeview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-control-treeview-icon-height:var(--ibiz-spacing-base);--ibiz-control-treeview-icon-width:var(--ibiz-spacing-base);height:100%;padding:var(--ibiz-control-treeview-padding)}.ibiz-control-treeview-node{display:flex;flex-grow:1;flex-shrink:1;align-items:center;min-width:1px;height:100%}.ibiz-control-treeview-node__icon{width:var(--ibiz-control-treeview-icon-width);height:var(--ibiz-control-treeview-icon-height);margin-right:var(--ibiz-spacing-tight)}.ibiz-control-treeview-node__label{flex-grow:1;flex-shrink:1;min-width:1px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-treeview-node:hover .ibiz-control-treeview-context-menu-trigger{display:inline-block}.ibiz-control-treeview-context-menu-trigger{display:none;flex-shrink:0;width:30px;text-align:center;cursor:pointer}.ibiz-control-treeview-context-menu-trigger__caption-icon{vertical-align:middle}.ibiz-control-treeview-context-menu.mx-context-menu{padding:var(--ibiz-spacing-extra-tight) 0}.ibiz-control-treeview-context-menu.mx-context-menu .mx-context-menu-item{padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base)}.ibiz-control-treeview-quick-search{margin-bottom:var(--ibiz-spacing-tight)}
+.ibiz-control-treeview{--ibiz-control-treeview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-control-treeview-icon-height:var(--ibiz-spacing-base);--ibiz-control-treeview-icon-width:var(--ibiz-spacing-base);height:100%;padding:var(--ibiz-control-treeview-padding)}.ibiz-control-treeview-node{display:flex;flex-grow:1;flex-shrink:1;align-items:center;min-width:1px;height:100%}.ibiz-control-treeview-node__icon{width:var(--ibiz-control-treeview-icon-width);height:var(--ibiz-control-treeview-icon-height);margin-right:var(--ibiz-spacing-tight)}.ibiz-control-treeview-node__label{flex-grow:1;flex-shrink:1;min-width:1px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-treeview-node:hover .ibiz-control-treeview-context-menu-trigger{display:inline-block}.ibiz-control-treeview-node--disabled{color:var(--ibiz-color-disabled-text);cursor:not-allowed}.ibiz-control-treeview-context-menu-trigger{display:none;flex-shrink:0;width:30px;text-align:center;cursor:pointer}.ibiz-control-treeview-context-menu-trigger__caption-icon{vertical-align:middle}.ibiz-control-treeview-context-menu.mx-context-menu{padding:var(--ibiz-spacing-extra-tight) 0}.ibiz-control-treeview-context-menu.mx-context-menu .mx-context-menu-item{padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base)}.ibiz-control-treeview-quick-search{margin-bottom:var(--ibiz-spacing-tight)}

package/lib/control/tree-grid-ex/tree-grid-ex.cjs

@@ -5,6 +5,7 @@ var vue3Util = require('@ibiz-template/vue3-util');
 var runtime = require('@ibiz-template/runtime');
 require('./tree-grid-ex.css');
 var core = require('@ibiz-template/core');
+var qxUtil = require('qx-util');
 var useRowEditPopover = require('./use-row-edit-popover.cjs');
 
 "use strict";
@@ -66,6 +67,7 @@ const TreeGridExControl = /* @__PURE__ */ vue.defineComponent({
         return temp;
       });
     };
+    const tableRefreshKey = vue.ref(qxUtil.createUUID());
     const treeRootData = vue.computed(() => {
       if (!c.state.isLoaded) {
         return [];
@@ -78,11 +80,15 @@ const TreeGridExControl = /* @__PURE__ */ vue.defineComponent({
       }, []);
     });
     const elTableData = vue.computed(() => {
+      tableRefreshKey.value = qxUtil.createUUID();
       if (treeRootData.value.length === 0) {
         return [];
       }
       return toElNodes(treeRootData.value, true);
     });
+    c.evt.on("onAfterRefreshParent", () => {
+      tableRefreshKey.value = qxUtil.createUUID();
+    });
     const loadData = async (item, treeNode, callback) => {
       let nodes;
       const nodeData = c.getNodeData(item.id);
@@ -157,6 +163,7 @@ const TreeGridExControl = /* @__PURE__ */ vue.defineComponent({
       tableRef,
       elTableData,
       renderColumns,
+      tableRefreshKey,
       renderNoData,
       loadData,
       onRowClick,
@@ -209,6 +216,7 @@ const TreeGridExControl = /* @__PURE__ */ vue.defineComponent({
     }, {
       default: () => [this.c.state.isLoaded && vue.createVNode(vue.resolveComponent("el-table"), {
         "ref": "tableRef",
+        "key": this.tableRefreshKey,
         "class": this.ns.e("table"),
         "border": true,
         "row-key": "id",

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

@@ -16,6 +16,7 @@ const IBizColorPicker = /* @__PURE__ */ vue.defineComponent({
     const c = props.controller;
     const currentVal = vue.ref("");
     const colorPicker = vue.ref(null);
+    const predefineColors = vue.ref(["#000000", "#2C2C2C", "#50555C", "#ACB3BF", "#D0D3D9", "#C4C4C4", "#DADADA", "#E5E5E5", "#F0F0F0", "#F24E1E", "#E99C58", "#FFC700", "#FF4D00", "#FF00D6", "#D82E57", "#8E1DE8", "#0ACF83", "#18A0FB", "#A259FF", "#907CFF"]);
     const showFormDefaultContent = vue.computed(() => {
       if (props.controlParams && props.controlParams.editmode === "hover") {
         return true;
@@ -59,6 +60,7 @@ const IBizColorPicker = /* @__PURE__ */ vue.defineComponent({
       ns,
       c,
       currentVal,
+      predefineColors,
       contentStyle,
       colorPicker,
       handleChange,
@@ -85,7 +87,9 @@ const IBizColorPicker = /* @__PURE__ */ vue.defineComponent({
         "onChange": this.handleChange,
         "onBlur": this.onBlur,
         "onFocus": this.onFocus,
-        "size": "small"
+        "size": "small",
+        "predefine": this.predefineColors,
+        "show-alpha": true
       }, null), vue.createVNode("span", {
         "class": this.ns.b("text")
       }, [this.currentVal])]);

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

@@ -163,7 +163,7 @@ const IBizPicker = /* @__PURE__ */ vue.defineComponent({
     vue.onMounted(() => {
       vue.watch(() => props.data[c.valueItem], async (newVal, oldVal) => {
         if (newVal !== oldVal) {
-          if (!isLoaded.value && editorRef.value) {
+          if (!isLoaded.value && editorRef.value && ramda.isNil(props.value)) {
             await onSearch("");
           }
           const curItem = items.value.find((item) => Object.is(item[c.keyName], newVal));

package/lib/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.cjs

@@ -91,7 +91,7 @@ const IBizPickerDropDown = /* @__PURE__ */ vue.defineComponent({
     vue.onMounted(() => {
       vue.watch(() => props.data[c.valueItem], async (newVal, oldVal) => {
         if (newVal !== oldVal) {
-          if (!isLoaded.value && editorRef.value) {
+          if (!isLoaded.value && editorRef.value && ramda.isNil(props.value)) {
             shouldLoad.value = true;
             await onSearch("");
           }

package/lib/editor/span/span/span.css

@@ -1 +1 @@
-.ibiz-span{display:inline-block;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-form-item-line-height);color:var(--ibiz-form-item-text-color);white-space:pre-line}.ibiz-span--readonly{color:var(--ibiz-form-item-readonly-color)}.ibiz-span__code-list{display:inline-block;height:100%}.ibiz-form-item .ibiz-span.is-show-default{padding:var(--ibiz-form-item-hover-edit-padding)}
+.ibiz-span{display:inline-block;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-form-item-line-height);color:var(--ibiz-form-item-text-color);white-space:pre-line}.ibiz-span--readonly{color:var(--ibiz-form-item-readonly-color)}.ibiz-span__code-list{height:100%}.ibiz-form-item .ibiz-span.is-show-default{padding:var(--ibiz-form-item-hover-edit-padding)}

package/lib/panel-component/nav-pos-index/nav-pos-index.controller.cjs

@@ -247,6 +247,7 @@ class NavPosIndexController extends runtime.PanelItemController {
         indexPath += "/".concat(route.params["view".concat(index)], "/").concat(ibiz.env.routePlaceholder);
       }
       this.router.push(indexPath);
+      ibiz.util.setBrowserTitle("");
     }
   }
 }

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

@@ -41,25 +41,11 @@ class InternalMessageDefaultProvider {
    */
   async openRedirectView(msg, redirectUrl) {
     await ibiz.hub.notice.internalMessage.markRead(msg);
-    let viewId = "";
-    const params = {};
-    const url = new URL(redirectUrl);
-    if (url.searchParams.size > 0) {
-      url.searchParams.forEach((value, _key) => {
-        params[_key] = value;
-      });
-    }
-    const rdTagItems = url.pathname.replace("//", "").split("/");
-    const [appOrViewTag, viewTag] = rdTagItems;
-    if (viewTag) {
-      viewId = viewTag;
-    } else {
-      viewId = appOrViewTag;
-    }
+    const { viewId, context, params } = runtime.parseViewProtocol(redirectUrl);
     ibiz.commands.execute(
       runtime.OpenAppViewCommand.TAG,
       viewId,
-      core.IBizContext.create({}),
+      core.IBizContext.create(context),
       params
     );
   }

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

@@ -18,7 +18,6 @@ const AppModalComponent = /* @__PURE__ */ vue.defineComponent({
   setup(props, ctx) {
     const ns = vue3Util.useNamespace("modal");
     const isShow = vue.ref(false);
-    let data;
     const {
       zIndex
     } = vue3Util.useUIStore();
@@ -52,10 +51,10 @@ const AppModalComponent = /* @__PURE__ */ vue.defineComponent({
     const modal = new runtime.Modal({
       mode: runtime.ViewMode.MODAL,
       viewUsage: 2,
-      dismiss: (_data) => {
+      dismiss: (data) => {
         zIndex.decrement();
         isShow.value = false;
-        data = _data;
+        ctx.emit("dismiss", data);
       }
     });
     const onBeforeClose = async (done) => {
@@ -70,9 +69,6 @@ const AppModalComponent = /* @__PURE__ */ vue.defineComponent({
     const present = () => {
       isShow.value = true;
     };
-    const onClosed = () => {
-      ctx.emit("dismiss", data);
-    };
     return {
       ns,
       isShow,
@@ -82,7 +78,6 @@ const AppModalComponent = /* @__PURE__ */ vue.defineComponent({
       modal,
       present,
       dismiss,
-      onClosed,
       onBeforeClose
     };
   },
@@ -94,8 +89,7 @@ const AppModalComponent = /* @__PURE__ */ vue.defineComponent({
       class: [this.ns.b(), this.options.placement && this.ns.m(this.options.placement), this.options.modalClass],
       style: this.customStyle,
       zIndex: this.modalZIndex,
-      onClosed: this.onClosed,
-      onBeforeClose: this.onBeforeClose,
+      beforeClose: this.onBeforeClose,
       ...this.options
     }, (_b = (_a = this.$slots).default) == null ? void 0 : _b.call(_a, this.modal));
   }

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

@@ -25,6 +25,27 @@ class EditViewEngine extends runtime.ViewEngineBase {
   get form() {
     return this.view.getController("form");
   }
+  init() {
+    super.init();
+    if (this.view.model.multiFormMode === 1 && this.view.params.srfdatatype) {
+      const model = runtime.getControl(
+        this.view.model,
+        "_form_".concat(this.view.params.srfdatatype)
+      );
+      if (model) {
+        const controls = runtime.getControlsByView(this.view.model).filter((item) => {
+          return item.controlType !== "FORM";
+        });
+        model.name = "form";
+        controls.push(model);
+        if (this.view.model.viewLayoutPanel) {
+          this.view.model.viewLayoutPanel.controls = controls;
+        } else {
+          this.view.model.controls = controls;
+        }
+      }
+    }
+  }
   async onCreated() {
     await super.onCreated();
     const { childNames, modal } = this.view;
@@ -34,8 +55,12 @@ class EditViewEngine extends runtime.ViewEngineBase {
       this.view.slotProps.form = {};
     }
     this.view.slotProps.form.loadDefault = false;
+    if (!this.view.slotProps.toolbar) {
+      this.view.slotProps.toolbar = {};
+    }
+    this.view.slotProps.toolbar.manualCalcButtonState = true;
     modal.hooks.shouldDismiss.tapPromise(async (context) => {
-      if (this.form.state.modified) {
+      if (this.form.state.modified && this.view.model.enableDirtyChecking === true) {
         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"
@@ -244,11 +269,12 @@ class EditViewEngine extends runtime.ViewEngineBase {
    * @return {*}  {void}
    */
   initMarkOpenData() {
-    if (ramda.isNil(this.view.modal.routeDepth)) {
+    if (ramda.isNil(this.view.modal.routeDepth) || !this.view.model.markOpenDataMode) {
       return;
     }
-    let srfkey;
-    const callback = (data) => {
+    const modes = this.view.model.markOpenDataMode.split(";");
+    let hasOpenConfirm = false;
+    const callback = async (data) => {
       if (!this.view.state.activated) {
         return;
       }
@@ -269,44 +295,93 @@ class EditViewEngine extends runtime.ViewEngineBase {
       }
       ibiz.notification.info({
         position: "bottom-right",
-        title: data.username,
-        desc: "".concat(actionMsg, " ").concat(this.view.state.caption, "-").concat(dataInfo)
-      });
-    };
-    this.form.evt.on("onLoadSuccess", (event) => {
-      const formData = event.data[0];
-      srfkey = formData.srfkey;
-      ibiz.markOpenData.action(this.deName, srfkey, "VIEW");
-      ibiz.markOpenData.subscribe(this.deName, srfkey, callback);
-      this.view.evt.on("onDestroyed", () => {
-        ibiz.markOpenData.unsubscribe(this.deName, srfkey, callback);
+        title: "\u901A\u77E5",
+        desc: "".concat(modes.includes("DISPLAYOPPERSON") ? data.username : "\u6709\u4EBA", " ").concat(actionMsg, " ").concat(this.view.state.caption, "-").concat(dataInfo)
       });
-    });
-    let isWait = false;
-    const actionEdit = () => {
-      if (!srfkey || isWait) {
-        return;
+      if (hasOpenConfirm === false && data.action === "UPDATE" && modes.includes("NOTICERELOAD")) {
+        hasOpenConfirm = true;
+        const isReload = await this.reloadConfirm();
+        if (isReload) {
+          this.refresh();
+        }
+        hasOpenConfirm = false;
       }
-      isWait = true;
-      ibiz.markOpenData.action(this.deName, srfkey, "EDIT");
-      setTimeout(
-        () => {
-          isWait = false;
-        },
-        1e3 * 60 * 5
-      );
     };
-    this.form.evt.on("onFormDataChange", actionEdit);
-    this.form.evt.on("onSaveSuccess", () => {
-      if (srfkey) {
-        ibiz.markOpenData.action(this.deName, srfkey, "UPDATE");
-      }
-    });
-    this.view.evt.on("onCloseView", () => {
-      if (srfkey) {
-        ibiz.markOpenData.action(this.deName, srfkey, "CLOSE");
-      }
+    const doActions = [];
+    if (modes.includes("EDITDATA") || modes.includes("DISPLAYOPPERSON") || modes.includes("NOTICERELOAD")) {
+      doActions.push("EDIT", "VIEW", "UPDATE", "CLOSE");
+    } else if (modes.includes("OPENDATA")) {
+      doActions.push("VIEW", "CLOSE");
+    }
+    if (doActions.length === 0) {
+      return;
+    }
+    let srfkey;
+    let hasSubscribe = false;
+    if (doActions.includes("VIEW")) {
+      this.form.evt.on("onLoadSuccess", (event) => {
+        const formData = event.data[0];
+        srfkey = formData.srfkey;
+        ibiz.markOpenData.action(this.deName, srfkey, "VIEW");
+        if (!hasSubscribe) {
+          ibiz.markOpenData.subscribe(this.deName, srfkey, callback);
+          this.view.evt.on("onDestroyed", () => {
+            ibiz.markOpenData.unsubscribe(this.deName, srfkey, callback);
+          });
+          hasSubscribe = true;
+        }
+      });
+    }
+    if (doActions.includes("EDIT")) {
+      let isWait = false;
+      const actionEdit = () => {
+        if (!srfkey || isWait) {
+          return;
+        }
+        isWait = true;
+        ibiz.markOpenData.action(this.deName, srfkey, "EDIT");
+        setTimeout(
+          () => {
+            isWait = false;
+          },
+          1e3 * 60 * 5
+        );
+      };
+      this.form.evt.on("onFormDataChange", actionEdit);
+    }
+    if (doActions.includes("UPDATE")) {
+      this.form.evt.on("onSaveSuccess", () => {
+        if (srfkey) {
+          ibiz.markOpenData.action(this.deName, srfkey, "UPDATE");
+        }
+      });
+    }
+    if (doActions.includes("CLOSE")) {
+      this.view.evt.on("onCloseView", () => {
+        if (srfkey) {
+          ibiz.markOpenData.action(this.deName, srfkey, "CLOSE");
+        }
+      });
+    }
+  }
+  /**
+   * 刷新确认
+   * @author lxm
+   * @date 2024-02-06 11:40:36
+   * @return {*}  {Promise<boolean>}
+   */
+  async reloadConfirm() {
+    const result = await ibiz.confirm.info({
+      title: "\u662F\u5426\u5237\u65B0",
+      desc: "\u6570\u636E\u5DF2\u88AB\u4FEE\u6539\u662F\u5426\u5237\u65B0\u9875\u9762\uFF1F"
     });
+    if (result && this.form.state.modified) {
+      return ibiz.confirm.warning({
+        title: "\u5237\u65B0\u63D0\u9192",
+        desc: "\u8868\u5355\u6570\u636E\u5DF2\u7ECF\u4FEE\u6539\uFF0C\u786E\u5B9A\u8981\u5237\u65B0\uFF1F"
+      });
+    }
+    return result;
   }
 }
 

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

@@ -27,6 +27,10 @@ class OptViewEngine extends runtime.ViewEngineBase {
       this.view.slotProps.form = {};
     }
     this.view.slotProps.form.loadDefault = false;
+    if (!this.view.slotProps.toolbar) {
+      this.view.slotProps.toolbar = {};
+    }
+    this.view.slotProps.toolbar.manualCalcButtonState = true;
     modal.hooks.shouldDismiss.tapPromise(async (context) => {
       if (this.form.state.modified) {
         const isAllow = await ibiz.confirm.error({

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

@@ -113,8 +113,8 @@ const ModalRouterShell = /* @__PURE__ */ vue.defineComponent({
   },
   render() {
     return vue.createVNode("div", {
-      "style": "width: 0;height: 0;"
-    }, [vue.createTextVNode("\u8DEF\u7531\u6A21\u6001\u5360\u4F4D")]);
+      "style": "position: absolute;width: 0;height: 0;"
+    }, null);
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.6.0-alpha.2",
+  "version": "0.6.0-alpha.4",
   "description": "使用 rollup 编译 vue 组件或者 jsx",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -27,12 +27,12 @@
     "@floating-ui/dom": "^1.5.3",
     "@ibiz-template-plugin/ai-chat": "^0.0.1",
     "@ibiz-template-plugin/gantt": "0.1.1",
-    "@ibiz-template/core": "^0.5.7-alpha.10",
+    "@ibiz-template/core": "^0.6.0-alpha.4",
     "@ibiz-template/devtool": "0.0.1-dev.3",
-    "@ibiz-template/model-helper": "^0.6.0-alpha.2",
-    "@ibiz-template/runtime": "^0.6.0-alpha.2",
+    "@ibiz-template/model-helper": "^0.6.0-alpha.4",
+    "@ibiz-template/runtime": "^0.6.0-alpha.4",
     "@ibiz-template/theme": "^0.5.0",
-    "@ibiz-template/vue3-util": "^0.6.0-alpha.2",
+    "@ibiz-template/vue3-util": "^0.6.0-alpha.4",
     "@ibiz-template/web-theme": "^1.1.8",
     "@ibiz/model-core": "^0.1.11",
     "@imengyu/vue3-context-menu": "^1.3.5",