@ibiz-template/vue3-components 0.7.25 → 0.7.26-alpha.0

package/es/editor/data-picker/ibiz-picker-link/ibiz-picker-link.mjs

@@ -1,6 +1,7 @@
-import { ref, computed, watch, createVNode, defineComponent } from 'vue';
+import { ref, computed, watch, onMounted, createVNode, defineComponent } from 'vue';
 import { getDataPickerProps, getEditorEmits, useNamespace, useAutoFocusBlur, useFocusAndBlur, renderString } from '@ibiz-template/vue3-util';
 import './ibiz-picker-link.css';
+import { isNil } from 'ramda';
 
 "use strict";
 const IBizPickerLink = /* @__PURE__ */ defineComponent({
@@ -13,10 +14,23 @@ const IBizPickerLink = /* @__PURE__ */ defineComponent({
     const ns = useNamespace("picker-link");
     const c = props.controller;
     const curValue = ref("");
+    const items = ref([]);
     const {
       useInFocusAndBlur,
       useInValueChange
     } = useAutoFocusBlur(props, emit);
+    const onSearch = async (query) => {
+      if (c.model.appDataEntityId) {
+        let trimQuery = "";
+        if (query !== props.value) {
+          trimQuery = query.trim();
+        }
+        const res = await c.getServiceData(trimQuery, props.data);
+        if (res) {
+          items.value = res.data;
+        }
+      }
+    };
     const showFormDefaultContent = computed(() => {
       if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
@@ -34,6 +48,24 @@ const IBizPickerLink = /* @__PURE__ */ defineComponent({
     }, {
       immediate: true
     });
+    onMounted(() => {
+      watch(() => props.data[c.valueItem], async (newVal, oldVal) => {
+        if (newVal !== oldVal) {
+          if (isNil(props.value)) {
+            await onSearch("");
+          }
+          const curItem = items.value.find((item) => Object.is(item[c.keyName], newVal));
+          if (curItem) {
+            curValue.value = curItem[c.textName];
+          }
+          if (newVal === null) {
+            emit("change", null);
+          }
+        }
+      }, {
+        immediate: true
+      });
+    });
     const handleOpenViewClose = (data) => {
       const item = {};
       Object.assign(item, data);

package/es/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.css

@@ -1 +1 @@
-.ibiz-dropdown{width:var(--ibiz-dropdown-width);--ibiz-dropdown-width:100%;--ibiz-dropdown-readonly-text-item-color:var(--ibiz-form-item-text-color)}.ibiz-dropdown__branch-node>.el-tree-node__content{--ibiz-color-disabled-text:var(--ibiz-color-text-0)}.ibiz-dropdown .el-select{width:100%}.ibiz-dropdown-readonly-text-item{margin-right:var(--ibiz-spacing-tight);font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-dropdown-readonly-text-item-color)}.ibiz-dropdown-readonly-text-item .ibiz-icon{display:flex;align-items:center;justify-content:center;width:var(--ibiz-width-icon-medium);height:var(--ibiz-width-icon-medium);margin-right:var(--ibiz-spacing-extra-tight);font-size:var(--ibiz-font-size-regular)}.el-select-dropdown__item{width:100%;background-color:var(--ibiz-dropdown-select-option-item-bkcolor)}.ibiz-dropdown-select-option-content{display:flex;align-items:center;justify-content:flex-start;width:100%;height:100%;color:var(--ibiz-dropdown-select-option-item-color)}.ibiz-dropdown-select-option-content__text{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-dropdown-select-option-content .ibiz-icon{display:flex;align-items:center;justify-content:center;width:var(--ibiz-width-icon-medium);height:var(--ibiz-width-icon-medium);margin-right:var(--ibiz-spacing-extra-tight);font-size:var(--ibiz-font-size-regular)}.ibiz-dropdown-form-default-content{display:none}.ibiz-form-item .ibiz-dropdown.is-show-default:hover .ibiz-dropdown-form-default-content{display:none}.ibiz-form-item .ibiz-dropdown.is-show-default:hover .ibiz-dropdown-select{display:block}.ibiz-form-item .ibiz-dropdown.is-show-default .ibiz-dropdown-form-default-content{display:flex;align-items:center;width:100%;padding:var(--ibiz-form-item-hover-edit-padding);font-family:Arial,sans-serif;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-text-color)}.ibiz-form-item .ibiz-dropdown.is-show-default .ibiz-dropdown-form-default-content.is-multiple{height:var(--ibiz-editor-default-line-height)}.ibiz-form-item .ibiz-dropdown.is-show-default .ibiz-dropdown-form-default-content.is-multiple .ibiz-dropdown-content-item{height:calc(var(--ibiz-editor-default-line-height) - var(--ibiz-spacing-tight));padding:0 var(--ibiz-spacing-tight);margin:2px 6px 2px 0;font-size:var(--ibiz-font-size-small);line-height:calc(var(--ibiz-editor-default-line-height) - var(--ibiz-spacing-tight));color:var(--ibiz-editor-default-text-color);background-color:var(--ibiz-color-fill-0);border:1px solid transparent;border-radius:var(--ibiz-border-radius-small)}.ibiz-form-item .ibiz-dropdown.is-show-default .ibiz-dropdown-select{display:none}.ibiz-form-item .ibiz-dropdown.is-show-default.is-editable .ibiz-dropdown-form-default-content{display:none}.ibiz-form-item .ibiz-dropdown.is-show-default.is-editable .ibiz-dropdown-select{display:block}
+.ibiz-dropdown{width:var(--ibiz-dropdown-width);--ibiz-dropdown-width:100%;--ibiz-dropdown-readonly-text-item-color:var(--ibiz-form-item-text-color)}.ibiz-dropdown__branch-node>.el-tree-node__content{--ibiz-color-disabled-text:var(--ibiz-color-text-0)}.ibiz-dropdown .el-select{width:100%}.ibiz-dropdown-readonly-text-item{margin-right:var(--ibiz-spacing-tight);font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-dropdown-readonly-text-item-color)}.ibiz-dropdown-readonly-text-item .ibiz-icon{display:flex;align-items:center;justify-content:center;width:var(--ibiz-width-icon-medium);height:var(--ibiz-width-icon-medium);margin-right:var(--ibiz-spacing-extra-tight);font-size:var(--ibiz-font-size-regular)}.el-select-dropdown__item{width:100%;background-color:var(--ibiz-dropdown-select-option-item-bkcolor)}.ibiz-dropdown-select-option-content{display:flex;align-items:center;justify-content:flex-start;width:100%;height:100%;color:var(--ibiz-dropdown-select-option-item-color)}.ibiz-dropdown-select-option-content__text{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-dropdown-select-option-content .ibiz-icon{display:flex;align-items:center;justify-content:center;width:var(--ibiz-width-icon-medium);height:var(--ibiz-width-icon-medium);margin-right:var(--ibiz-spacing-extra-tight);font-size:var(--ibiz-font-size-regular)}.ibiz-dropdown-form-default-content{display:none}.ibiz-form-item .ibiz-dropdown.is-show-default:hover .ibiz-dropdown-form-default-content{display:none}.ibiz-form-item .ibiz-dropdown.is-show-default:hover .ibiz-dropdown-select{display:block}.ibiz-form-item .ibiz-dropdown.is-show-default .ibiz-dropdown-form-default-content{display:flex;align-items:center;width:100%;padding:var(--ibiz-form-item-hover-edit-padding);font-family:Arial,sans-serif;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-text-color)}.ibiz-form-item .ibiz-dropdown.is-show-default .ibiz-dropdown-form-default-content.is-multiple{height:var(--ibiz-editor-default-line-height)}.ibiz-form-item .ibiz-dropdown.is-show-default .ibiz-dropdown-form-default-content.is-multiple .ibiz-dropdown-content-item{height:calc(var(--ibiz-editor-default-line-height) - var(--ibiz-spacing-tight));padding:0 var(--ibiz-spacing-tight);margin:2px 6px 2px 0;font-size:var(--ibiz-font-size-small);line-height:calc(var(--ibiz-editor-default-line-height) - var(--ibiz-spacing-tight));color:var(--ibiz-editor-default-text-color);background-color:var(--ibiz-color-fill-0);border:1px solid transparent;border-radius:var(--ibiz-border-radius-small)}.ibiz-form-item .ibiz-dropdown.is-show-default .ibiz-dropdown-select{display:none}.ibiz-form-item .ibiz-dropdown.is-show-default .ibiz-dropdown-select .el-input__prefix-inner>:last-child{margin-right:var(--ibiz-spacing-none)}.ibiz-form-item .ibiz-dropdown.is-show-default.is-editable .ibiz-dropdown-form-default-content{display:none}.ibiz-form-item .ibiz-dropdown.is-show-default.is-editable .ibiz-dropdown-select{display:block}.ibiz-dropdown--round .ibiz-dropdown-readonly-text-item{display:inline-flex;align-items:center;padding-right:var(--ibiz-spacing-base);padding-left:var(--ibiz-spacing-base);margin-right:var(--ibiz-spacing-extra-tight);line-height:var(--ibiz-spacing-loose);color:var(--ibiz-dropdown-select-option-item-color);background-color:var(--ibiz-dropdown-select-option-item-bkcolor);border-radius:var(--ibiz-spacing-base)}.ibiz-dropdown--round .ibiz-dropdown-readonly-text-item:first-child{margin-left:calc(var(--ibiz-spacing-base-tight) - var(--ibiz-spacing-super-tight)/ 2)}.ibiz-dropdown--round .ibiz-dropdown-select .el-select__tags{display:none}.ibiz-dropdown--round .ibiz-dropdown-select .el-input__inner{flex:1 1 0;opacity:0}.ibiz-dropdown--round .ibiz-dropdown-select-option-text{display:inline-flex;align-items:center;padding-right:var(--ibiz-spacing-base);padding-left:var(--ibiz-spacing-base);margin-right:var(--ibiz-spacing-extra-tight);line-height:var(--ibiz-spacing-loose);color:var(--ibiz-dropdown-select-option-item-color);background-color:var(--ibiz-dropdown-select-option-item-bkcolor);border-radius:var(--ibiz-spacing-base)}.ibiz-dropdown-popper--round .el-select-dropdown__item{display:flex;align-items:center;height:calc(var(--ibiz-spacing-extra-loose) + var(--ibiz-spacing-extra-tight));line-height:calc(var(--ibiz-spacing-extra-loose) + var(--ibiz-spacing-extra-tight));background-color:transparent}.ibiz-dropdown-popper--round .ibiz-dropdown-select-option-content{flex:0 0 auto;width:auto;min-width:0;height:auto;padding-right:var(--ibiz-spacing-base);padding-left:var(--ibiz-spacing-base);line-height:var(--ibiz-spacing-loose);color:var(--ibiz-dropdown-select-option-item-color);background-color:var(--ibiz-dropdown-select-option-item-bkcolor);border-radius:var(--ibiz-spacing-base)}

package/es/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.mjs

@@ -1,11 +1,8 @@
-import { isVNode, ref, computed, watch, nextTick, onMounted, onUnmounted, resolveComponent, mergeProps, createVNode, defineComponent } from 'vue';
+import { ref, computed, watch, nextTick, onMounted, onUnmounted, resolveComponent, mergeProps, createVNode, defineComponent } from 'vue';
 import { getDropdownProps, getEditorEmits, useNamespace, useCodeListListen, useClickOutside } from '@ibiz-template/vue3-util';
 import './ibiz-dropdown.css';
 
 "use strict";
-function _isSlot(s) {
-  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
-}
 const IBizDropdown = /* @__PURE__ */ defineComponent({
   name: "IBizDropdown",
   props: getDropdownProps(),
@@ -246,7 +243,6 @@ const IBizDropdown = /* @__PURE__ */ defineComponent({
     };
   },
   render() {
-    let _slot;
     const overflowMode = this.c.editorParams.overflowMode || ibiz.config.pickerEditor.overflowMode;
     const isEllipsis = overflowMode === "ellipsis";
     const editContent = this.hasChildren ? createVNode(resolveComponent("el-tree-select"), mergeProps({
@@ -294,44 +290,66 @@ const IBizDropdown = /* @__PURE__ */ defineComponent({
       "disabled": this.disabled,
       "loading": this.isLoading,
       "fit-input-width": isEllipsis,
+      "popper-class": "".concat(this.ns.b("popper"), " ").concat(this.c.editorParams.type === "round" ? this.ns.bm("popper", "round") : ""),
       "onBlur": this.onBlur,
       "onFocus": this.onFocus,
       "onKeyup": this.handleKeyUp,
       "onVisibleChange": this.onVisibleChange
-    }, this.$attrs), _isSlot(_slot = this.items.map((item) => {
-      return createVNode(resolveComponent("el-option"), {
-        "key": item.value,
-        "value": item.value.toString(),
-        "label": item.text,
-        "disabled": item.disableSelect === true,
-        "style": item.bkcolor ? this.ns.cssVarBlock({
-          "select-option-item-bkcolor": "".concat(item.bkcolor)
-        }) : "",
-        "class": [item.cls ? item.cls : null],
-        "title": isEllipsis ? item.text : ""
-      }, {
-        default: () => {
+    }, this.$attrs), {
+      default: () => {
+        return this.items.map((item) => {
+          return createVNode(resolveComponent("el-option"), {
+            "key": item.value,
+            "value": item.value.toString(),
+            "label": item.text,
+            "disabled": item.disableSelect === true,
+            "style": item.bkcolor ? this.ns.cssVarBlock({
+              "select-option-item-bkcolor": "".concat(item.bkcolor)
+            }) : "",
+            "class": [item.cls ? item.cls : null],
+            "title": isEllipsis ? item.text : ""
+          }, {
+            default: () => {
+              return createVNode("div", {
+                "class": [this.ns.b("select-option-content"), item.textCls ? item.textCls : null],
+                "style": item.color ? this.ns.cssVarBlock({
+                  "select-option-item-color": "".concat(item.color)
+                }) : ""
+              }, [item.sysImage && createVNode(resolveComponent("iBizIcon"), {
+                "icon": item.sysImage
+              }, null), createVNode("span", {
+                "class": [isEllipsis && this.ns.be("select-option-content", "text")]
+              }, [item.text])]);
+            }
+          });
+        });
+      },
+      prefix: () => {
+        if (this.c.editorParams.type !== "round") {
+          return;
+        }
+        return this.valueText.split(",").map((text) => {
+          const codeListItem = this.getCodeListItem(text);
           return createVNode("div", {
-            "class": [this.ns.b("select-option-content"), item.textCls ? item.textCls : null],
-            "style": item.color ? this.ns.cssVarBlock({
-              "select-option-item-color": "".concat(item.color)
+            "class": [this.ns.b("select-option-text"), codeListItem == null ? void 0 : codeListItem.textCls],
+            "style": (codeListItem == null ? void 0 : codeListItem.color) || (codeListItem == null ? void 0 : codeListItem.bkcolor) ? this.ns.cssVarBlock({
+              "select-option-item-color": "".concat(codeListItem.color || ""),
+              "select-option-item-bkcolor": "".concat(codeListItem.bkcolor || "")
             }) : ""
-          }, [item.sysImage && createVNode(resolveComponent("iBizIcon"), {
-            "icon": item.sysImage
-          }, null), createVNode("span", {
-            "class": [isEllipsis && this.ns.be("select-option-content", "text")]
-          }, [item.text])]);
-        }
-      });
-    })) ? _slot : {
-      default: () => [_slot]
+          }, [(codeListItem == null ? void 0 : codeListItem.sysImage) && createVNode(resolveComponent("iBizIcon"), {
+            "icon": codeListItem == null ? void 0 : codeListItem.sysImage
+          }, null), text || ""]);
+        });
+      }
     });
     const readonlyContent = this.valueText.split(",").map((text) => {
       const codeListItem = this.getCodeListItem(text);
       return createVNode("span", {
         "class": [this.ns.b("readonly-text-item"), codeListItem == null ? void 0 : codeListItem.textCls],
         "style": (codeListItem == null ? void 0 : codeListItem.color) ? this.ns.cssVarBlock({
-          "readonly-text-item-color": "".concat(codeListItem.color)
+          "readonly-text-item-color": "".concat(codeListItem.color || ""),
+          "select-option-item-color": "".concat(codeListItem.color || ""),
+          "select-option-item-bkcolor": "".concat((this.c.editorParams.type === "round" ? codeListItem.bkcolor : "") || "")
         }) : ""
       }, [(codeListItem == null ? void 0 : codeListItem.sysImage) && createVNode(resolveComponent("iBizIcon"), {
         "icon": codeListItem == null ? void 0 : codeListItem.sysImage
@@ -345,7 +363,7 @@ const IBizDropdown = /* @__PURE__ */ defineComponent({
       }, [text]);
     }) : "-"]);
     return 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), this.c.editorParams.type === "round" && this.ns.m("round")],
       "style": this.cssVars
     }, [this.showFormDefaultContent && formDefaultContent, this.readonly ? readonlyContent : editContent]);
   }

package/es/editor/text-box/ibiz-input-number/ibiz-input-number.d.ts

@@ -37,6 +37,8 @@ export declare const IBizInputNumber: import("vue").DefineComponent<{
     max: number;
     min: number;
     currentFormatVal: import("vue").ComputedRef<string>;
+    enablethousands: import("vue").Ref<boolean>;
+    onInput: (value: string | number) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     change: (_value: unknown, _name?: string | undefined) => boolean;
     blur: (_event?: IData | undefined) => boolean;

package/es/editor/text-box/ibiz-input-number/ibiz-input-number.mjs

@@ -13,6 +13,7 @@ const IBizInputNumber = /* @__PURE__ */ defineComponent({
     emit
   }) {
     const ns = useNamespace("input-number");
+    const enablethousands = ref(false);
     const c = props.controller;
     const editorModel = c.model;
     const currentVal = ref(null);
@@ -25,6 +26,9 @@ const IBizInputNumber = /* @__PURE__ */ defineComponent({
       if (editorModel.editorParams.minvalue) {
         min = toNumber(editorModel.editorParams.minvalue);
       }
+      if (editorModel.editorParams.enablethousands) {
+        enablethousands.value = JSON.parse(editorModel.editorParams.enablethousands);
+      }
     }
     const isEditable = ref(false);
     const editorRef = ref();
@@ -34,17 +38,37 @@ const IBizInputNumber = /* @__PURE__ */ defineComponent({
       }
       return false;
     });
+    const numberconvertToStr = (num, decimalPlaces = 0) => {
+      const options = {
+        minimumFractionDigits: decimalPlaces,
+        maximumFractionDigits: decimalPlaces
+      };
+      return num.toLocaleString("en-US", options);
+    };
+    const convertToNumber = (str) => {
+      const stringWithoutCommas = str.replace(/,/g, "");
+      const originalNumber = parseFloat(stringWithoutCommas);
+      return originalNumber;
+    };
     watch(() => props.value, (newVal, oldVal) => {
       if (newVal !== oldVal) {
         const number = newVal != null && !Object.is(newVal, "") ? Number(newVal) : null;
-        currentVal.value = Number.isNaN(number) ? null : number;
+        if (!enablethousands.value) {
+          currentVal.value = Number.isNaN(number) ? null : number;
+        } else {
+          currentVal.value = Number.isNaN(number) ? null : numberconvertToStr(number, c.precision ? c.precision : 0);
+        }
       }
     }, {
       immediate: true
     });
     const currentFormatVal = computed(() => {
-      if (currentVal.value || currentVal.value === 0) {
-        return props.controller.formatValue(currentVal.value);
+      if (!enablethousands.value) {
+        if (currentVal.value || currentVal.value === 0) {
+          return props.controller.formatValue(currentVal.value);
+        }
+      } else if (currentVal.value || currentVal.value === 0) {
+        return numberconvertToStr(Number(currentVal.value), c.precision ? c.precision : 0);
       }
       return "";
     });
@@ -79,6 +103,24 @@ const IBizInputNumber = /* @__PURE__ */ defineComponent({
         emit("enter", e);
       }
     };
+    const debounce = (func, wait) => {
+      let timeout;
+      return (...args) => {
+        clearTimeout(timeout);
+        timeout = setTimeout(() => func.apply(this, args), wait);
+      };
+    };
+    const debouncedOnInput = debounce((value) => {
+      let data = null;
+      if (typeof value === "string") {
+        data = convertToNumber(value);
+      }
+      emit("change", data);
+    }, 300);
+    const onInput = (value) => {
+      currentVal.value = value;
+      debouncedOnInput(value);
+    };
     return {
       ns,
       c,
@@ -93,7 +135,9 @@ const IBizInputNumber = /* @__PURE__ */ defineComponent({
       showFormDefaultContent,
       max,
       min,
-      currentFormatVal
+      currentFormatVal,
+      enablethousands,
+      onInput
     };
   },
   render() {
@@ -107,7 +151,7 @@ const IBizInputNumber = /* @__PURE__ */ defineComponent({
         content += unitName;
       }
     } else {
-      content = [createVNode(resolveComponent("el-input-number"), mergeProps({
+      content = [!this.enablethousands ? createVNode(resolveComponent("el-input-number"), mergeProps({
         "ref": "editorRef",
         "class": [this.ns.b("input")],
         "model-value": this.currentVal,
@@ -121,6 +165,16 @@ const IBizInputNumber = /* @__PURE__ */ defineComponent({
         "onFocus": this.onFocus,
         "onBlur": this.onBlur,
         "onKeyup": this.handleKeyUp
+      }, this.$attrs), null) : createVNode(resolveComponent("el-input"), mergeProps({
+        "ref": "editorRef",
+        "class": [this.ns.b("input")],
+        "model-value": this.currentVal,
+        "onInput": this.onInput,
+        "placeholder": this.c.placeHolder,
+        "disabled": this.disabled,
+        "onFocus": this.onFocus,
+        "onBlur": this.onBlur,
+        "onKeyup": this.handleKeyUp
       }, this.$attrs), null), unitName && createVNode("i", {
         "class": this.ns.e("unit")
       }, [unitName])];

package/es/index.mjs

@@ -75,6 +75,8 @@ export { HtmlPortlet } from './control/dashboard/portlet/html-portlet/html-portl
 export { IBizHtmlPortlet } from './control/dashboard/portlet/html-portlet/index.mjs';
 export { ActionBarPortlet } from './control/dashboard/portlet/actionbar-portlet/actionbar-portlet.mjs';
 export { IBizActionBarPortlet } from './control/dashboard/portlet/actionbar-portlet/index.mjs';
+export { ReportPortlet } from './control/dashboard/portlet/report-portlet/report-portlet.mjs';
+export { IBizReportPortlet } from './control/dashboard/portlet/report-portlet/index.mjs';
 export { IBizDashboardControl } from './control/dashboard/index.mjs';
 export { IBizCalendarControl } from './control/calendar/index.mjs';
 export { IBizKanbanControl } from './control/kanban/index.mjs';

package/es/view-engine/edit-view.engine.mjs

@@ -63,7 +63,7 @@ class EditViewEngine extends ViewEngineBase {
     modal.hooks.shouldDismiss.tapPromise(async (context) => {
       const uiDomain = ibiz.uiDomainManager.get(this.view.context.srfsessionid);
       const isChange = (this.form.state.modified || uiDomain.dataModification) && this.view.model.enableDirtyChecking === true;
-      if (isChange && this.form.model.enableAutoSave) {
+      if (isChange && this.form.model.enableAutoSave && !uiDomain.dataModification) {
         await this.form.immediateAutoSave();
       } else if (isChange && context.allowClose == null) {
         const isAllow = await ibiz.confirm.error({

package/lib/control/dashboard/index.cjs

@@ -18,6 +18,7 @@ var index$4 = require('./portlet/rawitem-portlet/index.cjs');
 var index$5 = require('./portlet/list-portlet/index.cjs');
 var index$6 = require('./portlet/html-portlet/index.cjs');
 var index$7 = require('./portlet/actionbar-portlet/index.cjs');
+var index$8 = require('./portlet/report-portlet/index.cjs');
 var containerPortlet = require('./portlet/container-portlet/container-portlet.cjs');
 var viewPortlet = require('./portlet/view-portlet/view-portlet.cjs');
 var menuPortlet = require('./portlet/menu-portlet/menu-portlet.cjs');
@@ -26,6 +27,7 @@ var rawitemPortlet = require('./portlet/rawitem-portlet/rawitem-portlet.cjs');
 var listPortlet = require('./portlet/list-portlet/list-portlet.cjs');
 var htmlPortlet = require('./portlet/html-portlet/html-portlet.cjs');
 var actionbarPortlet = require('./portlet/actionbar-portlet/actionbar-portlet.cjs');
+var reportPortlet = require('./portlet/report-portlet/report-portlet.cjs');
 
 "use strict";
 const IBizDashboardControl = vue3Util.withInstall(
@@ -47,6 +49,7 @@ const IBizDashboardControl = vue3Util.withInstall(
     v.use(index$5.IBizListPortlet);
     v.use(index$6.IBizHtmlPortlet);
     v.use(index$7.IBizActionBarPortlet);
+    v.use(index$8.IBizReportPortlet);
   }
 );
 
@@ -59,6 +62,7 @@ exports.IBizRawItemPortlet = index$4.IBizRawItemPortlet;
 exports.IBizListPortlet = index$5.IBizListPortlet;
 exports.IBizHtmlPortlet = index$6.IBizHtmlPortlet;
 exports.IBizActionBarPortlet = index$7.IBizActionBarPortlet;
+exports.IBizReportPortlet = index$8.IBizReportPortlet;
 exports.ContainerPortlet = containerPortlet.ContainerPortlet;
 exports.ViewPortlet = viewPortlet.ViewPortlet;
 exports.MenuPortlet = menuPortlet.MenuPortlet;
@@ -67,5 +71,6 @@ exports.RawItemPortlet = rawitemPortlet.RawItemPortlet;
 exports.ListPortlet = listPortlet.ListPortlet;
 exports.HtmlPortlet = htmlPortlet.HtmlPortlet;
 exports.ActionBarPortlet = actionbarPortlet.ActionBarPortlet;
+exports.ReportPortlet = reportPortlet.ReportPortlet;
 exports.IBizDashboardControl = IBizDashboardControl;
 exports.default = IBizDashboardControl;

package/lib/control/dashboard/portlet/index.cjs

@@ -9,6 +9,7 @@ var index$4 = require('./rawitem-portlet/index.cjs');
 var index$5 = require('./list-portlet/index.cjs');
 var index$6 = require('./html-portlet/index.cjs');
 var index$7 = require('./actionbar-portlet/index.cjs');
+var index$8 = require('./report-portlet/index.cjs');
 var containerPortlet = require('./container-portlet/container-portlet.cjs');
 var viewPortlet = require('./view-portlet/view-portlet.cjs');
 var menuPortlet = require('./menu-portlet/menu-portlet.cjs');
@@ -17,6 +18,7 @@ var rawitemPortlet = require('./rawitem-portlet/rawitem-portlet.cjs');
 var listPortlet = require('./list-portlet/list-portlet.cjs');
 var htmlPortlet = require('./html-portlet/html-portlet.cjs');
 var actionbarPortlet = require('./actionbar-portlet/actionbar-portlet.cjs');
+var reportPortlet = require('./report-portlet/report-portlet.cjs');
 
 "use strict";
 
@@ -29,6 +31,7 @@ exports.IBizRawItemPortlet = index$4.IBizRawItemPortlet;
 exports.IBizListPortlet = index$5.IBizListPortlet;
 exports.IBizHtmlPortlet = index$6.IBizHtmlPortlet;
 exports.IBizActionBarPortlet = index$7.IBizActionBarPortlet;
+exports.IBizReportPortlet = index$8.IBizReportPortlet;
 exports.ContainerPortlet = containerPortlet.ContainerPortlet;
 exports.ViewPortlet = viewPortlet.ViewPortlet;
 exports.MenuPortlet = menuPortlet.MenuPortlet;
@@ -37,3 +40,4 @@ exports.RawItemPortlet = rawitemPortlet.RawItemPortlet;
 exports.ListPortlet = listPortlet.ListPortlet;
 exports.HtmlPortlet = htmlPortlet.HtmlPortlet;
 exports.ActionBarPortlet = actionbarPortlet.ActionBarPortlet;
+exports.ReportPortlet = reportPortlet.ReportPortlet;

package/lib/control/dashboard/portlet/report-portlet/index.cjs

@@ -0,0 +1,18 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var runtime = require('@ibiz-template/runtime');
+var vue3Util = require('@ibiz-template/vue3-util');
+var reportPortlet = require('./report-portlet.cjs');
+var reportPortlet_provider = require('./report-portlet.provider.cjs');
+
+"use strict";
+const IBizReportPortlet = vue3Util.withInstall(reportPortlet.ReportPortlet, function(v) {
+  v.component(reportPortlet.ReportPortlet.name, reportPortlet.ReportPortlet);
+  runtime.registerPortletProvider("REPORT", () => new reportPortlet_provider.ReportPortletProvider());
+});
+
+exports.ReportPortlet = reportPortlet.ReportPortlet;
+exports.IBizReportPortlet = IBizReportPortlet;
+exports.default = IBizReportPortlet;

package/lib/control/dashboard/portlet/report-portlet/report-portlet.cjs

@@ -0,0 +1,66 @@
+'use strict';
+
+var vue = require('vue');
+var vue3Util = require('@ibiz-template/vue3-util');
+var runtime = require('@ibiz-template/runtime');
+
+"use strict";
+function _isSlot(s) {
+  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
+}
+const ReportPortlet = /* @__PURE__ */ vue.defineComponent({
+  name: "IBizReportPortlet",
+  props: {
+    modelData: {
+      type: Object,
+      required: true
+    },
+    controller: {
+      type: runtime.ReportPortletController,
+      required: true
+    }
+  },
+  setup(props) {
+    var _a, _b;
+    const ns = vue3Util.useNamespace("portlet-".concat((_a = props.modelData.portletType) == null ? void 0 : _a.toLowerCase()));
+    const report = (_b = props.modelData.controls) == null ? void 0 : _b.find((item) => {
+      return item.controlType === runtime.ControlType.REPORT_PANEL;
+    });
+    let timerTag;
+    vue.onMounted(() => {
+      const timer = props.controller.model.timer;
+      if (timer && timer > 0) {
+        timerTag = setInterval(() => {
+          props.controller.refresh();
+        }, timer);
+      }
+    });
+    vue.onBeforeUnmount(() => {
+      clearInterval(timerTag);
+    });
+    return {
+      ns,
+      report
+    };
+  },
+  render() {
+    let _slot;
+    const classArr = [this.ns.b(), this.ns.m(this.modelData.codeName), ...this.controller.containerClass];
+    const {
+      context,
+      params
+    } = this.controller;
+    return vue.createVNode(vue.resolveComponent("iBizPortletLayout"), {
+      "controller": this.controller,
+      "class": classArr
+    }, _isSlot(_slot = vue.h(vue.resolveComponent("IBizControlShell"), {
+      context,
+      params,
+      modelData: this.report
+    })) ? _slot : {
+      default: () => [_slot]
+    });
+  }
+});
+
+exports.ReportPortlet = ReportPortlet;

package/lib/control/dashboard/portlet/report-portlet/report-portlet.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 ReportPortletProvider {
+  constructor() {
+    __publicField(this, "component", "IBizReportPortlet");
+  }
+  async createController(portletModel, dashboard, parent) {
+    const c = new runtime.ReportPortletController(portletModel, dashboard, parent);
+    await c.init();
+    return c;
+  }
+}
+
+exports.ReportPortletProvider = ReportPortletProvider;

package/lib/control/form/form-detail/form-mdctrl/form-mdctrl-form/form-mdctrl-form.cjs

@@ -47,6 +47,31 @@ const FormMDCtrlForm = /* @__PURE__ */ vue.defineComponent({
       formProvider,
       model
     } = this.controller;
+    if (model.detailStyle === "STYLE2") {
+      return vue.createVNode(vue.resolveComponent("iBizMDCtrlContainer2"), {
+        "controller": this.controller,
+        "items": state.items
+      }, {
+        item: ({
+          data
+        }) => {
+          if (!formProvider) {
+            return vue.createVNode("div", null, [ibiz.i18n.t("control.form.formMDctrlForm.noFindProvider")]);
+          }
+          const formComponent = vue.h(vue.resolveComponent(formProvider.component), {
+            class: this.ns.be("item", "form"),
+            key: data.id,
+            modelData: model.contentControl,
+            context: data.context,
+            params: data.params,
+            onCreated: (event) => {
+              this.onCreated(data.id, event);
+            }
+          });
+          return formComponent;
+        }
+      });
+    }
     return vue.createVNode(vue.resolveComponent("iBizMDCtrlContainer"), {
       "class": this.ns.b(),
       "items": state.items,

package/lib/control/form/form-detail/form-mdctrl/index.cjs

@@ -10,6 +10,7 @@ var formMdctrlMd = require('./form-mdctrl-md/form-mdctrl-md.cjs');
 var formMdctrlRepeater = require('./form-mdctrl-repeater/form-mdctrl-repeater.cjs');
 var formMdctrl_provider = require('./form-mdctrl.provider.cjs');
 var mdctrlContainer = require('./mdctrl-container/mdctrl-container.cjs');
+var mdctrlContainer2 = require('./mdctrl-container2/mdctrl-container2.cjs');
 
 "use strict";
 const IBizFormMDCtrl = vue3Util.withInstall(formMdctrl.FormMDCtrl, function(v) {
@@ -18,6 +19,7 @@ const IBizFormMDCtrl = vue3Util.withInstall(formMdctrl.FormMDCtrl, function(v) {
   v.component(formMdctrlMd.FormMDCtrlMD.name, formMdctrlMd.FormMDCtrlMD);
   v.component(formMdctrlRepeater.FormMDCtrlRepeater.name, formMdctrlRepeater.FormMDCtrlRepeater);
   v.component(mdctrlContainer.MDCtrlContainer.name, mdctrlContainer.MDCtrlContainer);
+  v.component(mdctrlContainer2.MDCtrlContainer2.name, mdctrlContainer2.MDCtrlContainer2);
   runtime.registerFormDetailProvider("MDCTRL", () => new formMdctrl_provider.FormMDCtrlProvider());
 });