@fmdevui/fm-dev 1.0.57 → 1.0.59

package/es/component.mjs

@@ -1,12 +1,13 @@
 import { FmLogin } from './packages/core/ui/login/index.mjs';
-import { FmTransfer, FmNoticeBar, Fmselect, FmAutocomplete } from './packages/core/ui/components/index.mjs';
+import { FmTransfer, FmNoticeBar, Fmselect, FmAutocomplete, Fminputdropdown } from './packages/core/ui/components/index.mjs';
 
 const plugins = [
   FmLogin,
   FmTransfer,
   FmNoticeBar,
   Fmselect,
-  FmAutocomplete
+  FmAutocomplete,
+  Fminputdropdown
 ];
 
 export { plugins as default };

package/es/core/hook/useVxeTableOptionsHook.d.ts

@@ -12,6 +12,7 @@ import { VNode } from 'vue';
 interface iVxeOption {
     id?: string;
     name?: string;
+    spanMethod: VxeTablePropTypes.SpanMethod<any>;
     columns: VxeGridPropTypes.Columns<any>;
     data?: VxeTablePropTypes.Data<any>;
     sortConfig?: VxeTablePropTypes.SortConfig<any>;

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

@@ -584,4 +584,108 @@ declare const FmAutocomplete: DefineComponent<ExtractPropTypes<{
     fName: string;
     qId: number;
 }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
-export { FmTransfer, FmNoticeBar, FmDragImg, Fmselect, FmAutocomplete, elSvg };
+declare const Fminputdropdown: DefineComponent<ExtractPropTypes<{
+    optionData: {
+        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[];
+    };
+    bvalue: {
+        type: StringConstructor;
+        default: string;
+    };
+    blabel: {
+        type: StringConstructor;
+        default: string;
+    };
+    placeholder: {
+        type: StringConstructor;
+        default: string;
+    };
+    inputWidth: {
+        type: StringConstructor;
+        default: string;
+    };
+    dropWidth: {
+        type: StringConstructor;
+        default: string;
+    };
+    id: {
+        type: PropType<any>;
+    };
+    name: {
+        type: PropType<any>;
+    };
+}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
+    change: (...args: any[]) => void;
+    "update:id": (value: any) => void;
+    "update:name": (value: any) => void;
+}, string, PublicProps, Readonly< ExtractPropTypes<{
+    optionData: {
+        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[];
+    };
+    bvalue: {
+        type: StringConstructor;
+        default: string;
+    };
+    blabel: {
+        type: StringConstructor;
+        default: string;
+    };
+    placeholder: {
+        type: StringConstructor;
+        default: string;
+    };
+    inputWidth: {
+        type: StringConstructor;
+        default: string;
+    };
+    dropWidth: {
+        type: StringConstructor;
+        default: string;
+    };
+    id: {
+        type: PropType<any>;
+    };
+    name: {
+        type: PropType<any>;
+    };
+}>> & Readonly<{
+    onChange?: ((...args: any[]) => any) | undefined;
+    "onUpdate:id"?: ((value: any) => any) | undefined;
+    "onUpdate:name"?: ((value: any) => any) | undefined;
+}>, {
+    placeholder: string;
+    optionData: any[];
+    bvalue: string;
+    blabel: string;
+    inputWidth: string;
+    dropWidth: string;
+}, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
+export { FmTransfer, FmNoticeBar, FmDragImg, Fmselect, FmAutocomplete, Fminputdropdown, elSvg };

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

@@ -0,0 +1,118 @@
+import { DefineComponent, ExtractPropTypes, PropType, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
+declare const _default: DefineComponent<ExtractPropTypes<{
+    optionData: {
+        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[];
+    };
+    /**
+     * 值的属性值
+     */
+    bvalue: {
+        type: StringConstructor;
+        default: string;
+    };
+    /**
+     * 值的属性标签
+     */
+    blabel: {
+        type: StringConstructor;
+        default: string;
+    };
+    placeholder: {
+        type: StringConstructor;
+        default: string;
+    };
+    inputWidth: {
+        type: StringConstructor;
+        default: string;
+    };
+    dropWidth: {
+        type: StringConstructor;
+        default: string;
+    };
+    id: {
+        type: PropType<any>;
+    };
+    name: {
+        type: PropType<any>;
+    };
+}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
+    change: (...args: any[]) => void;
+    "update:id": (value: any) => void;
+    "update:name": (value: any) => void;
+}, string, PublicProps, Readonly< ExtractPropTypes<{
+    optionData: {
+        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[];
+    };
+    /**
+     * 值的属性值
+     */
+    bvalue: {
+        type: StringConstructor;
+        default: string;
+    };
+    /**
+     * 值的属性标签
+     */
+    blabel: {
+        type: StringConstructor;
+        default: string;
+    };
+    placeholder: {
+        type: StringConstructor;
+        default: string;
+    };
+    inputWidth: {
+        type: StringConstructor;
+        default: string;
+    };
+    dropWidth: {
+        type: StringConstructor;
+        default: string;
+    };
+    id: {
+        type: PropType<any>;
+    };
+    name: {
+        type: PropType<any>;
+    };
+}>> & Readonly<{
+    onChange?: ((...args: any[]) => any) | undefined;
+    "onUpdate:id"?: ((value: any) => any) | undefined;
+    "onUpdate:name"?: ((value: any) => any) | undefined;
+}>, {
+    placeholder: string;
+    optionData: any[];
+    bvalue: string;
+    blabel: string;
+    inputWidth: string;
+    dropWidth: string;
+}, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
+export default _default;

package/es/index.mjs

@@ -3,7 +3,7 @@ export { default as emitter } from './packages/core/utils/emit/index.mjs';
 export { default as setIntroduction } from './packages/core/utils/comm/setIconfont.mjs';
 import './packages/core/index.mjs';
 export { version } from './version.mjs';
-export { FmAutocomplete, FmDragImg, FmNoticeBar, FmTransfer, Fmselect } from './packages/core/ui/components/index.mjs';
+export { FmAutocomplete, FmDragImg, FmNoticeBar, FmTransfer, Fminputdropdown, Fmselect } from './packages/core/ui/components/index.mjs';
 export { elSvg } from './packages/core/ui/components/svgIcon/index.mjs';
 export { FmLogin } from './packages/core/ui/login/index.mjs';
 export { NextLoading } from './packages/core/ui/loading/index.mjs';

package/es/packages/core/hook/useVxeTableOptionsHook.mjs

@@ -17,6 +17,7 @@ const useVxeTable = (opt, extras) => {
     align: "center",
     // 自动监听父元素的变化去重新计算表格（对于父元素可能存在动态变化、显示隐藏的容器中、列宽异常等场景中的可能会用到）
     // data: [] as Array<T>,
+    spanMethod: opt.spanMethod,
     columns: opt.columns,
     showFooter: opt.showFooter,
     footerData: opt.footerData,

package/es/packages/core/index.mjs

@@ -1,4 +1,4 @@
-export { FmAutocomplete, FmDragImg, FmNoticeBar, FmTransfer, Fmselect } from './ui/components/index.mjs';
+export { FmAutocomplete, FmDragImg, FmNoticeBar, FmTransfer, Fminputdropdown, Fmselect } from './ui/components/index.mjs';
 export { FmLogin } from './ui/login/index.mjs';
 export { NextLoading } from './ui/loading/index.mjs';
 export { AccountTypeEnum, HttpMethodEnum, JobCreateTypeEnum } from './api/index.mjs';

package/es/packages/core/ui/components/index.mjs

@@ -3,16 +3,19 @@ import './noticeBar/index.vue.mjs';
 import dragimg from './dragVerify/dragVerifyImgRotate.vue.mjs';
 import './fmselect/index.vue.mjs';
 import './fmautocomplete/index.vue.mjs';
+import './inputdropdown/index.vue.mjs';
 export { elSvg } from './svgIcon/index.mjs';
 import _sfc_main from './transfer/index.vue2.mjs';
 import _sfc_main$1 from './noticeBar/index.vue2.mjs';
 import _sfc_main$2 from './fmselect/index.vue2.mjs';
 import _sfc_main$3 from './fmautocomplete/index.vue2.mjs';
+import _sfc_main$4 from './inputdropdown/index.vue2.mjs';
 
 const FmTransfer = _sfc_main;
 const FmNoticeBar = _sfc_main$1;
 const FmDragImg = dragimg;
 const Fmselect = _sfc_main$2;
 const FmAutocomplete = _sfc_main$3;
+const Fminputdropdown = _sfc_main$4;
 
-export { FmAutocomplete, FmDragImg, FmNoticeBar, FmTransfer, Fmselect };
+export { FmAutocomplete, FmDragImg, FmNoticeBar, FmTransfer, Fminputdropdown, Fmselect };

package/es/packages/core/ui/components/inputdropdown/index.vue.mjs

@@ -0,0 +1,5 @@
+import _sfc_main from './index.vue2.mjs';
+
+
+
+export { _sfc_main as default };

package/es/packages/core/ui/components/inputdropdown/index.vue2.mjs

@@ -0,0 +1,123 @@
+import { defineComponent, useModel, resolveComponent, createBlock, openBlock, withCtx, createVNode, normalizeStyle, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString, mergeModels } from 'vue';
+
+var _sfc_main = /* @__PURE__ */ defineComponent({
+  ...{
+    name: "Fminputdropdown"
+  },
+  __name: "index",
+  props: /* @__PURE__ */ mergeModels({
+    //数据
+    optionData: {
+      type: Array,
+      default: []
+    },
+    /**
+     * 值的属性值
+     */
+    bvalue: {
+      type: String,
+      default: "id"
+    },
+    /**
+     * 值的属性标签
+     */
+    blabel: {
+      type: String,
+      default: "name"
+    },
+    placeholder: {
+      type: String,
+      default: "\u8BF7\u9009\u62E9"
+    },
+    inputWidth: {
+      type: String,
+      default: "40%"
+    },
+    dropWidth: {
+      type: String,
+      default: "90px"
+    }
+  }, {
+    "id": {
+      type: Number,
+      default: 0
+    },
+    "idModifiers": {},
+    "name": {
+      type: String,
+      default: ""
+    },
+    "nameModifiers": {}
+  }),
+  emits: /* @__PURE__ */ mergeModels(["change"], ["update:id", "update:name"]),
+  setup(__props, { emit: __emit }) {
+    const modeValueId = useModel(__props, "id");
+    const modeValueName = useModel(__props, "name");
+    const props = __props;
+    const emit = __emit;
+    const handCommand = (command) => {
+      const fitem = props.optionData.find((item) => item[props.bvalue] === command);
+      modeValueId.value = fitem != null ? [props.bvalue] : 0;
+      modeValueName.value = fitem != null ? fitem[props.blabel] : "";
+      emit("change", fitem);
+    };
+    return (_ctx, _cache) => {
+      const _component_el_input = resolveComponent("el-input");
+      const _component_el_dropdown_item = resolveComponent("el-dropdown-item");
+      const _component_el_dropdown_menu = resolveComponent("el-dropdown-menu");
+      const _component_el_dropdown = resolveComponent("el-dropdown");
+      return openBlock(), createBlock(_component_el_dropdown, {
+        placement: "bottom",
+        trigger: "click",
+        style: { "width": "100%" },
+        onCommand: handCommand
+      }, {
+        dropdown: withCtx(() => [
+          createVNode(_component_el_dropdown_menu, {
+            style: normalizeStyle({ width: __props.dropWidth })
+          }, {
+            default: withCtx(() => [
+              (openBlock(true), createElementBlock(
+                Fragment,
+                null,
+                renderList(__props.optionData, (item, index) => {
+                  return openBlock(), createBlock(_component_el_dropdown_item, {
+                    key: index,
+                    command: item[__props.bvalue],
+                    divided: ""
+                  }, {
+                    default: withCtx(() => [
+                      createTextVNode(
+                        toDisplayString(item[__props.blabel]),
+                        1
+                        /* TEXT */
+                      )
+                    ]),
+                    _: 2
+                    /* DYNAMIC */
+                  }, 1032, ["command"]);
+                }),
+                128
+                /* KEYED_FRAGMENT */
+              ))
+            ]),
+            _: 1
+            /* STABLE */
+          }, 8, ["style"])
+        ]),
+        default: withCtx(() => [
+          createVNode(_component_el_input, {
+            modelValue: modeValueName.value,
+            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => modeValueName.value = $event),
+            placeholder: props.placeholder,
+            style: normalizeStyle({ width: __props.inputWidth })
+          }, null, 8, ["modelValue", "placeholder", "style"])
+        ]),
+        _: 1
+        /* STABLE */
+      });
+    };
+  }
+});
+
+export { _sfc_main as default };

package/index.js

@@ -1,4 +1,4 @@
-/*! fm-dev v1.0.57 */
+/*! fm-dev v1.0.59 */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue'), require('crypto'), require('url'), require('http'), require('https'), require('util'), require('stream'), require('assert'), require('zlib'), require('element-plus')) :
   typeof define === 'function' && define.amd ? define(['exports', 'vue', 'crypto', 'url', 'http', 'https', 'util', 'stream', 'assert', 'zlib', 'element-plus'], factory) :
@@ -15,7 +15,7 @@
   const _hoisted_8 = { class: "fm-transfer-panel" };
   const _hoisted_9 = { class: "fm-transfer-panel__header" };
   const _hoisted_10 = { class: "fm-transfer-panel__body" };
-  var _sfc_main$6 = /* @__PURE__ */ vue.defineComponent({
+  var _sfc_main$7 = /* @__PURE__ */ vue.defineComponent({
     ...{
       name: "FmTransfer"
     },
@@ -374,7 +374,7 @@
 
   const _hoisted_1$3 = { class: "notice-bar-warp-text-box" };
   const _hoisted_2$1 = ["innerHTML"];
-  var _sfc_main$5 = /* @__PURE__ */ vue.defineComponent({
+  var _sfc_main$6 = /* @__PURE__ */ vue.defineComponent({
     ...{
       name: "FmNoticeBar"
     },
@@ -497,7 +497,7 @@
     }
   });
 
-  var _sfc_main$4 = {
+  var _sfc_main$5 = {
     name: "dragVerify",
     props: {
       isPassing: {
@@ -879,9 +879,9 @@
       )
     ]);
   }
-  var dragimg = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["render", _sfc_render], ["__scopeId", "data-v-9e8c9ed2"]]);
+  var dragimg = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["render", _sfc_render], ["__scopeId", "data-v-9e8c9ed2"]]);
 
-  var _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
+  var _sfc_main$4 = /* @__PURE__ */ vue.defineComponent({
     ...{
       name: "Fmselect"
     },
@@ -23741,7 +23741,7 @@
   };
 
   const _hoisted_1$1 = { style: { "font-size": "14px", "line-height": "30px" } };
-  var _sfc_main$2 = /* @__PURE__ */ vue.defineComponent({
+  var _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
     ...{
       name: "FmAutocomplete"
     },
@@ -23860,6 +23860,126 @@
     }
   });
 
+  var _sfc_main$2 = /* @__PURE__ */ vue.defineComponent({
+    ...{
+      name: "Fminputdropdown"
+    },
+    __name: "index",
+    props: /* @__PURE__ */ vue.mergeModels({
+      //数据
+      optionData: {
+        type: Array,
+        default: []
+      },
+      /**
+       * 值的属性值
+       */
+      bvalue: {
+        type: String,
+        default: "id"
+      },
+      /**
+       * 值的属性标签
+       */
+      blabel: {
+        type: String,
+        default: "name"
+      },
+      placeholder: {
+        type: String,
+        default: "\u8BF7\u9009\u62E9"
+      },
+      inputWidth: {
+        type: String,
+        default: "40%"
+      },
+      dropWidth: {
+        type: String,
+        default: "90px"
+      }
+    }, {
+      "id": {
+        type: Number,
+        default: 0
+      },
+      "idModifiers": {},
+      "name": {
+        type: String,
+        default: ""
+      },
+      "nameModifiers": {}
+    }),
+    emits: /* @__PURE__ */ vue.mergeModels(["change"], ["update:id", "update:name"]),
+    setup(__props, { emit: __emit }) {
+      const modeValueId = vue.useModel(__props, "id");
+      const modeValueName = vue.useModel(__props, "name");
+      const props = __props;
+      const emit = __emit;
+      const handCommand = (command) => {
+        const fitem = props.optionData.find((item) => item[props.bvalue] === command);
+        modeValueId.value = fitem != null ? [props.bvalue] : 0;
+        modeValueName.value = fitem != null ? fitem[props.blabel] : "";
+        emit("change", fitem);
+      };
+      return (_ctx, _cache) => {
+        const _component_el_input = vue.resolveComponent("el-input");
+        const _component_el_dropdown_item = vue.resolveComponent("el-dropdown-item");
+        const _component_el_dropdown_menu = vue.resolveComponent("el-dropdown-menu");
+        const _component_el_dropdown = vue.resolveComponent("el-dropdown");
+        return vue.openBlock(), vue.createBlock(_component_el_dropdown, {
+          placement: "bottom",
+          trigger: "click",
+          style: { "width": "100%" },
+          onCommand: handCommand
+        }, {
+          dropdown: vue.withCtx(() => [
+            vue.createVNode(_component_el_dropdown_menu, {
+              style: vue.normalizeStyle({ width: __props.dropWidth })
+            }, {
+              default: vue.withCtx(() => [
+                (vue.openBlock(true), vue.createElementBlock(
+                  vue.Fragment,
+                  null,
+                  vue.renderList(__props.optionData, (item, index) => {
+                    return vue.openBlock(), vue.createBlock(_component_el_dropdown_item, {
+                      key: index,
+                      command: item[__props.bvalue],
+                      divided: ""
+                    }, {
+                      default: vue.withCtx(() => [
+                        vue.createTextVNode(
+                          vue.toDisplayString(item[__props.blabel]),
+                          1
+                          /* TEXT */
+                        )
+                      ]),
+                      _: 2
+                      /* DYNAMIC */
+                    }, 1032, ["command"]);
+                  }),
+                  128
+                  /* KEYED_FRAGMENT */
+                ))
+              ]),
+              _: 1
+              /* STABLE */
+            }, 8, ["style"])
+          ]),
+          default: vue.withCtx(() => [
+            vue.createVNode(_component_el_input, {
+              modelValue: modeValueName.value,
+              "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => modeValueName.value = $event),
+              placeholder: props.placeholder,
+              style: vue.normalizeStyle({ width: __props.inputWidth })
+            }, null, 8, ["modelValue", "placeholder", "style"])
+          ]),
+          _: 1
+          /* STABLE */
+        });
+      };
+    }
+  });
+
   /*! Element Plus Icons Vue v2.3.1 */
 
   var add_location_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ vue.defineComponent({
@@ -30017,11 +30137,12 @@
     }
   }
 
-  const FmTransfer = _sfc_main$6;
-  const FmNoticeBar = _sfc_main$5;
+  const FmTransfer = _sfc_main$7;
+  const FmNoticeBar = _sfc_main$6;
   const FmDragImg = dragimg;
-  const Fmselect = _sfc_main$3;
-  const FmAutocomplete = _sfc_main$2;
+  const Fmselect = _sfc_main$4;
+  const FmAutocomplete = _sfc_main$3;
+  const Fminputdropdown = _sfc_main$2;
 
   const makeInstaller = (components = []) => {
     const install = (app) => {
@@ -30071,7 +30192,8 @@
     FmTransfer,
     FmNoticeBar,
     Fmselect,
-    FmAutocomplete
+    FmAutocomplete,
+    Fminputdropdown
   ];
 
   var installer = makeInstaller([...plugins]);
@@ -52685,6 +52807,7 @@
       align: "center",
       // 自动监听父元素的变化去重新计算表格（对于父元素可能存在动态变化、显示隐藏的容器中、列宽异常等场景中的可能会用到）
       // data: [] as Array<T>,
+      spanMethod: opt.spanMethod,
       columns: opt.columns,
       showFooter: opt.showFooter,
       footerData: opt.footerData,
@@ -52766,6 +52889,7 @@
   exports.FmLogin = FmLogin;
   exports.FmNoticeBar = FmNoticeBar;
   exports.FmTransfer = FmTransfer;
+  exports.Fminputdropdown = Fminputdropdown;
   exports.Fmselect = Fmselect;
   exports.HttpMethodEnum = HttpMethodEnum;
   exports.JobCreateTypeEnum = JobCreateTypeEnum;