@ibiz-template/vue3-components 0.7.38-alpha.21 → 0.7.38-alpha.43

package/es/control/drtab/drtab.controller.mjs

@@ -19,6 +19,18 @@ class DRTabController extends ControlController {
      * @type {AppCounter}
      */
     __publicField(this, "counter");
+    /**
+     * @description 启用缓存
+     * @type {boolean}
+     * @memberof DRTabController
+     */
+    __publicField(this, "srfCachePos", false);
+    /**
+     * @description 缓存标记
+     * @type {string}
+     * @memberof DRTabController
+     */
+    __publicField(this, "srfCacheKeyTempl", "");
     /**
      * Router 对象
      *
@@ -57,6 +69,19 @@ class DRTabController extends ControlController {
   get routeDepth() {
     return this.view.modal.routeDepth;
   }
+  /**
+   * @description 选中缓存标识
+   * @readonly
+   * @type {string}
+   * @memberof DRTabController
+   */
+  get storageTag() {
+    if (this.srfCacheKeyTempl) {
+      return this.srfCacheKeyTempl;
+    }
+    const userId = this.context.srfuserid;
+    return "".concat(userId, "_").concat(this.view.model.codeName, "_").concat(this.model.codeName);
+  }
   /**
    * 设置 Router 对象
    *
@@ -97,18 +122,13 @@ class DRTabController extends ControlController {
   async onCreated() {
     await super.onCreated();
     await this.initCounter();
-  }
-  /**
-   * 部件参数解析
-   *
-   * @protected
-   * @memberof ControlController
-   */
-  handleControlParams() {
-    super.handleControlParams();
+    this.srfCacheKeyTempl = this.controlParams.srfcachekeytempl || "";
     if (this.controlParams.showmore) {
       this.state.showMore = this.controlParams.showmore === "true";
     }
+    if (this.controlParams.srfcachepos) {
+      this.srfCachePos = this.controlParams.srfcachepos.toLowerCase() === "true";
+    }
   }
   /**
    * 通过计数器数据，计算项状态
@@ -316,6 +336,10 @@ class DRTabController extends ControlController {
       this.state.activeName = this.view.state.srfnav;
     } else {
       this.state.activeName = drTabPages[0].tag;
+      if (this.srfCachePos && localStorage.getItem(this.storageTag)) {
+        const activeName = localStorage.getItem(this.storageTag);
+        this.state.activeName = activeName;
+      }
     }
     const isRoutePushed = !!this.routeDepth && hasSubRoute(this.routeDepth);
     this.handleTabChange(isRoutePushed);
@@ -333,6 +357,9 @@ class DRTabController extends ControlController {
     const drBarItem = (_a = this.model.dedrtabPages) == null ? void 0 : _a.find(
       (item) => item.id === activeName
     );
+    if (this.srfCachePos && activeName) {
+      localStorage.setItem("".concat(this.storageTag), activeName);
+    }
     if (drBarItem) {
       this.setVisible("navPos");
       this.openNavPosView(drBarItem, isRoutePushed);

package/es/control/form/form-detail/form-group-panel/form-group-panel.mjs

@@ -126,7 +126,7 @@ const FormGroupPanel = /* @__PURE__ */ defineComponent({
       }, [!state.isShowMore ? ibiz.i18n.t("control.form.formGroupPanel.showMore") : ibiz.i18n.t("app.retract")])]);
     }
     return createVNode("div", {
-      "id": this.modelData.id,
+      "id": "".concat(this.controller.form.view.model.codeName, "_").concat(this.controller.form.model.codeName, "_").concat(this.modelData.codeName),
       "class": classArr,
       "onClick": (event) => this.controller.onClick(event)
     }, [header, createVNode("div", {

package/es/control/form/form-detail/form-item/composite-form-item/composite-form-item.d.ts

@@ -0,0 +1,35 @@
+import { PropType } from 'vue';
+import { IDEFormItem } from '@ibiz/model-core';
+import { FormItemController } from '@ibiz-template/runtime';
+export declare const CompositeFormItem: import("vue").DefineComponent<{
+    modelData: {
+        type: PropType<IDEFormItem>;
+        required: true;
+    };
+    controller: {
+        type: typeof FormItemController;
+        required: true;
+    };
+    attrs: {
+        type: PropType<IData>;
+        required: false;
+    };
+}, {
+    c: FormItemController;
+    extraParams: import("vue").Ref<{}>;
+    onValueChange: (val: unknown, name?: string) => void;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    modelData: {
+        type: PropType<IDEFormItem>;
+        required: true;
+    };
+    controller: {
+        type: typeof FormItemController;
+        required: true;
+    };
+    attrs: {
+        type: PropType<IData>;
+        required: false;
+    };
+}>>, {}, {}>;
+export default CompositeFormItem;

package/es/control/form/form-detail/form-item/composite-form-item/composite-form-item.mjs

@@ -0,0 +1,93 @@
+import { defineComponent, ref, resolveComponent, h, createVNode } from 'vue';
+import { FormItemController } from '@ibiz-template/runtime';
+
+"use strict";
+const CompositeFormItem = /* @__PURE__ */ defineComponent({
+  name: "IBizCompositeFormItem",
+  props: {
+    modelData: {
+      type: Object,
+      required: true
+    },
+    controller: {
+      type: FormItemController,
+      required: true
+    },
+    attrs: {
+      type: Object,
+      required: false
+    }
+  },
+  setup(props) {
+    var _a, _b, _c, _d;
+    const c = props.controller;
+    const onValueChange = (val, name) => {
+      props.controller.setDataValue(val, name);
+    };
+    const extraParams = ref({});
+    let emptyHiddenUnit = ibiz.config.form.emptyHiddenUnit;
+    const emptyhiddenunit = (_b = (_a = props.controller.form) == null ? void 0 : _a.controlParams) == null ? void 0 : _b.emptyhiddenunit;
+    if (emptyhiddenunit) {
+      emptyHiddenUnit = Object.is(emptyhiddenunit, "true");
+    }
+    const editorParams = ((_d = (_c = props.controller.editor) == null ? void 0 : _c.model) == null ? void 0 : _d.editorParams) || {};
+    const {
+      EMPTYHIDDENUNIT
+    } = editorParams;
+    if (EMPTYHIDDENUNIT) {
+      emptyHiddenUnit = Object.is(EMPTYHIDDENUNIT, "true");
+    }
+    Object.assign(extraParams.value, {
+      emptyHiddenUnit
+    });
+    return {
+      c,
+      extraParams,
+      onValueChange
+    };
+  },
+  render() {
+    var _a, _b, _c, _d, _e;
+    if (!this.c.state.visible || ((_a = this.controller.model.editor) == null ? void 0 : _a.editorType) === "HIDDEN") {
+      return null;
+    }
+    let editor = null;
+    const editMode = (_d = (_c = (_b = this.controller.editor) == null ? void 0 : _b.model) == null ? void 0 : _c.editorParams) == null ? void 0 : _d.editMode;
+    const editorProps = {
+      style: (_e = this.controller.editor) == null ? void 0 : _e.style,
+      value: this.controller.value,
+      data: this.controller.data,
+      controller: this.controller.editor,
+      disabled: this.controller.state.disabled,
+      readonly: this.controller.state.readonly,
+      onChange: this.onValueChange,
+      extraParams: this.extraParams,
+      controlParams: editMode ? {
+        ...this.controller.form.controlParams,
+        editmode: editMode
+      } : this.controller.form.controlParams,
+      onFocus: (event) => this.c.onFocus(event),
+      onBlur: (event) => this.c.onBlur(event),
+      onEnter: (event) => this.controller.onEnter(event),
+      onClick: (event, params) => this.controller.onClick(event, params),
+      ...this.attrs
+    };
+    if (this.c.form.state.isLoaded) {
+      if (this.$slots.default) {
+        editor = this.$slots.default(editorProps);
+      } else if (this.controller.editorProvider) {
+        const component = resolveComponent(this.controller.editorProvider.formEditor);
+        editor = h(component, {
+          ...editorProps
+        });
+      } else {
+        editor = createVNode(resolveComponent("not-supported-editor"), {
+          "modelData": this.modelData.editor
+        }, null);
+      }
+    }
+    return editor;
+  }
+});
+
+export { CompositeFormItem, CompositeFormItem as default };

package/es/control/form/form-detail/form-item/form-item.css

@@ -1 +1 @@
-.ibiz-form-item{border-color:var(--ibiz-color-border);--ibiz-form-item-label-color:var(--ibiz-color-text-1);--ibiz-form-item-text-color:var(--ibiz-color-text-2);--ibiz-form-item-hover-color:var(--ibiz-color-text-0);--ibiz-form-item-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-form-item-readonly-color:var(--ibiz-color-disabled-text);--ibiz-form-item-border-color:transparent;--ibiz-form-item-font-size:var(--ibiz-font-size-regular);--ibiz-form-item-placeholder-color:var(--ibiz-color-text-3);--ibiz-form-item-disabled-color:var(--ibiz-color-disabled-text);--ibiz-form-item-disabled-bg-color:var(--ibiz-color-disabled-fill);--ibiz-form-item-disabled-border-color:var(--ibiz-color-disabled-border);--ibiz-form-item-active-bg:var(--ibiz-color-fill-2);--ibiz-form-item-active-border:var(--ibiz-active-bg);--ibiz-form-item-focus-bg:var(--ibiz-color-fill-0);--ibiz-form-item-focus-border:var(--ibiz-color-focus-border);--ibiz-form-item-line-height:var(--ibiz-editor-default-line-height);--ibiz-form-item-font-weight:var(--ibiz-font-weight-regular);--ibiz-form-item-hover-edit-padding:var(--ibiz-spacing-none) 11px}
+.ibiz-form-item{border-color:var(--ibiz-color-border);--ibiz-form-item-label-color:var(--ibiz-color-text-1);--ibiz-form-item-text-color:var(--ibiz-color-text-2);--ibiz-form-item-hover-color:var(--ibiz-color-text-0);--ibiz-form-item-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-form-item-readonly-color:var(--ibiz-color-disabled-text);--ibiz-form-item-border-color:transparent;--ibiz-form-item-font-size:var(--ibiz-font-size-regular);--ibiz-form-item-placeholder-color:var(--ibiz-color-text-3);--ibiz-form-item-disabled-color:var(--ibiz-color-disabled-text);--ibiz-form-item-disabled-bg-color:var(--ibiz-color-disabled-fill);--ibiz-form-item-disabled-border-color:var(--ibiz-color-disabled-border);--ibiz-form-item-active-bg:var(--ibiz-color-fill-2);--ibiz-form-item-active-border:var(--ibiz-active-bg);--ibiz-form-item-focus-bg:var(--ibiz-color-fill-0);--ibiz-form-item-focus-border:var(--ibiz-color-focus-border);--ibiz-form-item-line-height:var(--ibiz-editor-default-line-height);--ibiz-form-item-font-weight:var(--ibiz-font-weight-regular);--ibiz-form-item-hover-edit-padding:var(--ibiz-spacing-none) 11px}.ibiz-form-item.is-compositeItem{--ibiz-form-item-compositeItem-gap:var(--ibiz-spacing-tight)}.ibiz-form-item.is-compositeItem .ibiz-form-item-container__editor{display:flex;gap:var(--ibiz-form-item-compositeItem-gap)}

package/es/control/form/form-detail/form-item/form-item.d.ts

@@ -18,6 +18,7 @@ export declare const FormItem: import("vue").DefineComponent<{
 }, {
     ns: import("@ibiz-template/core").Namespace;
     c: FormItemController;
+    extraParams: import("vue").Ref<{}>;
     onValueChange: (val: unknown, name?: string) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {

package/es/control/form/form-detail/form-item/form-item.mjs

@@ -1,7 +1,8 @@
-import { isVNode, defineComponent, resolveComponent, h, createVNode } from 'vue';
+import { isVNode, defineComponent, ref, createVNode, resolveComponent, h } from 'vue';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import './form-item.css';
 import { FormItemController } from '@ibiz-template/runtime';
+import { CompositeFormItem } from './composite-form-item/composite-form-item.mjs';
 
 "use strict";
 function _isSlot(s) {
@@ -24,14 +25,32 @@ const FormItem = /* @__PURE__ */ defineComponent({
     }
   },
   setup(props) {
+    var _a, _b, _c, _d;
     const ns = useNamespace("form-item");
     const c = props.controller;
     const onValueChange = (val, name) => {
       props.controller.setDataValue(val, name);
     };
+    const extraParams = ref({});
+    let emptyHiddenUnit = ibiz.config.form.emptyHiddenUnit;
+    const emptyhiddenunit = (_b = (_a = props.controller.form) == null ? void 0 : _a.controlParams) == null ? void 0 : _b.emptyhiddenunit;
+    if (emptyhiddenunit) {
+      emptyHiddenUnit = Object.is(emptyhiddenunit, "true");
+    }
+    const editorParams = ((_d = (_c = props.controller.editor) == null ? void 0 : _c.model) == null ? void 0 : _d.editorParams) || {};
+    const {
+      EMPTYHIDDENUNIT
+    } = editorParams;
+    if (EMPTYHIDDENUNIT) {
+      emptyHiddenUnit = Object.is(EMPTYHIDDENUNIT, "true");
+    }
+    Object.assign(extraParams.value, {
+      emptyHiddenUnit
+    });
     return {
       ns,
       c,
+      extraParams,
       onValueChange
     };
   },
@@ -41,42 +60,58 @@ const FormItem = /* @__PURE__ */ defineComponent({
       return null;
     }
     let editor = null;
-    const editMode = (_d = (_c = (_b = this.controller.editor) == null ? void 0 : _b.model) == null ? void 0 : _c.editorParams) == null ? void 0 : _d.editMode;
-    const editorProps = {
-      style: (_e = this.controller.editor) == null ? void 0 : _e.style,
-      value: this.controller.value,
-      data: this.controller.data,
-      controller: this.controller.editor,
-      disabled: this.controller.state.disabled,
-      readonly: this.controller.state.readonly,
-      onChange: this.onValueChange,
-      controlParams: editMode ? {
-        ...this.controller.form.controlParams,
-        editmode: editMode
-      } : this.controller.form.controlParams,
-      onFocus: (event) => this.c.onFocus(event),
-      onBlur: (event) => this.c.onBlur(event),
-      onEnter: (event) => this.controller.onEnter(event),
-      onClick: (event, params) => this.controller.onClick(event, params),
-      ...this.attrs
-    };
-    if (this.c.form.state.isLoaded) {
-      if (this.$slots.default) {
-        editor = this.$slots.default(editorProps);
-      } else if (this.controller.editorProvider) {
-        const component = resolveComponent(this.controller.editorProvider.formEditor);
-        editor = h(component, {
-          ...editorProps
-        });
-      } else {
-        editor = createVNode(resolveComponent("not-supported-editor"), {
-          "modelData": this.modelData.editor
+    const compositeItem = this.controller.model.compositeItem;
+    if (compositeItem) {
+      const {
+        editorItems = []
+      } = this.controller.model.editor || {};
+      editor = editorItems.map((item) => {
+        const controller = this.controller.form.details[item.id];
+        return createVNode(CompositeFormItem, {
+          "modelData": controller.model,
+          "controller": controller,
+          "attrs": this.attrs
         }, null);
+      });
+    } else {
+      const editMode = (_d = (_c = (_b = this.controller.editor) == null ? void 0 : _b.model) == null ? void 0 : _c.editorParams) == null ? void 0 : _d.editMode;
+      const editorProps = {
+        style: (_e = this.controller.editor) == null ? void 0 : _e.style,
+        value: this.controller.value,
+        data: this.controller.data,
+        controller: this.controller.editor,
+        disabled: this.controller.state.disabled,
+        readonly: this.controller.state.readonly,
+        onChange: this.onValueChange,
+        extraParams: this.extraParams,
+        controlParams: editMode ? {
+          ...this.controller.form.controlParams,
+          editmode: editMode
+        } : this.controller.form.controlParams,
+        onFocus: (event) => this.c.onFocus(event),
+        onBlur: (event) => this.c.onBlur(event),
+        onEnter: (event) => this.controller.onEnter(event),
+        onClick: (event, params) => this.controller.onClick(event, params),
+        ...this.attrs
+      };
+      if (this.c.form.state.isLoaded) {
+        if (this.$slots.default) {
+          editor = this.$slots.default(editorProps);
+        } else if (this.controller.editorProvider) {
+          const component = resolveComponent(this.controller.editorProvider.formEditor);
+          editor = h(component, {
+            ...editorProps
+          });
+        } else {
+          editor = createVNode(resolveComponent("not-supported-editor"), {
+            "modelData": this.modelData.editor
+          }, null);
+        }
       }
     }
     return createVNode(resolveComponent("iBizFormItemContainer"), {
-      "id": this.c.model.id,
-      "class": [this.ns.b(), this.ns.m(this.modelData.id), ...this.controller.containerClass],
+      "id": "".concat(this.controller.form.view.model.codeName, "_").concat(this.controller.form.model.codeName, "_").concat(this.modelData.codeName),
+      "class": [this.ns.b(), this.ns.m(this.modelData.id), this.ns.is("compositeItem", compositeItem), ...this.controller.containerClass],
       "style": this.modelData.cssStyle,
       "required": this.c.state.required,
       "error": this.c.state.error,

package/es/control/form/form-detail/form-item/index.d.ts

@@ -15,6 +15,7 @@ export declare const IBizFormItem: import("@ibiz-template/vue3-util").TypeWithIn
 }, {
     ns: import("@ibiz-template/core").Namespace;
     c: import("@ibiz-template/runtime").FormItemController;
+    extraParams: import("vue").Ref<{}>;
     onValueChange: (val: unknown, name?: string | undefined) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {