@fmdeui/fmui 1.0.173 → 1.0.174

package/index.mjs

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.173 */
+/*! fmdeui-fmui v1.0.174 */
 import VxeUITable from 'vxe-table';
 import VxeUIPluginRenderElement from '@vxe-ui/plugin-render-element';
 import VxeUIPluginExportXLSX from '@vxe-ui/plugin-export-xlsx';
@@ -4096,11 +4096,15 @@ const usefminputdropdownstore = defineStore("fminputdropdownstore", () => {
 
 const usefmPageFormDatatore = defineStore("fmPageFormDatatore", () => {
   const state = reactive({
-    formData: {}
+    formData: {},
+    currentBizType: ""
   });
   const setFormData = (data, bizType = "basefrom") => {
     state.formData[bizType] = data;
   };
+  const setCurrentBizType = (bizType = "") => {
+    state.currentBizType = bizType;
+  };
   const getFormData = (bizType = "basefrom") => {
     return state.formData[bizType];
   };
@@ -4110,8 +4114,9 @@ const usefmPageFormDatatore = defineStore("fmPageFormDatatore", () => {
   const clearAllFormData = () => {
     state.formData = {};
   };
-  const getLableLogData = (table, field, bizid, bizType = "basefrom") => {
+  const getLableLogData = (table, field, bizid, bizinType = "basefrom") => {
     const resultLogData = [];
+    const bizType = state.currentBizType != "" ? state.currentBizType : bizinType;
     if (state.formData[bizType]) {
       state.formData[bizType].forEach((item) => {
         var _a, _b;
@@ -4131,6 +4136,7 @@ const usefmPageFormDatatore = defineStore("fmPageFormDatatore", () => {
     return resultLogData;
   };
   return {
+    setCurrentBizType,
     setFormData,
     getFormData,
     clearFormData,
@@ -21278,7 +21284,7 @@ function getPageSetting(field, defaultValue = "", flag = "main") {
 }
 
 const _hoisted_1$F = { key: 0 };
-const _hoisted_2$r = { key: 0 };
+const _hoisted_2$s = { key: 0 };
 var _sfc_main$V = /* @__PURE__ */ defineComponent({
   ...{
     name: "FInput"
@@ -21519,7 +21525,7 @@ var _sfc_main$V = /* @__PURE__ */ defineComponent({
           fn: withCtx(() => [
             __props.inputType === "amount" ? (openBlock(), createElementBlock(
               "span",
-              _hoisted_2$r,
+              _hoisted_2$s,
               toDisplayString(appendTitleText.value),
               1
               /* TEXT */
@@ -22081,7 +22087,7 @@ var _sfc_main$Q = /* @__PURE__ */ defineComponent({
 });
 
 const _hoisted_1$B = { class: "inside_box" };
-const _hoisted_2$q = { class: "inside_box_title" };
+const _hoisted_2$r = { class: "inside_box_title" };
 const _hoisted_3$i = { class: "check-box" };
 const _hoisted_4$9 = { class: "more_dropdown_icon" };
 const _hoisted_5$8 = { class: "out_box" };
@@ -22224,7 +22230,7 @@ var _sfc_main$P = /* @__PURE__ */ defineComponent({
         ]),
         default: withCtx(() => [
           createElementVNode("div", _hoisted_1$B, [
-            createElementVNode("div", _hoisted_2$q, [
+            createElementVNode("div", _hoisted_2$r, [
               createElementVNode(
                 "div",
                 null,
@@ -23101,7 +23107,7 @@ const _hoisted_1$A = {
   key: 0,
   class: "table_query_condition"
 };
-const _hoisted_2$p = ["element-loading-text"];
+const _hoisted_2$q = ["element-loading-text"];
 const _hoisted_3$h = { key: 2 };
 const _hoisted_4$8 = {
   key: 0,
@@ -23988,7 +23994,7 @@ var _sfc_main$M = /* @__PURE__ */ defineComponent({
                     total: pagination.total
                   }, { background: true, size: __props.paginationSize || "small", ..._ctx.$attrs }), null, 16, ["current-page", "page-size", "pager-count", "total"])
                 ])) : createCommentVNode("v-if", true)
-              ], 8, _hoisted_2$p)), [
+              ], 8, _hoisted_2$q)), [
                 [_directive_loading, __props.tableLoading || internalLoading.value]
               ]),
               renderSlot(_ctx.$slots, "footer")
@@ -24054,7 +24060,7 @@ const _hoisted_1$z = {
   key: 1,
   class: "text_show"
 };
-const _hoisted_2$o = { class: "footer_btn flex-box flex-ver f-margin-top-5" };
+const _hoisted_2$p = { class: "footer_btn flex-box flex-ver f-margin-top-5" };
 var _sfc_main$J = /* @__PURE__ */ defineComponent({
   ...{
     name: "FForm"
@@ -24448,7 +24454,7 @@ var _sfc_main$J = /* @__PURE__ */ defineComponent({
             /* UNKEYED_FRAGMENT */
           )),
           createCommentVNode(" \u6309\u94AE "),
-          createElementVNode("div", _hoisted_2$o, [
+          createElementVNode("div", _hoisted_2$p, [
             __props.formOpts.btnSlotName ? renderSlot(_ctx.$slots, __props.formOpts.btnSlotName, { key: 0 }) : createCommentVNode("v-if", true),
             !__props.formOpts.btnSlotName && __props.formOpts.operatorList && __props.formOpts.operatorList.length > 0 ? (openBlock(true), createElementBlock(
               Fragment,
@@ -24976,7 +24982,7 @@ const other = {
 };
 
 const _hoisted_1$x = { class: "layout-breadcrumb-seting" };
-const _hoisted_2$n = { class: "layout-breadcrumb-seting-bar-flex" };
+const _hoisted_2$o = { class: "layout-breadcrumb-seting-bar-flex" };
 const _hoisted_3$g = { class: "layout-breadcrumb-seting-bar-flex-label" };
 const _hoisted_4$7 = { class: "layout-breadcrumb-seting-bar-flex-value" };
 const _hoisted_5$7 = { style: { "margin": "10px 0" } };
@@ -25389,7 +25395,7 @@ var _sfc_main$G = /* @__PURE__ */ defineComponent({
                   _: 1
                   /* STABLE */
                 }),
-                createElementVNode("div", _hoisted_2$n, [
+                createElementVNode("div", _hoisted_2$o, [
                   createElementVNode(
                     "div",
                     _hoisted_3$g,
@@ -27720,7 +27726,7 @@ var _sfc_main$C = /* @__PURE__ */ defineComponent({
 const FmInputNumber = _sfc_main$C;
 
 const _hoisted_1$v = { style: { "color": "#fff" } };
-const _hoisted_2$m = { style: { "padding": "8px 16px", "background-color": "var(--el-color-primary-light-9)", "border-left": "5px solid var(--el-color-primary)", "margin-bottom": "5px" } };
+const _hoisted_2$n = { style: { "padding": "8px 16px", "background-color": "var(--el-color-primary-light-9)", "border-left": "5px solid var(--el-color-primary)", "margin-bottom": "5px" } };
 const _hoisted_3$f = { style: { "padding": "8px 16px", "background-color": "var(--el-color-primary-light-9)", "border-left": "5px solid var(--el-color-primary)", "margin-bottom": "5px" } };
 const _hoisted_4$6 = { style: { "margin-top": "10px" } };
 const _hoisted_5$6 = { class: "dialog-footer" };
@@ -27909,7 +27915,7 @@ var _sfc_main$B = /* @__PURE__ */ defineComponent({
                 default: withCtx(() => [
                   createElementVNode(
                     "p",
-                    _hoisted_2$m,
+                    _hoisted_2$n,
                     toDisplayString(_ctx.$t("\u673A\u6784")),
                     1
                     /* TEXT */
@@ -28116,7 +28122,7 @@ var _sfc_main$B = /* @__PURE__ */ defineComponent({
 });
 
 const _hoisted_1$u = { style: { "color": "#fff" } };
-const _hoisted_2$l = { style: { "margin-top": "10px" } };
+const _hoisted_2$m = { style: { "margin-top": "10px" } };
 const _hoisted_3$e = { class: "dialog-footer" };
 var _sfc_main$A = /* @__PURE__ */ defineComponent({
   __name: "supplierSelectDialog",
@@ -28284,7 +28290,7 @@ var _sfc_main$A = /* @__PURE__ */ defineComponent({
             default: withCtx(() => [
               createVNode(_component_el_col, { span: 24 }, {
                 default: withCtx(() => [
-                  createElementVNode("div", _hoisted_2$l, [
+                  createElementVNode("div", _hoisted_2$m, [
                     createVNode(_component_el_form, {
                       model: state.queryParams,
                       ref: "queryRef",
@@ -28495,7 +28501,7 @@ var _sfc_main$A = /* @__PURE__ */ defineComponent({
 });
 
 const _hoisted_1$t = { style: { "color": "#fff" } };
-const _hoisted_2$k = { style: { "margin-top": "10px" } };
+const _hoisted_2$l = { style: { "margin-top": "10px" } };
 const _hoisted_3$d = { class: "dialog-footer" };
 var _sfc_main$z = /* @__PURE__ */ defineComponent({
   __name: "supplierUserSelectDialog",
@@ -28656,7 +28662,7 @@ var _sfc_main$z = /* @__PURE__ */ defineComponent({
             default: withCtx(() => [
               createVNode(_component_el_col, { span: 24 }, {
                 default: withCtx(() => [
-                  createElementVNode("div", _hoisted_2$k, [
+                  createElementVNode("div", _hoisted_2$l, [
                     createVNode(_component_el_form, {
                       model: state.queryParams,
                       ref: "queryRef",
@@ -28824,7 +28830,7 @@ var _sfc_main$z = /* @__PURE__ */ defineComponent({
 });
 
 const _hoisted_1$s = { style: { "color": "#fff" } };
-const _hoisted_2$j = { style: { "margin-top": "10px" } };
+const _hoisted_2$k = { style: { "margin-top": "10px" } };
 const _hoisted_3$c = { class: "dialog-footer" };
 var _sfc_main$y = /* @__PURE__ */ defineComponent({
   __name: "accountSelectDialog",
@@ -28983,7 +28989,7 @@ var _sfc_main$y = /* @__PURE__ */ defineComponent({
             default: withCtx(() => [
               createVNode(_component_el_col, { span: 24 }, {
                 default: withCtx(() => [
-                  createElementVNode("div", _hoisted_2$j, [
+                  createElementVNode("div", _hoisted_2$k, [
                     createVNode(_component_el_form, {
                       model: state.queryParams,
                       ref: "queryRef",
@@ -29145,7 +29151,7 @@ var _sfc_main$y = /* @__PURE__ */ defineComponent({
 });
 
 const _hoisted_1$r = { style: { "color": "#fff" } };
-const _hoisted_2$i = { style: { "padding": "8px 16px", "background-color": "var(--el-color-primary-light-9)", "border-left": "5px solid var(--el-color-primary)", "margin-bottom": "5px" } };
+const _hoisted_2$j = { style: { "padding": "8px 16px", "background-color": "var(--el-color-primary-light-9)", "border-left": "5px solid var(--el-color-primary)", "margin-bottom": "5px" } };
 const _hoisted_3$b = { style: { "padding": "8px 16px", "background-color": "var(--el-color-primary-light-9)", "border-left": "5px solid var(--el-color-primary)", "margin-bottom": "5px" } };
 const _hoisted_4$5 = { style: { "margin-top": "10px" } };
 const _hoisted_5$5 = { class: "dialog-footer" };
@@ -29301,7 +29307,7 @@ var _sfc_main$x = /* @__PURE__ */ defineComponent({
                 default: withCtx(() => [
                   createElementVNode(
                     "p",
-                    _hoisted_2$i,
+                    _hoisted_2$j,
                     toDisplayString(_ctx.$t("\u5927\u7C7B")),
                     1
                     /* TEXT */
@@ -29471,7 +29477,7 @@ var _sfc_main$x = /* @__PURE__ */ defineComponent({
 });
 
 const _hoisted_1$q = { style: { "color": "#fff" } };
-const _hoisted_2$h = { style: { "margin-top": "10px" } };
+const _hoisted_2$i = { style: { "margin-top": "10px" } };
 const _hoisted_3$a = { class: "dialog-footer" };
 var _sfc_main$w = /* @__PURE__ */ defineComponent({
   __name: "linSelectDialog",
@@ -29632,7 +29638,7 @@ var _sfc_main$w = /* @__PURE__ */ defineComponent({
             default: withCtx(() => [
               createVNode(_component_el_col, { span: 24 }, {
                 default: withCtx(() => [
-                  createElementVNode("div", _hoisted_2$h, [
+                  createElementVNode("div", _hoisted_2$i, [
                     createVNode(_component_el_form, {
                       model: state.queryParams,
                       ref: "queryRef",
@@ -29812,7 +29818,7 @@ var _sfc_main$w = /* @__PURE__ */ defineComponent({
 });
 
 const _hoisted_1$p = { style: { "color": "#fff" } };
-const _hoisted_2$g = { style: { "margin-top": "10px" } };
+const _hoisted_2$h = { style: { "margin-top": "10px" } };
 const _hoisted_3$9 = { class: "dialog-footer" };
 var _sfc_main$v = /* @__PURE__ */ defineComponent({
   __name: "guideSelectDialog",
@@ -29973,7 +29979,7 @@ var _sfc_main$v = /* @__PURE__ */ defineComponent({
             default: withCtx(() => [
               createVNode(_component_el_col, { span: 24 }, {
                 default: withCtx(() => [
-                  createElementVNode("div", _hoisted_2$g, [
+                  createElementVNode("div", _hoisted_2$h, [
                     createVNode(_component_el_form, {
                       model: state.queryParams,
                       ref: "queryRef",
@@ -30129,7 +30135,7 @@ var _sfc_main$v = /* @__PURE__ */ defineComponent({
 });
 
 const _hoisted_1$o = { style: { "color": "#fff" } };
-const _hoisted_2$f = { style: { "margin-top": "10px" } };
+const _hoisted_2$g = { style: { "margin-top": "10px" } };
 const _hoisted_3$8 = { class: "dialog-footer" };
 var _sfc_main$u = /* @__PURE__ */ defineComponent({
   __name: "dirverSelectDialog",
@@ -30290,7 +30296,7 @@ var _sfc_main$u = /* @__PURE__ */ defineComponent({
             default: withCtx(() => [
               createVNode(_component_el_col, { span: 24 }, {
                 default: withCtx(() => [
-                  createElementVNode("div", _hoisted_2$f, [
+                  createElementVNode("div", _hoisted_2$g, [
                     createVNode(_component_el_form, {
                       model: state.queryParams,
                       ref: "queryRef",
@@ -31216,7 +31222,7 @@ var _sfc_main$r = /* @__PURE__ */ defineComponent({
 const Fmdatepicker = _sfc_main$r;
 
 const _hoisted_1$l = { style: { "display": "flex", "justify-content": "space-between", "align-items": "center" } };
-const _hoisted_2$e = { style: { "font-size": "16px" } };
+const _hoisted_2$f = { style: { "font-size": "16px" } };
 const _sfc_main$q = /* @__PURE__ */ Object.assign({
   name: "FmPeriod"
 }, {
@@ -31316,7 +31322,7 @@ const _sfc_main$q = /* @__PURE__ */ Object.assign({
                               }, null, 8, ["icon"]),
                               createElementVNode(
                                 "b",
-                                _hoisted_2$e,
+                                _hoisted_2$f,
                                 toDisplayString(currentYear.value) + toDisplayString(_ctx.$t("\u5E74") || "\u5E74"),
                                 1
                                 /* TEXT */
@@ -31440,7 +31446,8 @@ const _sfc_main$q = /* @__PURE__ */ Object.assign({
 
 const FmPeriod = _sfc_main$q;
 
-const _hoisted_1$k = ["innerHTML"];
+const _hoisted_1$k = { style: { "display": "inline-flex" } };
+const _hoisted_2$e = ["innerHTML"];
 var _sfc_main$p = /* @__PURE__ */ defineComponent({
   ...{
     name: "FmTooltip"
@@ -31469,18 +31476,21 @@ var _sfc_main$p = /* @__PURE__ */ defineComponent({
     const props = __props;
     const useBaseApi = usefmPageFormDatatore();
     const tipLoadData = computed(() => {
-      return useBaseApi.getLableLogData(props.params.table, props.params.field, props.params.bizid, props.params.bizType);
+      var _a;
+      return useBaseApi.getLableLogData(props.params.table, props.params.field, props.params.bizid, ((_a = props.params) == null ? void 0 : _a.bizType) || "basefrom");
     });
     return (_ctx, _cache) => {
       const _component_el_icon = resolveComponent("el-icon");
       const _component_el_tooltip = resolveComponent("el-tooltip");
-      return openBlock(), createElementBlock("div", null, [
+      return openBlock(), createElementBlock("div", _hoisted_1$k, [
+        renderSlot(_ctx.$slots, "default"),
         createTextVNode(
-          toDisplayString(__props.label) + " ",
+          " " + toDisplayString(__props.label) + " ",
           1
           /* TEXT */
         ),
-        createVNode(_component_el_tooltip, {
+        tipLoadData.value.length > 0 || __props.content ? (openBlock(), createBlock(_component_el_tooltip, {
+          key: 0,
           "raw-content": "",
           placement: "top",
           effect: "light"
@@ -31534,7 +31544,7 @@ var _sfc_main$p = /* @__PURE__ */ defineComponent({
             )) : (openBlock(), createElementBlock("p", {
               key: 1,
               innerHTML: __props.content
-            }, null, 8, _hoisted_1$k))
+            }, null, 8, _hoisted_2$e))
           ]),
           default: withCtx(() => [
             createVNode(_component_el_icon, { color: "#ff4d4f" }, {
@@ -31547,7 +31557,7 @@ var _sfc_main$p = /* @__PURE__ */ defineComponent({
           ]),
           _: 1
           /* STABLE */
-        })
+        })) : createCommentVNode("v-if", true)
       ]);
     };
   }

package/lib/components/fm-tooltip/index.d.ts

@@ -1,35 +1,87 @@
-import { DefineComponent, ExtractPropTypes, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
-export declare const FmTooltip: DefineComponent<ExtractPropTypes<{
-    label: {
-        type: StringConstructor;
-        default: string;
-    };
-    tipdata: {
-        type: {
-            (arrayLength: number): any[];
-            (...items: any[]): any[];
-            new (arrayLength: number): any[];
-            new (...items: any[]): any[];
-            isArray(arg: any): arg is any[];
-            readonly prototype: any[];
-            from<T>(arrayLike: ArrayLike<T>): T[];
-            from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
-            from<T>(iterable: Iterable<T> | ArrayLike<T>): T[];
-            from<T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
-            of<T>(...items: T[]): T[];
-            readonly [Symbol.species]: ArrayConstructor;
+import { CreateComponentPublicInstanceWithMixins, ExtractPropTypes, ComponentOptionsMixin, PublicProps, GlobalComponents, GlobalDirectives, ComponentProvideOptions, ComponentOptionsBase, VNodeProps, AllowedComponentProps, ComponentCustomProps } from 'vue';
+export declare const FmTooltip: {
+    new (...args: any[]): CreateComponentPublicInstanceWithMixins<Readonly< ExtractPropTypes<{
+        label: {
+            type: StringConstructor;
+            default: string;
         };
-        default: never[];
-    };
-    content: {
-        type: StringConstructor;
-        default: string;
-    };
-    params: {
-        type: ObjectConstructor;
-        default: () => void;
-    };
-}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<{
+        tipdata: {
+            type: {
+                (arrayLength: number): any[];
+                (...items: any[]): any[];
+                new (arrayLength: number): any[];
+                new (...items: any[]): any[];
+                isArray(arg: any): arg is any[];
+                readonly prototype: any[];
+                from<T>(arrayLike: ArrayLike<T>): T[];
+                from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
+                from<T>(iterable: Iterable<T> | ArrayLike<T>): T[];
+                from<T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
+                of<T>(...items: T[]): T[];
+                readonly [Symbol.species]: ArrayConstructor;
+            };
+            default: never[];
+        };
+        content: {
+            type: StringConstructor;
+            default: string;
+        };
+        params: {
+            type: ObjectConstructor;
+            default: () => void;
+        };
+    }>> & Readonly<{}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {
+        content: string;
+        params: Record<string, any>;
+        label: string;
+        tipdata: any[];
+    }, true, {}, {}, GlobalComponents, GlobalDirectives, string, {}, HTMLDivElement, ComponentProvideOptions, {
+        P: {};
+        B: {};
+        D: {};
+        C: {};
+        M: {};
+        Defaults: {};
+    }, Readonly< ExtractPropTypes<{
+        label: {
+            type: StringConstructor;
+            default: string;
+        };
+        tipdata: {
+            type: {
+                (arrayLength: number): any[];
+                (...items: any[]): any[];
+                new (arrayLength: number): any[];
+                new (...items: any[]): any[];
+                isArray(arg: any): arg is any[];
+                readonly prototype: any[];
+                from<T>(arrayLike: ArrayLike<T>): T[];
+                from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
+                from<T>(iterable: Iterable<T> | ArrayLike<T>): T[];
+                from<T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
+                of<T>(...items: T[]): T[];
+                readonly [Symbol.species]: ArrayConstructor;
+            };
+            default: never[];
+        };
+        content: {
+            type: StringConstructor;
+            default: string;
+        };
+        params: {
+            type: ObjectConstructor;
+            default: () => void;
+        };
+    }>> & Readonly<{}>, {}, {}, {}, {}, {
+        content: string;
+        params: Record<string, any>;
+        label: string;
+        tipdata: any[];
+    }>;
+    __isFragment?: never;
+    __isTeleport?: never;
+    __isSuspense?: never;
+} & ComponentOptionsBase<Readonly< ExtractPropTypes<{
     label: {
         type: StringConstructor;
         default: string;
@@ -59,9 +111,13 @@ export declare const FmTooltip: DefineComponent<ExtractPropTypes<{
         type: ObjectConstructor;
         default: () => void;
     };
-}>> & Readonly<{}>, {
+}>> & Readonly<{}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, {
     content: string;
     params: Record<string, any>;
     label: string;
     tipdata: any[];
-}, {}, {}, {}, string, ComponentProvideOptions, true, {}, HTMLDivElement>;
+}, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & (new () => {
+    $slots: {
+        default?(_: {}): any;
+    };
+});

package/lib/components/fm-tooltip/index.vue.d.ts

@@ -1,5 +1,14 @@
 import { DefineComponent, ExtractPropTypes, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
-declare const _default: DefineComponent<ExtractPropTypes<{
+declare function __VLS_template(): {
+    attrs: Partial<{}>;
+    slots: {
+        default?(_: {}): any;
+    };
+    refs: {};
+    rootEl: HTMLDivElement;
+};
+type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
+declare const __VLS_component: DefineComponent<ExtractPropTypes<{
     label: {
         type: StringConstructor;
         default: string;
@@ -65,4 +74,10 @@ declare const _default: DefineComponent<ExtractPropTypes<{
     label: string;
     tipdata: any[];
 }, {}, {}, {}, string, ComponentProvideOptions, true, {}, HTMLDivElement>;
+declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 export default _default;
+type __VLS_WithTemplateSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/lib/packages/components/fm-tooltip/index2.vue.js

@@ -7,7 +7,8 @@ var svg = require('@element-plus/icons-vue');
 require('../../stores/index.js');
 var thepagefromdata = require('../../stores/thepagefromdata.js');
 
-const _hoisted_1 = ["innerHTML"];
+const _hoisted_1 = { style: { "display": "inline-flex" } };
+const _hoisted_2 = ["innerHTML"];
 var _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...{
     name: "FmTooltip"
@@ -36,18 +37,21 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const props = __props;
     const useBaseApi = thepagefromdata.usefmPageFormDatatore();
     const tipLoadData = vue.computed(() => {
-      return useBaseApi.getLableLogData(props.params.table, props.params.field, props.params.bizid, props.params.bizType);
+      var _a;
+      return useBaseApi.getLableLogData(props.params.table, props.params.field, props.params.bizid, ((_a = props.params) == null ? void 0 : _a.bizType) || "basefrom");
     });
     return (_ctx, _cache) => {
       const _component_el_icon = vue.resolveComponent("el-icon");
       const _component_el_tooltip = vue.resolveComponent("el-tooltip");
-      return vue.openBlock(), vue.createElementBlock("div", null, [
+      return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
+        vue.renderSlot(_ctx.$slots, "default"),
         vue.createTextVNode(
-          vue.toDisplayString(__props.label) + " ",
+          " " + vue.toDisplayString(__props.label) + " ",
           1
           /* TEXT */
         ),
-        vue.createVNode(_component_el_tooltip, {
+        tipLoadData.value.length > 0 || __props.content ? (vue.openBlock(), vue.createBlock(_component_el_tooltip, {
+          key: 0,
           "raw-content": "",
           placement: "top",
           effect: "light"
@@ -101,7 +105,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
             )) : (vue.openBlock(), vue.createElementBlock("p", {
               key: 1,
               innerHTML: __props.content
-            }, null, 8, _hoisted_1))
+            }, null, 8, _hoisted_2))
           ]),
           default: vue.withCtx(() => [
             vue.createVNode(_component_el_icon, { color: "#ff4d4f" }, {
@@ -114,7 +118,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
           ]),
           _: 1
           /* STABLE */
-        })
+        })) : vue.createCommentVNode("v-if", true)
       ]);
     };
   }

package/lib/packages/stores/thepagefromdata.js

@@ -5,11 +5,15 @@ var vue = require('vue');
 
 const usefmPageFormDatatore = pinia.defineStore("fmPageFormDatatore", () => {
   const state = vue.reactive({
-    formData: {}
+    formData: {},
+    currentBizType: ""
   });
   const setFormData = (data, bizType = "basefrom") => {
     state.formData[bizType] = data;
   };
+  const setCurrentBizType = (bizType = "") => {
+    state.currentBizType = bizType;
+  };
   const getFormData = (bizType = "basefrom") => {
     return state.formData[bizType];
   };
@@ -19,8 +23,9 @@ const usefmPageFormDatatore = pinia.defineStore("fmPageFormDatatore", () => {
   const clearAllFormData = () => {
     state.formData = {};
   };
-  const getLableLogData = (table, field, bizid, bizType = "basefrom") => {
+  const getLableLogData = (table, field, bizid, bizinType = "basefrom") => {
     const resultLogData = [];
+    const bizType = state.currentBizType != "" ? state.currentBizType : bizinType;
     if (state.formData[bizType]) {
       state.formData[bizType].forEach((item) => {
         var _a, _b;
@@ -40,6 +45,7 @@ const usefmPageFormDatatore = pinia.defineStore("fmPageFormDatatore", () => {
     return resultLogData;
   };
   return {
+    setCurrentBizType,
     setFormData,
     getFormData,
     clearFormData,

package/lib/stores/thepagefromdata.d.ts

@@ -5,21 +5,24 @@ import { StoreDefinition } from 'pinia';
  * @methods getFormData 获取表单数据
  */
 export declare const usefmPageFormDatatore: StoreDefinition<"fmPageFormDatatore", Pick<{
+    setCurrentBizType: (bizType?: string) => void;
     setFormData: (data: any, bizType?: string) => void;
     getFormData: (bizType?: string) => any;
     clearFormData: (bizType?: string) => void;
     clearAllFormData: () => void;
-    getLableLogData: (table: any, field: any, bizid: any, bizType?: string) => any[];
+    getLableLogData: (table: any, field: any, bizid: any, bizinType?: string) => any[];
 }, never>, Pick<{
+    setCurrentBizType: (bizType?: string) => void;
     setFormData: (data: any, bizType?: string) => void;
     getFormData: (bizType?: string) => any;
     clearFormData: (bizType?: string) => void;
     clearAllFormData: () => void;
-    getLableLogData: (table: any, field: any, bizid: any, bizType?: string) => any[];
+    getLableLogData: (table: any, field: any, bizid: any, bizinType?: string) => any[];
 }, never>, Pick<{
+    setCurrentBizType: (bizType?: string) => void;
     setFormData: (data: any, bizType?: string) => void;
     getFormData: (bizType?: string) => any;
     clearFormData: (bizType?: string) => void;
     clearAllFormData: () => void;
-    getLableLogData: (table: any, field: any, bizid: any, bizType?: string) => any[];
-}, "setFormData" | "getFormData" | "clearFormData" | "clearAllFormData" | "getLableLogData">>;
+    getLableLogData: (table: any, field: any, bizid: any, bizinType?: string) => any[];
+}, "setCurrentBizType" | "setFormData" | "getFormData" | "clearFormData" | "clearAllFormData" | "getLableLogData">>;

package/locale/en.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.173 */
+/*! fmdeui-fmui v1.0.174 */
 
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :

package/locale/en.min.js

@@ -1 +1 @@
-/*! fmdeui-fmui v1.0.173 */(function(e,t){typeof exports=="object"&&typeof module!="undefined"?module.exports=t():typeof define=="function"&&define.amd?define(t):(e=typeof globalThis!="undefined"?globalThis:e||self,e.fmdeuiPlusLocaleEn=t())})(this,(function(){"use strict";var e={name:"en",plus:{datepicker:{date:"Please select date",dates:"Please select dates",week:"Please select week",month:"Please select month",months:"Please select months",year:"Please select year",years:"Please select years",startDatePlaceholder:"Please select start date",endDatePlaceholder:"Please select end date",datetime:"Please select datetime",startMonthPlaceholder:"Please select start month",endMonthPlaceholder:"Please select end month",startTimePlaceholder:"Please select start time",endTimePlaceholder:"Please select end time",shortcutsDate:{today:"Today",yesterday:"Yesterday",lastWeek:"Last week"},shortcutsDaterange:{pastWeek:"Past week",pastMonth:"Past month",pastThreeMonths:"Past three months"},shortcutsMonthrange:{thisMonth:"This month",thisYear:"This year",pastSixMonths:"Past six months"},shortcutsDatetime:{today:"Today",yesterday:"Yesterday",lastWeek:"Last week"},shortcutsDatetimerange:{pastWeek:"Past week",pastMonth:"Past month",pastThreeMonths:"Past three months"}},form:{pleaseEnter:"Please enter ",pleaseSelect:"Please select "},input:{placeholder:"Please enter ",appendTitle:"Yuan",validatePhone:"Please enter a valid phone number",validateIdCard:"Please enter a valid ID card number",validateInteger:"Please enter a valid integer",format:"Please enter a valid ",amount:"amount",numbers:"numbers",digitUppercase:"Please enter a valid amount format",validateError:"Please enter a valid format",escaped:{0:"Cent",1:"Penny",2:"Zero",3:"One",4:"Two",5:"Three",6:"Four",7:"Five",8:"Six",9:"Seven",10:"Eight",11:"Nine",12:"Yuan",13:"Ten thousand",14:"Ten million",15:"Ten billion",16:"Ten",17:"Hundred",18:"Thousand",19:"Short",20:"Whole"}},moduleForm:{save:"Save",back:"Back"},search:{searchText:"Search",resetText:"Reset",expand:"Expand",retract:"Retract",pleaseEnter:"Please enter ",pleaseSelect:"Please select ",popoverAttrs:{showTxt:"More",title:"All conditions",allTxt:"SelectAll",reverseTxt:"Reverse",clearTxt:"ClearAll"}},select:{selectAllTxt:"Select all"},selectIcon:{placeholder:"Please select icon",dialogTitle:"Please select icon",searchPlaceholder:"Search icon",emptyDescription:"No icon found"},copy:{copySuccess:"Copy success",copyFail:"Copy fail",invalidCopyContent:"Invalid copy content"},selectTable:{searchBtnTxt:"Search",radioTxt:"Radio",loadingTxt:"Loading...",copySuccess:"Copy success",copyFail:"Copy fail"},stepWizard:{lastBtnTitle:"Complete"},table:{columnBind:{btnTxt:"Column setting",title:"Column setting"},fistColumn:{label:"Number",radio:"Radio"},operator:{label:"Operation",more:"More",sum:"Sum",total:"Total",allSum:"All sum"},singleEdit:{tipText:"Click to edit"},pleaseEnter:"Please enter ",pleaseSelect:"Please select ",loadingTxt:"Loading...",dragTxt:"Drag",saveBtnTxt:"Save",density:"Density",default:"Default",loose:"Loose",compact:"Compact"},list:{idleTimeoutMessage:"Long time no operation, system logged out.",sysMessage:"System Message"}}};return e}));
+/*! fmdeui-fmui v1.0.174 */(function(e,t){typeof exports=="object"&&typeof module!="undefined"?module.exports=t():typeof define=="function"&&define.amd?define(t):(e=typeof globalThis!="undefined"?globalThis:e||self,e.fmdeuiPlusLocaleEn=t())})(this,(function(){"use strict";var e={name:"en",plus:{datepicker:{date:"Please select date",dates:"Please select dates",week:"Please select week",month:"Please select month",months:"Please select months",year:"Please select year",years:"Please select years",startDatePlaceholder:"Please select start date",endDatePlaceholder:"Please select end date",datetime:"Please select datetime",startMonthPlaceholder:"Please select start month",endMonthPlaceholder:"Please select end month",startTimePlaceholder:"Please select start time",endTimePlaceholder:"Please select end time",shortcutsDate:{today:"Today",yesterday:"Yesterday",lastWeek:"Last week"},shortcutsDaterange:{pastWeek:"Past week",pastMonth:"Past month",pastThreeMonths:"Past three months"},shortcutsMonthrange:{thisMonth:"This month",thisYear:"This year",pastSixMonths:"Past six months"},shortcutsDatetime:{today:"Today",yesterday:"Yesterday",lastWeek:"Last week"},shortcutsDatetimerange:{pastWeek:"Past week",pastMonth:"Past month",pastThreeMonths:"Past three months"}},form:{pleaseEnter:"Please enter ",pleaseSelect:"Please select "},input:{placeholder:"Please enter ",appendTitle:"Yuan",validatePhone:"Please enter a valid phone number",validateIdCard:"Please enter a valid ID card number",validateInteger:"Please enter a valid integer",format:"Please enter a valid ",amount:"amount",numbers:"numbers",digitUppercase:"Please enter a valid amount format",validateError:"Please enter a valid format",escaped:{0:"Cent",1:"Penny",2:"Zero",3:"One",4:"Two",5:"Three",6:"Four",7:"Five",8:"Six",9:"Seven",10:"Eight",11:"Nine",12:"Yuan",13:"Ten thousand",14:"Ten million",15:"Ten billion",16:"Ten",17:"Hundred",18:"Thousand",19:"Short",20:"Whole"}},moduleForm:{save:"Save",back:"Back"},search:{searchText:"Search",resetText:"Reset",expand:"Expand",retract:"Retract",pleaseEnter:"Please enter ",pleaseSelect:"Please select ",popoverAttrs:{showTxt:"More",title:"All conditions",allTxt:"SelectAll",reverseTxt:"Reverse",clearTxt:"ClearAll"}},select:{selectAllTxt:"Select all"},selectIcon:{placeholder:"Please select icon",dialogTitle:"Please select icon",searchPlaceholder:"Search icon",emptyDescription:"No icon found"},copy:{copySuccess:"Copy success",copyFail:"Copy fail",invalidCopyContent:"Invalid copy content"},selectTable:{searchBtnTxt:"Search",radioTxt:"Radio",loadingTxt:"Loading...",copySuccess:"Copy success",copyFail:"Copy fail"},stepWizard:{lastBtnTitle:"Complete"},table:{columnBind:{btnTxt:"Column setting",title:"Column setting"},fistColumn:{label:"Number",radio:"Radio"},operator:{label:"Operation",more:"More",sum:"Sum",total:"Total",allSum:"All sum"},singleEdit:{tipText:"Click to edit"},pleaseEnter:"Please enter ",pleaseSelect:"Please select ",loadingTxt:"Loading...",dragTxt:"Drag",saveBtnTxt:"Save",density:"Density",default:"Default",loose:"Loose",compact:"Compact"},list:{idleTimeoutMessage:"Long time no operation, system logged out.",sysMessage:"System Message"}}};return e}));