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

package/lib/control/toolbar/export-excel/export-excel.cjs

@@ -11,6 +11,10 @@ function _isSlot(s) {
 const IBizExportExcel = /* @__PURE__ */ vue.defineComponent({
   name: "IBizExportExcel",
   props: {
+    mode: {
+      type: String,
+      required: false
+    },
     size: {
       type: String,
       required: false
@@ -52,20 +56,93 @@ const IBizExportExcel = /* @__PURE__ */ vue.defineComponent({
     };
   },
   render() {
-    return vue.createVNode(vue.resolveComponent("el-dropdown"), {
+    return this.$props.mode === "menu" ? vue.createVNode(vue.resolveComponent("el-sub-menu"), {
+      "index": this.$props.item.id,
+      "class": this.ns.b("submenu"),
+      "popper-class": this.ns.b("submenu-popper")
+    }, {
+      title: () => {
+        let _slot;
+        return vue.createVNode(vue.resolveComponent("el-button"), {
+          "title": this.item.tooltip,
+          "size": this.$props.size,
+          "class": this.ns.b("submenu-button")
+        }, _isSlot(_slot = this.btnContent(this.item)) ? _slot : {
+          default: () => [_slot]
+        });
+      },
+      default: () => {
+        return [vue.createVNode(vue.resolveComponent("el-menu-item"), {
+          "class": this.ns.b("menu-item"),
+          "onClick": (e) => this.onCommand("maxRowCount", e)
+        }, {
+          default: () => [vue.createTextVNode("\u5BFC\u51FA\u5168\u90E8(\u6700\u5927\u5BFC\u51FA1000\u884C)")]
+        }), vue.createVNode(vue.resolveComponent("el-menu-item"), {
+          "class": this.ns.b("menu-item"),
+          "onClick": (e) => this.onCommand("activatedPage", e)
+        }, {
+          default: () => [vue.createTextVNode("\u5BFC\u51FA\u5F53\u524D\u9875")]
+        }), vue.createVNode(vue.resolveComponent("el-menu-item"), {
+          "class": this.ns.b("menu-item"),
+          "onClick": (e) => this.onCommand("selectedRows", e)
+        }, {
+          default: () => [vue.createTextVNode("\u5BFC\u51FA\u5F53\u524D\u9009\u4E2D")]
+        }), vue.createVNode(vue.resolveComponent("el-menu-item"), {
+          "class": [this.ns.b("menu-item"), this.ns.e("custom")]
+        }, {
+          default: () => [vue.createVNode(vue.resolveComponent("el-input"), {
+            "type": "number",
+            "modelValue": this.startPage,
+            "onUpdate:modelValue": ($event) => this.startPage = $event,
+            "size": "small",
+            "maxlength": "4",
+            "onClick": (event) => {
+              event.stopPropagation();
+            },
+            "onChange": (value) => {
+              this.startPage = value;
+            }
+          }, null), vue.createVNode("span", {
+            "class": "item-text",
+            "onClick": (event) => {
+              event.stopPropagation();
+            }
+          }, [vue.createTextVNode("-")]), vue.createVNode(vue.resolveComponent("el-input"), {
+            "modelValue": this.endPage,
+            "onUpdate:modelValue": ($event) => this.endPage = $event,
+            "size": "small",
+            "type": "number",
+            "maxlength": "4",
+            "onClick": (event) => {
+              event.stopPropagation();
+            }
+          }, null), vue.createVNode("span", {
+            "class": "item-text",
+            "onClick": (event) => {
+              event.stopPropagation();
+            }
+          }, [vue.createTextVNode("\u9875")]), vue.createVNode(vue.resolveComponent("el-button"), {
+            "onClick": (e) => this.onCommand("customPage", e),
+            "size": "small"
+          }, {
+            default: () => [vue.createTextVNode("\u5BFC\u51FA")]
+          })]
+        })];
+      }
+    }) : vue.createVNode(vue.resolveComponent("el-dropdown"), {
       "size": this.$props.size,
       "onCommand": this.onCommand,
       "popper-class": this.ns.b(),
       "trigger": "click"
     }, {
       default: () => {
-        let _slot;
+        let _slot2;
         return vue.createVNode(vue.resolveComponent("el-button"), {
           "title": this.item.tooltip,
           "size": this.$props.size,
           "class": this.ns.e("button")
-        }, _isSlot(_slot = this.btnContent(this.item)) ? _slot : {
-          default: () => [_slot]
+        }, _isSlot(_slot2 = this.btnContent(this.item)) ? _slot2 : {
+          default: () => [_slot2]
         });
       },
       dropdown: () => {

package/lib/control/toolbar/export-excel/export-excel.css

@@ -1 +1 @@
-.ibiz-export-excel{width:270px}.ibiz-export-excel__custom{display:flex;align-items:center;justify-content:center}.ibiz-export-excel__custom>*+*{margin-left:10px}.ibiz-export-excel__custom.el-dropdown-menu__item:focus{color:var(--el-text-color-regular);background-color:transparent}.ibiz-export-excel__custom .el-input{--el-input-text-color:var(--ibiz-color-white)}.ibiz-export-excel__button{display:flex;align-items:center;justify-content:center;padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base)}.ibiz-export-excel__button>span{display:flex;align-items:center;justify-content:center;font-size:14px;pointer-events:none}.ibiz-export-excel__button i,.ibiz-export-excel__button img{display:inline-block;max-width:var(--ibiz-width-icon-medium);max-height:var(--ibiz-width-icon-medium);margin:0 var(--ibiz-spacing-extra-tight) 0 0}
+.ibiz-export-excel{width:270px}.ibiz-export-excel__custom{display:flex;align-items:center;justify-content:center}.ibiz-export-excel__custom>*+*{margin-left:10px}.ibiz-export-excel__custom.el-dropdown-menu__item:focus{color:var(--el-text-color-regular);background-color:transparent}.ibiz-export-excel__custom .el-input{--el-input-text-color:var(--ibiz-color-white)}.ibiz-export-excel__button{display:flex;align-items:center;justify-content:center;padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base)}.ibiz-export-excel__button>span{display:flex;align-items:center;justify-content:center;font-size:14px;pointer-events:none}.ibiz-export-excel__button i,.ibiz-export-excel__button img{display:inline-block;max-width:var(--ibiz-width-icon-medium);max-height:var(--ibiz-width-icon-medium);margin:0 var(--ibiz-spacing-extra-tight) 0 0}.ibiz-export-excel-submenu-button{justify-content:flex-start;width:100%;height:36px;padding:0 10px;border-radius:0}.ibiz-export-excel-submenu-button i{margin:0 var(--ibiz-spacing-extra-tight) 0 0}.ibiz-control-toolbar-submenu-popper .ibiz-export-excel-submenu .el-sub-menu__title{padding:0}.ibiz-control-toolbar-submenu-popper .ibiz-export-excel-submenu .el-sub-menu__title .el-sub-menu__icon-arrow{display:none}.ibiz-control-toolbar-submenu-popper .ibiz-export-excel-submenu.hover{color:var(--ibiz-color-primary-hover-text);background-color:var(--ibiz-color-primary-hover)}.ibiz-control-toolbar-submenu-popper .ibiz-export-excel-submenu .ibiz-export-excel-submenu-popper{width:270px;color:var(--ibiz-color-primary-text);background-color:var(--ibiz-color-primary)}

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,54 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
         })]);
       });
     };
+    const renderSubmenu = (item) => {
+      return vue.createVNode(vue.resolveComponent("el-sub-menu"), {
+        "class": ns.b("submenu"),
+        "index": item.id,
+        "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 +131,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 +154,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/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/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"

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.3",
   "description": "使用 rollup 编译 vue 组件或者 jsx",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -29,10 +29,10 @@
     "@ibiz-template-plugin/gantt": "0.1.1",
     "@ibiz-template/core": "^0.5.7-alpha.10",
     "@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.3",
+    "@ibiz-template/runtime": "^0.6.0-alpha.3",
     "@ibiz-template/theme": "^0.5.0",
-    "@ibiz-template/vue3-util": "^0.6.0-alpha.2",
+    "@ibiz-template/vue3-util": "^0.6.0-alpha.3",
     "@ibiz-template/web-theme": "^1.1.8",
     "@ibiz/model-core": "^0.1.11",
     "@imengyu/vue3-context-menu": "^1.3.5",