@ibiz-template/vue3-components 0.7.38-alpha.56 → 0.7.40-alpha.9

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

@@ -1,124 +1,97 @@
-import { defineComponent, ref, computed, createVNode, resolveComponent } from 'vue';
+import { defineComponent, ref, watch, createVNode, resolveComponent } from 'vue';
 import { useNamespace, IBizIcon } from '@ibiz-template/vue3-util';
-import './form-item-container.css';
 import { showTitle } from '@ibiz-template/core';
+import './form-item-container.css';
 
 "use strict";
 const IBizFormItemContainer = /* @__PURE__ */ defineComponent({
   name: "IBizFormItemContainer",
   props: {
-    required: {
-      type: Boolean,
-      required: true
-    },
-    error: {
-      type: String
-    },
-    label: {
-      type: String
-    },
-    labelClass: {
-      type: Array
-    },
-    labelPos: {
-      type: String,
+    controller: {
+      type: Object,
       required: true
-    },
-    labelWidth: {
-      type: Number,
-      default: 130
-    },
-    enableInputTip: {
-      type: Boolean
-    },
-    inputTip: {
-      type: String
-    },
-    inputTipUrl: {
-      type: String
-    },
-    inputTipClosable: {
-      type: Boolean
-    },
-    labelSysImg: {
-      type: Object
     }
   },
   setup(props) {
     const ns = useNamespace("form-item-container");
-    const tooltip = ref();
-    const cssVars = computed(() => {
-      if (props.labelWidth !== 130) {
-        return ns.cssVarBlock({
-          "label-width": "".concat(props.labelWidth, "px")
-        });
-      }
-      return {};
+    const c = props.controller;
+    const visible = ref(false);
+    const {
+      sysImage,
+      enableInputTip,
+      labelPos
+    } = c.model;
+    watch(() => visible.value, () => {
+      if (visible.value)
+        c.loadInputTip();
     });
-    const hiddenTooltip = () => {
-      if (tooltip.value) {
-        tooltip.value.hide();
-      }
+    const renderInputTip = () => {
+      return createVNode(resolveComponent("el-tooltip"), {
+        "effect": "light",
+        "visible": visible.value,
+        "onUpdate:visible": ($event) => visible.value = $event,
+        "popper-class": ns.e("popper"),
+        "disabled": !enableInputTip,
+        "placement": labelPos === "RIGHT" ? "right" : "left"
+      }, {
+        default: () => {
+          return createVNode("div", {
+            "class": [ns.em("label", "content"), ns.is("tooltip", enableInputTip)]
+          }, [enableInputTip && createVNode("ion-icon", {
+            "name": "bulb-outline",
+            "class": ns.em("label", "icon")
+          }, null), sysImage && createVNode(IBizIcon, {
+            "class": ns.em("label", "icon"),
+            "icon": sysImage
+          }, null), createVNode("div", {
+            "class": ns.em("label", "text")
+          }, [c.labelCaption])]);
+        },
+        content: () => {
+          return createVNode("div", {
+            "class": ns.em("popper", "content")
+          }, [createVNode("div", {
+            "class": ns.em("popper", "tooltip"),
+            "innerHTML": c.state.inputTip
+          }, null), c.state.inputTipUrl && createVNode("a", {
+            "target": "_blank",
+            "href": c.state.inputTipUrl,
+            "title": ibiz.i18n.t("component.formItemContainer.more")
+          }, [ibiz.i18n.t("component.formItemContainer.more")])]);
+        }
+      });
     };
     const renderLabel = () => {
-      const classList = [ns.e("label"), ...props.labelClass || []];
-      if (props.enableInputTip) {
-        return createVNode(resolveComponent("el-tooltip"), {
-          "effect": "light",
-          "offset": 4,
-          "popper-class": ns.e("popper"),
-          "ref": "tooltip"
-        }, {
-          default: () => {
-            return createVNode("div", {
-              "class": classList
-            }, [props.labelSysImg && createVNode(IBizIcon, {
-              "class": ns.em("label", "icon"),
-              "icon": props.labelSysImg
-            }, null), props.label]);
-          },
-          content: () => {
-            return createVNode("div", {
-              "class": ns.em("label", "tooltip")
-            }, [props.inputTip || props.label, props.inputTipUrl && createVNode("a", {
-              "href": props.inputTipUrl,
-              "target": "_blank"
-            }, [ibiz.i18n.t("component.formItemContainer.more")]), props.inputTipClosable && createVNode("ion-icon", {
-              "name": "close-circle",
-              "onClick": hiddenTooltip
-            }, null)]);
-          }
-        });
-      }
       return createVNode("div", {
-        "class": classList,
-        "title": showTitle(props.label)
-      }, [props.labelSysImg && createVNode(IBizIcon, {
-        "class": ns.em("label", "icon"),
-        "icon": props.labelSysImg
-      }, null), props.label]);
+        "title": enableInputTip ? void 0 : showTitle(c.labelCaption),
+        "class": [ns.e("label"), ...c.labelClass || []]
+      }, [renderInputTip()]);
     };
     return {
       ns,
-      cssVars,
-      tooltip,
       renderLabel
     };
   },
   render() {
     var _a, _b;
+    const {
+      labelPos,
+      labelWidth
+    } = this.controller.model;
     const content = createVNode("div", {
-      "class": [this.ns.e("content"), this.ns.em("content", "label-".concat(this.labelPos.toLowerCase()))]
+      "class": [this.ns.e("content"), this.ns.em("content", "label-".concat(labelPos == null ? void 0 : labelPos.toLowerCase()))]
     }, [createVNode("div", {
       "class": [this.ns.e("editor")]
-    }, [(_b = (_a = this.$slots).default) == null ? void 0 : _b.call(_a)]), this.error ? createVNode("div", {
-      "title": showTitle(this.error),
+    }, [(_b = (_a = this.$slots).default) == null ? void 0 : _b.call(_a)]), this.controller.state.error ? createVNode("div", {
+      "title": showTitle(this.controller.state.error),
       "class": [this.ns.e("error")]
-    }, [this.error]) : null]);
+    }, [this.controller.state.error]) : null]);
     return createVNode("div", {
-      "class": [this.ns.b(), this.ns.m(this.labelPos.toLowerCase()), this.ns.is("required", this.required), this.ns.is("error", !!this.error)],
-      "style": this.cssVars
-    }, [this.labelPos === "LEFT" || this.labelPos === "TOP" ? this.renderLabel() : null, content, this.labelPos === "RIGHT" || this.labelPos === "BOTTOM" ? this.renderLabel() : null]);
+      "class": [this.ns.b(), this.ns.m(labelPos == null ? void 0 : labelPos.toLowerCase()), this.ns.is("required", this.controller.state.required), this.ns.is("error", !!this.controller.state.error)],
+      "style": this.ns.cssVarBlock({
+        "label-width": "".concat(labelWidth || 130, "px")
+      })
+    }, [labelPos && ["LEFT", "TOP"].includes(labelPos) && this.renderLabel(), content, labelPos && ["RIGHT", "BOTTOM"].includes(labelPos) && this.renderLabel()]);
   }
 });
 

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

@@ -1,18 +1,18 @@
 import { PropType } from 'vue';
-import './form-item.scss';
 import { IDEFormItem } from '@ibiz/model-core';
 import { FormItemController } from '@ibiz-template/runtime';
+import './form-item.scss';
 export declare const FormItem: import("vue").DefineComponent<{
     modelData: {
         type: PropType<IDEFormItem>;
         required: true;
     };
     controller: {
-        type: typeof FormItemController;
+        type: PropType<FormItemController>;
         required: true;
     };
     attrs: {
-        type: PropType<IData>;
+        type: PropType<import("@ibiz-template/core").IApiData>;
         required: false;
     };
 }, {
@@ -26,11 +26,11 @@ export declare const FormItem: import("vue").DefineComponent<{
         required: true;
     };
     controller: {
-        type: typeof FormItemController;
+        type: PropType<FormItemController>;
         required: true;
     };
     attrs: {
-        type: PropType<IData>;
+        type: PropType<import("@ibiz-template/core").IApiData>;
         required: false;
     };
 }>>, {}, {}>;

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

@@ -1,8 +1,7 @@
 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';
+import './form-item.css';
 
 "use strict";
 function _isSlot(s) {
@@ -16,7 +15,7 @@ const FormItem = /* @__PURE__ */ defineComponent({
       required: true
     },
     controller: {
-      type: FormItemController,
+      type: Object,
       required: true
     },
     attrs: {
@@ -56,17 +55,17 @@ const FormItem = /* @__PURE__ */ defineComponent({
   },
   render() {
     var _a, _b, _c, _d, _e;
-    if (!this.c.state.visible || ((_a = this.controller.model.editor) == null ? void 0 : _a.editorType) === "HIDDEN") {
+    if (!this.c.state.visible || ((_a = this.c.model.editor) == null ? void 0 : _a.editorType) === "HIDDEN") {
       return null;
     }
     let editor = null;
-    const compositeItem = this.controller.model.compositeItem;
+    const compositeItem = this.c.model.compositeItem;
     if (compositeItem) {
       const {
         editorItems = []
-      } = this.controller.model.editor || {};
+      } = this.c.model.editor || {};
       editor = editorItems.map((item) => {
-        const controller = this.controller.form.details[item.id];
+        const controller = this.c.form.details[item.id];
         return createVNode(CompositeFormItem, {
           "modelData": controller.model,
           "controller": controller,
@@ -74,56 +73,45 @@ const FormItem = /* @__PURE__ */ defineComponent({
         }, 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 editMode = (_d = (_c = (_b = this.c.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,
+        style: (_e = this.c.editor) == null ? void 0 : _e.style,
+        value: this.c.value,
+        data: this.c.data,
+        controller: this.c.editor,
+        disabled: this.c.state.disabled,
+        readonly: this.c.state.readonly,
         onChange: this.onValueChange,
         extraParams: this.extraParams,
         controlParams: editMode ? {
-          ...this.controller.form.controlParams,
+          ...this.c.form.controlParams,
           editmode: editMode
-        } : this.controller.form.controlParams,
+        } : this.c.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),
+        onEnter: (event) => this.c.onEnter(event),
+        onClick: (event, params) => this.c.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);
-        }
+      if (this.$slots.default) {
+        editor = this.$slots.default(editorProps);
+      } else if (this.c.editorProvider) {
+        const component = resolveComponent(this.c.editorProvider.formEditor);
+        editor = h(component, {
+          ...editorProps
+        });
+      } else {
+        editor = createVNode(resolveComponent("not-supported-editor"), {
+          "modelData": this.modelData.editor,
+          "context": this.c.context
+        }, null);
       }
     }
     return createVNode(resolveComponent("iBizFormItemContainer"), {
-      "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],
+      "id": "".concat(this.c.form.view.model.codeName, "_").concat(this.c.form.model.codeName, "_").concat(this.modelData.codeName),
+      "class": [this.ns.b(), this.ns.m(this.modelData.id), this.ns.is("compositeItem", compositeItem), ...this.c.containerClass],
       "style": this.modelData.cssStyle,
-      "required": this.c.state.required,
-      "error": this.c.state.error,
-      "label": this.c.labelCaption,
-      "labelSysImg": this.modelData.sysImage,
-      "labelClass": this.controller.labelClass,
-      "label-pos": this.c.model.labelPos,
-      "label-width": this.c.model.labelWidth,
-      "enableInputTip": this.modelData.enableInputTip,
-      "inputTip": this.modelData.inputTip,
-      "inputTipUrl": this.modelData.inputTipUrl,
-      "inputTipClosable": this.modelData.inputTipClosable,
+      "controller": this.c,
       "onClick": (event) => this.c.onClick(event)
     }, _isSlot(editor) ? editor : {
       default: () => [editor]

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

@@ -5,11 +5,11 @@ export declare const IBizFormItem: import("@ibiz-template/vue3-util").TypeWithIn
         required: true;
     };
     controller: {
-        type: typeof import("@ibiz-template/runtime").FormItemController;
+        type: import("vue").PropType<import("@ibiz-template/runtime").FormItemController>;
         required: true;
     };
     attrs: {
-        type: import("vue").PropType<IData>;
+        type: import("vue").PropType<import("@ibiz-template/core").IApiData>;
         required: false;
     };
 }, {
@@ -23,11 +23,11 @@ export declare const IBizFormItem: import("@ibiz-template/vue3-util").TypeWithIn
         required: true;
     };
     controller: {
-        type: typeof import("@ibiz-template/runtime").FormItemController;
+        type: import("vue").PropType<import("@ibiz-template/runtime").FormItemController>;
         required: true;
     };
     attrs: {
-        type: import("vue").PropType<IData>;
+        type: import("vue").PropType<import("@ibiz-template/core").IApiData>;
         required: false;
     };
 }>>, {}, {}>>;

package/es/control/form/form-detail/form-mdctrl/form-mdctrl-md/form-mdctrl-md.mjs

@@ -41,22 +41,20 @@ const FormMDCtrlMD = /* @__PURE__ */ defineComponent({
       mdProvider,
       model
     } = this.controller;
-    const isLoaded = this.controller.form.state.isLoaded;
     let controlComponent = null;
-    if (isLoaded) {
-      const controlProps = {
-        class: this.ns.b("content"),
-        modelData: model.contentControl,
-        context: this.controller.form.context,
-        params: this.controller.form.params,
-        onCreated: this.onCreated,
-        onSelectionChange: this.onSelectionChange
-      };
-      if (model.contentType === "GRID") {
-        controlProps.rowEditOpen = true;
-      }
-      controlComponent = h(resolveComponent(mdProvider.component), controlProps);
+    const controlProps = {
+      class: this.ns.b("content"),
+      modelData: model.contentControl,
+      context: this.controller.form.context,
+      params: this.controller.form.params,
+      loadDefault: false,
+      onCreated: this.onCreated,
+      onSelectionChange: this.onSelectionChange
+    };
+    if (model.contentType === "GRID") {
+      controlProps.rowEditOpen = true;
     }
+    controlComponent = h(resolveComponent(mdProvider.component), controlProps);
     return createVNode("div", {
       "class": this.ns.b()
     }, [controlComponent, this.showActions && createVNode("div", {