@fmdevui/fm-dev 1.0.108 → 1.0.110

package/index.mjs

@@ -1,4 +1,4 @@
-/*! fm-dev v1.0.108 */
+/*! fm-dev v1.0.110 */
 import { defineComponent, reactive, computed, watch, resolveComponent, createBlock, openBlock, withCtx, createVNode, createElementVNode, createTextVNode, toDisplayString as toDisplayString$1, withDirectives, createElementBlock, Fragment, renderList, vShow, ref, onMounted, nextTick, normalizeStyle, createCommentVNode, normalizeClass, withModifiers, mergeModels, useModel, effectScope, getCurrentInstance, shallowRef, isRef as isRef$1, inject, onUnmounted, h, Text, createSlots, renderSlot, markRaw, hasInjectionContext, toRaw as toRaw$1, isReactive as isReactive$1, toRef, unref, getCurrentScope, onScopeDispose, toRefs, resolveDirective, mergeProps, resolveDynamicComponent, useSlots, toHandlers, onBeforeUnmount, onUpdated, useAttrs, normalizeProps, guardReactiveProps } from 'vue';
 import crypto from 'crypto';
 import require$$0 from 'url';
@@ -35367,14 +35367,24 @@ const usefminputdropdownstore = defineStore("fminputdropdownstore", () => {
   const state = reactive({
     optionsData: {}
   });
-  const getOptionsData = async (apiService, apiAction, basecode, reload = false) => {
+  const getOptionsData = async (apiService, apiAction, basecode, reload = false, multibasecode = []) => {
     if (!reload) {
       if (state.optionsData[basecode] && state.optionsData[basecode].length > 0) {
         return state.optionsData[basecode];
       }
     }
-    const res = await useBaseApi(apiService).get(null, apiAction + "/?codetype=" + basecode);
-    return state.optionsData[basecode] = res.data.result ?? [];
+    const res = await useBaseApi(apiService).get(null, apiAction + "/?codetype=" + basecode + "&mcodes=" + multibasecode.join(","));
+    if (multibasecode.length > 0) {
+      const mdata = res.data.result ?? [];
+      multibasecode.forEach((p) => {
+        const tempdata = mdata.filter((x) => {
+          return x.code == p;
+        });
+        state.optionsData[p] = tempdata ?? [];
+      });
+    } else {
+      return state.optionsData[basecode] = res.data.result ?? [];
+    }
   };
   return {
     state,
@@ -35443,6 +35453,20 @@ var _sfc_main$c = /* @__PURE__ */ defineComponent({
     basecode: {
       type: String,
       default: ""
+    },
+    /**
+    * 基础编码  多个编码合在一起调用
+    */
+    multibasecode: {
+      type: Array,
+      default: []
+    },
+    /**
+    * 是否默认加载数据
+    */
+    autoLoadData: {
+      type: Boolean,
+      default: true
     }
   }, {
     "id": {
@@ -35474,13 +35498,13 @@ var _sfc_main$c = /* @__PURE__ */ defineComponent({
     };
     onMounted(async () => {
       state.optionData = props.optionData;
-      if (props.basecode && props.basecode != "") {
-        state.optionData = await useBaseApi.getOptionsData(props.apiService, props.apiAction, props.basecode);
+      if (props.autoLoadData && props.basecode && props.basecode != "") {
+        state.optionData = await useBaseApi.getOptionsData(props.apiService, props.apiAction, props.basecode, false, props.multibasecode);
       }
     });
     const handRestdata = async () => {
       if (props.basecode && props.basecode != "") {
-        state.optionData = await useBaseApi.getOptionsData(props.apiService, props.apiAction, props.basecode, true);
+        state.optionData = await useBaseApi.getOptionsData(props.apiService, props.apiAction, props.basecode, true, []);
       }
     };
     return (_ctx, _cache) => {

package/lib/core/stores/ainputdropdow.d.ts

@@ -3,15 +3,15 @@ export declare const usefminputdropdownstore: StoreDefinition<"fminputdropdownst
     state: {
         optionsData: any;
     };
-    getOptionsData: (apiService: string, apiAction: string, basecode: string, reload?: boolean) => Promise<any>;
+    getOptionsData: (apiService: string, apiAction: string, basecode: string, reload?: boolean, multibasecode?: Array<any>) => Promise<any>;
 }, "state">, Pick<{
     state: {
         optionsData: any;
     };
-    getOptionsData: (apiService: string, apiAction: string, basecode: string, reload?: boolean) => Promise<any>;
+    getOptionsData: (apiService: string, apiAction: string, basecode: string, reload?: boolean, multibasecode?: Array<any>) => Promise<any>;
 }, never>, Pick<{
     state: {
         optionsData: any;
     };
-    getOptionsData: (apiService: string, apiAction: string, basecode: string, reload?: boolean) => Promise<any>;
+    getOptionsData: (apiService: string, apiAction: string, basecode: string, reload?: boolean, multibasecode?: Array<any>) => Promise<any>;
 }, "getOptionsData">>;

package/lib/core/ui/components/index.d.ts

@@ -756,6 +756,27 @@ declare const Fminputdropdown: DefineComponent<ExtractPropTypes<{
         type: StringConstructor;
         default: string;
     };
+    multibasecode: {
+        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[];
+    };
+    autoLoadData: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     id: {
         type: PropType<any>;
     };
@@ -820,6 +841,27 @@ declare const Fminputdropdown: DefineComponent<ExtractPropTypes<{
         type: StringConstructor;
         default: string;
     };
+    multibasecode: {
+        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[];
+    };
+    autoLoadData: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     id: {
         type: PropType<any>;
     };
@@ -841,6 +883,8 @@ declare const Fminputdropdown: DefineComponent<ExtractPropTypes<{
     dropWidth: string;
     dropHeight: string;
     basecode: string;
+    multibasecode: any[];
+    autoLoadData: boolean;
 }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
 declare const Fminputtable: {
     new (...args: any[]): CreateComponentPublicInstanceWithMixins<Readonly< ExtractPropTypes<{

package/lib/core/ui/components/inputdropdown/index.vue.d.ts

@@ -68,6 +68,33 @@ declare const _default: DefineComponent<ExtractPropTypes<{
         type: StringConstructor;
         default: string;
     };
+    /**
+    * 基础编码  多个编码合在一起调用
+    */
+    multibasecode: {
+        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[];
+    };
+    /**
+  * 是否默认加载数据
+  */
+    autoLoadData: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     id: {
         type: PropType<any>;
     };
@@ -147,6 +174,33 @@ declare const _default: DefineComponent<ExtractPropTypes<{
         type: StringConstructor;
         default: string;
     };
+    /**
+    * 基础编码  多个编码合在一起调用
+    */
+    multibasecode: {
+        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[];
+    };
+    /**
+  * 是否默认加载数据
+  */
+    autoLoadData: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     id: {
         type: PropType<any>;
     };
@@ -168,5 +222,7 @@ declare const _default: DefineComponent<ExtractPropTypes<{
     dropWidth: string;
     dropHeight: string;
     basecode: string;
+    multibasecode: any[];
+    autoLoadData: boolean;
 }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
 export default _default;

package/lib/packages/core/stores/ainputdropdow.js

@@ -8,14 +8,24 @@ const usefminputdropdownstore = pinia.defineStore("fminputdropdownstore", () =>
   const state = vue.reactive({
     optionsData: {}
   });
-  const getOptionsData = async (apiService, apiAction, basecode, reload = false) => {
+  const getOptionsData = async (apiService, apiAction, basecode, reload = false, multibasecode = []) => {
     if (!reload) {
       if (state.optionsData[basecode] && state.optionsData[basecode].length > 0) {
         return state.optionsData[basecode];
       }
     }
-    const res = await index.useBaseApi(apiService).get(null, apiAction + "/?codetype=" + basecode);
-    return state.optionsData[basecode] = res.data.result ?? [];
+    const res = await index.useBaseApi(apiService).get(null, apiAction + "/?codetype=" + basecode + "&mcodes=" + multibasecode.join(","));
+    if (multibasecode.length > 0) {
+      const mdata = res.data.result ?? [];
+      multibasecode.forEach((p) => {
+        const tempdata = mdata.filter((x) => {
+          return x.code == p;
+        });
+        state.optionsData[p] = tempdata ?? [];
+      });
+    } else {
+      return state.optionsData[basecode] = res.data.result ?? [];
+    }
   };
   return {
     state,

package/lib/packages/core/ui/components/inputdropdown/index.vue2.js

@@ -67,6 +67,20 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     basecode: {
       type: String,
       default: ""
+    },
+    /**
+    * 基础编码  多个编码合在一起调用
+    */
+    multibasecode: {
+      type: Array,
+      default: []
+    },
+    /**
+    * 是否默认加载数据
+    */
+    autoLoadData: {
+      type: Boolean,
+      default: true
     }
   }, {
     "id": {
@@ -98,13 +112,13 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     vue.onMounted(async () => {
       state.optionData = props.optionData;
-      if (props.basecode && props.basecode != "") {
-        state.optionData = await useBaseApi.getOptionsData(props.apiService, props.apiAction, props.basecode);
+      if (props.autoLoadData && props.basecode && props.basecode != "") {
+        state.optionData = await useBaseApi.getOptionsData(props.apiService, props.apiAction, props.basecode, false, props.multibasecode);
       }
     });
     const handRestdata = async () => {
       if (props.basecode && props.basecode != "") {
-        state.optionData = await useBaseApi.getOptionsData(props.apiService, props.apiAction, props.basecode, true);
+        state.optionData = await useBaseApi.getOptionsData(props.apiService, props.apiAction, props.basecode, true, []);
       }
     };
     return (_ctx, _cache) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fmdevui/fm-dev",
-  "version": "1.0.108",
+  "version": "1.0.110",
   "description": "Page level components developed based on Element Plus.",
   "author": "fmdevui",
   "keywords": [