@fmdeui/fmui 1.0.175 → 1.0.177

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

@@ -30,10 +30,15 @@ export declare const FmTooltip: {
             type: ObjectConstructor;
             default: () => void;
         };
+        isDel: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & Readonly<{}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {
         content: string;
         params: Record<string, any>;
         label: string;
+        isDel: boolean;
         tipdata: any[];
     }, true, {}, {}, GlobalComponents, GlobalDirectives, string, {}, HTMLDivElement, ComponentProvideOptions, {
         P: {};
@@ -72,10 +77,15 @@ export declare const FmTooltip: {
             type: ObjectConstructor;
             default: () => void;
         };
+        isDel: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & Readonly<{}>, {}, {}, {}, {}, {
         content: string;
         params: Record<string, any>;
         label: string;
+        isDel: boolean;
         tipdata: any[];
     }>;
     __isFragment?: never;
@@ -111,10 +121,15 @@ export declare const FmTooltip: {
         type: ObjectConstructor;
         default: () => void;
     };
+    isDel: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & Readonly<{}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, {
     content: string;
     params: Record<string, any>;
     label: string;
+    isDel: boolean;
     tipdata: any[];
 }, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & (new () => {
     $slots: {

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

@@ -38,6 +38,10 @@ declare const __VLS_component: DefineComponent<ExtractPropTypes<{
         type: ObjectConstructor;
         default: () => void;
     };
+    isDel: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<{
     label: {
         type: StringConstructor;
@@ -68,10 +72,15 @@ declare const __VLS_component: DefineComponent<ExtractPropTypes<{
         type: ObjectConstructor;
         default: () => void;
     };
+    isDel: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & Readonly<{}>, {
     content: string;
     params: Record<string, any>;
     label: string;
+    isDel: boolean;
     tipdata: any[];
 }, {}, {}, {}, string, ComponentProvideOptions, true, {}, HTMLDivElement>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;

package/es/packages/components/fm-tooltip/index2.vue.mjs

@@ -28,14 +28,21 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       type: Object,
       default: () => {
       }
+    },
+    isDel: {
+      type: Boolean,
+      default: false
     }
   },
   setup(__props) {
     const props = __props;
     const useBaseApi = usefmPageFormDatatore();
     const tipLoadData = computed(() => {
-      var _a;
-      return useBaseApi.getLableLogData(props.params.table, props.params.field, props.params.bizid, ((_a = props.params) == null ? void 0 : _a.bizType) || "basefrom");
+      var _a, _b;
+      if (props.isDel) {
+        return useBaseApi.getLableDelLogData(props.params.table, props.params.field, props.params.bizid, ((_a = props.params) == null ? void 0 : _a.bizType) || "basefrom");
+      }
+      return useBaseApi.getLableLogData(props.params.table, props.params.field, props.params.bizid, ((_b = props.params) == null ? void 0 : _b.bizType) || "basefrom");
     });
     return (_ctx, _cache) => {
       const _component_el_icon = resolveComponent("el-icon");
@@ -58,7 +65,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           style: { "position": "absolute", "top": "4px", "right": "4px", "z-index": "10", "line-height": "1" }
         }, {
           content: withCtx(() => [
-            tipLoadData.value.length > 0 ? (openBlock(true), createElementBlock(
+            tipLoadData.value.length > 0 && !__props.isDel ? (openBlock(true), createElementBlock(
               Fragment,
               { key: 0 },
               renderList(tipLoadData.value, (value) => {
@@ -103,8 +110,42 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
               }),
               256
               /* UNKEYED_FRAGMENT */
+            )) : createCommentVNode("v-if", true),
+            tipLoadData.value.length > 0 && __props.isDel ? (openBlock(true), createElementBlock(
+              Fragment,
+              { key: 1 },
+              renderList(tipLoadData.value, (value) => {
+                return openBlock(), createElementBlock("p", null, [
+                  _cache[3] || (_cache[3] = createTextVNode(
+                    " \u5220\u9664\u3010",
+                    -1
+                    /* CACHED */
+                  )),
+                  createElementVNode(
+                    "strong",
+                    null,
+                    toDisplayString((value == null ? void 0 : value.supplierName) != null ? (value == null ? void 0 : value.supplierName) + "/" : "") + " " + toDisplayString(value.itemName),
+                    1
+                    /* TEXT */
+                  ),
+                  createTextVNode(
+                    "\u3011" + toDisplayString(value == null ? void 0 : value.price) + "*" + toDisplayString((value == null ? void 0 : value.numA) != null ? value == null ? void 0 : value.numA : value == null ? void 0 : value.num) + "*" + toDisplayString((value == null ? void 0 : value.unit) != null ? value == null ? void 0 : value.unit : (value == null ? void 0 : value.numB) || 1) + "=" + toDisplayString(value == null ? void 0 : value.totalMoney) + "\uFF0C",
+                    1
+                    /* TEXT */
+                  ),
+                  createElementVNode(
+                    "strong",
+                    null,
+                    toDisplayString(value.opUser) + " " + toDisplayString(value.opDate),
+                    1
+                    /* TEXT */
+                  )
+                ]);
+              }),
+              256
+              /* UNKEYED_FRAGMENT */
             )) : (openBlock(), createElementBlock("p", {
-              key: 1,
+              key: 2,
               innerHTML: __props.content
             }, null, 8, _hoisted_3))
           ]),

package/es/packages/stores/thepagefromdata.mjs

@@ -43,13 +43,38 @@ const usefmPageFormDatatore = defineStore("fmPageFormDatatore", () => {
     }
     return resultLogData;
   };
+  const getLableDelLogData = (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;
+        const filteredLogs = (_b = (_a = item.logData) == null ? void 0 : _a.filter(
+          (log) => {
+            var _a2;
+            return log.table === table && ((_a2 = log == null ? void 0 : log.snapshot) == null ? void 0 : _a2.regMainId) === bizid && log.actionType === "delete";
+          }
+        )) != null ? _b : [];
+        filteredLogs.forEach((log) => {
+          resultLogData.push({
+            ...log.snapshot,
+            // 保留原有属性
+            opUser: item.createUserName,
+            opDate: item.createTime
+          });
+        });
+      });
+    }
+    return resultLogData;
+  };
   return {
     setCurrentBizType,
     setFormData,
     getFormData,
     clearFormData,
     clearAllFormData,
-    getLableLogData
+    getLableLogData,
+    getLableDelLogData
   };
 });
 

package/es/stores/thepagefromdata.d.ts

@@ -11,6 +11,7 @@ export declare const usefmPageFormDatatore: StoreDefinition<"fmPageFormDatatore"
     clearFormData: (bizType?: string) => void;
     clearAllFormData: () => void;
     getLableLogData: (table: any, field: any, bizid: any, bizinType?: string) => any[];
+    getLableDelLogData: (table: any, field: any, bizid: any, bizinType?: string) => any[];
 }, never>, Pick<{
     setCurrentBizType: (bizType?: string) => void;
     setFormData: (data: any, bizType?: string) => void;
@@ -18,6 +19,7 @@ export declare const usefmPageFormDatatore: StoreDefinition<"fmPageFormDatatore"
     clearFormData: (bizType?: string) => void;
     clearAllFormData: () => void;
     getLableLogData: (table: any, field: any, bizid: any, bizinType?: string) => any[];
+    getLableDelLogData: (table: any, field: any, bizid: any, bizinType?: string) => any[];
 }, never>, Pick<{
     setCurrentBizType: (bizType?: string) => void;
     setFormData: (data: any, bizType?: string) => void;
@@ -25,4 +27,5 @@ export declare const usefmPageFormDatatore: StoreDefinition<"fmPageFormDatatore"
     clearFormData: (bizType?: string) => void;
     clearAllFormData: () => void;
     getLableLogData: (table: any, field: any, bizid: any, bizinType?: string) => any[];
-}, "setCurrentBizType" | "setFormData" | "getFormData" | "clearFormData" | "clearAllFormData" | "getLableLogData">>;
+    getLableDelLogData: (table: any, field: any, bizid: any, bizinType?: string) => any[];
+}, "setCurrentBizType" | "setFormData" | "getFormData" | "clearFormData" | "clearAllFormData" | "getLableLogData" | "getLableDelLogData">>;

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.175 */
+/*! fmdeui-fmui v1.0.177 */
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vxe-table'), require('@vxe-ui/plugin-render-element'), require('@vxe-ui/plugin-export-xlsx'), require('vxe-pc-ui'), require('exceljs'), require('@element-plus/icons-vue'), require('vue'), require('element-plus'), require('lodash-es'), require('js-cookie'), require('pinia'), require('vue-router'), require('@vueuse/core'), require('crypto-js'), require('xlsx-js-style'), require('vue-i18n'), require('sortablejs'), require('screenfull'), require('push.js'), require('mitt'), require('@microsoft/signalr'), require('axios')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'vxe-table', '@vxe-ui/plugin-render-element', '@vxe-ui/plugin-export-xlsx', 'vxe-pc-ui', 'exceljs', '@element-plus/icons-vue', 'vue', 'element-plus', 'lodash-es', 'js-cookie', 'pinia', 'vue-router', '@vueuse/core', 'crypto-js', 'xlsx-js-style', 'vue-i18n', 'sortablejs', 'screenfull', 'push.js', 'mitt', '@microsoft/signalr', 'axios'], factory) :
@@ -4138,13 +4138,38 @@
 	    }
 	    return resultLogData;
 	  };
+	  const getLableDelLogData = (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;
+	        const filteredLogs = (_b = (_a = item.logData) == null ? void 0 : _a.filter(
+	          (log) => {
+	            var _a2;
+	            return log.table === table && ((_a2 = log == null ? void 0 : log.snapshot) == null ? void 0 : _a2.regMainId) === bizid && log.actionType === "delete";
+	          }
+	        )) != null ? _b : [];
+	        filteredLogs.forEach((log) => {
+	          resultLogData.push({
+	            ...log.snapshot,
+	            // 保留原有属性
+	            opUser: item.createUserName,
+	            opDate: item.createTime
+	          });
+	        });
+	      });
+	    }
+	    return resultLogData;
+	  };
 	  return {
 	    setCurrentBizType,
 	    setFormData,
 	    getFormData,
 	    clearFormData,
 	    clearAllFormData,
-	    getLableLogData
+	    getLableLogData,
+	    getLableDelLogData
 	  };
 	});
 
@@ -31474,14 +31499,21 @@
 	      type: Object,
 	      default: () => {
 	      }
+	    },
+	    isDel: {
+	      type: Boolean,
+	      default: false
 	    }
 	  },
 	  setup(__props) {
 	    const props = __props;
 	    const useBaseApi = usefmPageFormDatatore();
 	    const tipLoadData = vue.computed(() => {
-	      var _a;
-	      return useBaseApi.getLableLogData(props.params.table, props.params.field, props.params.bizid, ((_a = props.params) == null ? void 0 : _a.bizType) || "basefrom");
+	      var _a, _b;
+	      if (props.isDel) {
+	        return useBaseApi.getLableDelLogData(props.params.table, props.params.field, props.params.bizid, ((_a = props.params) == null ? void 0 : _a.bizType) || "basefrom");
+	      }
+	      return useBaseApi.getLableLogData(props.params.table, props.params.field, props.params.bizid, ((_b = props.params) == null ? void 0 : _b.bizType) || "basefrom");
 	    });
 	    return (_ctx, _cache) => {
 	      const _component_el_icon = vue.resolveComponent("el-icon");
@@ -31504,7 +31536,7 @@
 	          style: { "position": "absolute", "top": "4px", "right": "4px", "z-index": "10", "line-height": "1" }
 	        }, {
 	          content: vue.withCtx(() => [
-	            tipLoadData.value.length > 0 ? (vue.openBlock(true), vue.createElementBlock(
+	            tipLoadData.value.length > 0 && !__props.isDel ? (vue.openBlock(true), vue.createElementBlock(
 	              vue.Fragment,
 	              { key: 0 },
 	              vue.renderList(tipLoadData.value, (value) => {
@@ -31549,8 +31581,42 @@
 	              }),
 	              256
 	              /* UNKEYED_FRAGMENT */
+	            )) : vue.createCommentVNode("v-if", true),
+	            tipLoadData.value.length > 0 && __props.isDel ? (vue.openBlock(true), vue.createElementBlock(
+	              vue.Fragment,
+	              { key: 1 },
+	              vue.renderList(tipLoadData.value, (value) => {
+	                return vue.openBlock(), vue.createElementBlock("p", null, [
+	                  _cache[3] || (_cache[3] = vue.createTextVNode(
+	                    " \u5220\u9664\u3010",
+	                    -1
+	                    /* CACHED */
+	                  )),
+	                  vue.createElementVNode(
+	                    "strong",
+	                    null,
+	                    vue.toDisplayString((value == null ? void 0 : value.supplierName) != null ? (value == null ? void 0 : value.supplierName) + "/" : "") + " " + vue.toDisplayString(value.itemName),
+	                    1
+	                    /* TEXT */
+	                  ),
+	                  vue.createTextVNode(
+	                    "\u3011" + vue.toDisplayString(value == null ? void 0 : value.price) + "*" + vue.toDisplayString((value == null ? void 0 : value.numA) != null ? value == null ? void 0 : value.numA : value == null ? void 0 : value.num) + "*" + vue.toDisplayString((value == null ? void 0 : value.unit) != null ? value == null ? void 0 : value.unit : (value == null ? void 0 : value.numB) || 1) + "=" + vue.toDisplayString(value == null ? void 0 : value.totalMoney) + "\uFF0C",
+	                    1
+	                    /* TEXT */
+	                  ),
+	                  vue.createElementVNode(
+	                    "strong",
+	                    null,
+	                    vue.toDisplayString(value.opUser) + " " + vue.toDisplayString(value.opDate),
+	                    1
+	                    /* TEXT */
+	                  )
+	                ]);
+	              }),
+	              256
+	              /* UNKEYED_FRAGMENT */
 	            )) : (vue.openBlock(), vue.createElementBlock("p", {
-	              key: 1,
+	              key: 2,
 	              innerHTML: __props.content
 	            }, null, 8, _hoisted_3$8))
 	          ]),