@fmdeui/fmui 1.0.113 → 1.0.115

package/es/component.mjs

@@ -16,6 +16,7 @@ import { FmCascader } from './packages/components/fmcascader/index.mjs';
 import { FmInputNumber } from './packages/components/fm-inputnumber/index.mjs';
 import { FmAutocomplete } from './packages/components/fm-autocomplete/index.mjs';
 import { FmSelect } from './packages/components/fm-select/index.mjs';
+import { Fmdatepicker } from './packages/components/fm-datepicker/index.mjs';
 
 const plugins = [
   FButton,
@@ -35,7 +36,8 @@ const plugins = [
   FmCascader,
   FmInputNumber,
   FmAutocomplete,
-  FmSelect
+  FmSelect,
+  Fmdatepicker
 ];
 
 export { plugins as default };

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

@@ -0,0 +1,33 @@
+import { DefineComponent, ExtractPropTypes, PropType, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
+export declare const Fmdatepicker: DefineComponent<ExtractPropTypes<{
+    dateType: {
+        type: StringConstructor;
+        default: string;
+    };
+    adddaynum: {
+        type: NumberConstructor;
+        default: number;
+    };
+    modelValue: {
+        type: PropType<any>;
+    };
+}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
+    "update:modelValue": (value: any) => any;
+}, string, PublicProps, Readonly< ExtractPropTypes<{
+    dateType: {
+        type: StringConstructor;
+        default: string;
+    };
+    adddaynum: {
+        type: NumberConstructor;
+        default: number;
+    };
+    modelValue: {
+        type: PropType<any>;
+    };
+}>> & Readonly<{
+    "onUpdate:modelValue"?: ((value: any) => any) | undefined;
+}>, {
+    dateType: string;
+    adddaynum: number;
+}, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;

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

@@ -0,0 +1,34 @@
+import { DefineComponent, ExtractPropTypes, PropType, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
+declare const _default: DefineComponent<ExtractPropTypes<{
+    dateType: {
+        type: StringConstructor;
+        default: string;
+    };
+    adddaynum: {
+        type: NumberConstructor;
+        default: number;
+    };
+    modelValue: {
+        type: PropType<any>;
+    };
+}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
+    "update:modelValue": (value: any) => any;
+}, string, PublicProps, Readonly< ExtractPropTypes<{
+    dateType: {
+        type: StringConstructor;
+        default: string;
+    };
+    adddaynum: {
+        type: NumberConstructor;
+        default: number;
+    };
+    modelValue: {
+        type: PropType<any>;
+    };
+}>> & Readonly<{
+    "onUpdate:modelValue"?: ((value: any) => any) | undefined;
+}>, {
+    dateType: string;
+    adddaynum: number;
+}, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
+export default _default;

package/es/components/index.d.ts

@@ -15,3 +15,4 @@ export * from './fm-select';
 export * from './fm-inputdropdown';
 export * from './fm-inputnumber';
 export * from './fm-autocomplete';
+export * from './fm-datepicker';

package/es/hooks/useVxeTableOptionsHook.d.ts

@@ -38,6 +38,10 @@ interface iVxeOption {
     footerData?: VxeTablePropTypes.FooterData;
     footerMethod?: VxeTablePropTypes.FooterMethod<any>;
     remoteCustom?: boolean;
+    spanRules?: Array<{
+        valueField: string;
+        targetFields: string[];
+    }>;
 }
 /**
  * Vxe表格参数化Hook

package/es/index.mjs

@@ -27,7 +27,7 @@ export { default as en } from './packages/locale/lang/en.mjs';
 export { exportExcel } from './packages/utils/exportExcel.mjs';
 export { feature, useSysApi } from './packages/api/sys/index.mjs';
 export { flowLoading } from './packages/utils/flowLoading.mjs';
-export { formatAxis, formatDate, formatPast, getWeek } from './packages/utils/formatTime.mjs';
+export { formatAxis, formatDate, formatPast, getBdate, getEdate, getWeek } from './packages/utils/formatTime.mjs';
 export { gcj02ToBd09, wgs84ToBd09, wgs84ToGcj02 } from './packages/utils/gpsConvertor.mjs';
 export { getFileUrl, showFileUrl } from './packages/utils/uploadfileurl.mjs';
 export { getFormItemLabel, getFormItemProp, getRules, getShowColumn, getShowColumnWidth, getSubFormFields, getlimit, showTabelColumn } from './packages/hooks/limitsFunction.mjs';

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

@@ -1,4 +1,4 @@
-import { defineComponent, useModel, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, withModifiers, unref, createCommentVNode, createElementVNode, toDisplayString, mergeModels } from 'vue';
+import { defineComponent, useModel, ref, resolveComponent, openBlock, createBlock, createSlots, withCtx, createElementVNode, toDisplayString, createVNode, withModifiers, unref, createCommentVNode, mergeModels } from 'vue';
 import { Search } from '@element-plus/icons-vue';
 import '../../api/index.mjs';
 import './component/userSelectDialog.vue.mjs';
@@ -157,7 +157,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         "trigger-on-focus": false,
         onSelect: handleSelect,
         style: { "margin-top": "-2px" }
-      }, {
+      }, createSlots({
         default: withCtx(({ item }) => [
           createElementVNode(
             "div",
@@ -167,45 +167,50 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             /* TEXT */
           )
         ]),
-        suffix: withCtx(() => [
-          createVNode(_component_el_icon, {
-            color: "#E6A23C",
-            size: __props.searchsize,
-            onClick: _cache[0] || (_cache[0] = withModifiers(() => visibleopenDialog.value = true, ["stop"]))
-          }, {
-            default: withCtx(() => [
-              createVNode(unref(Search))
-            ]),
-            _: 1
-            /* STABLE */
-          }, 8, ["size"]),
-          __props.openType == 0 ? (openBlock(), createBlock(_sfc_main$1, {
-            key: 0,
-            visible: visibleopenDialog.value,
-            "onUpdate:visible": _cache[1] || (_cache[1] = ($event) => visibleopenDialog.value = $event),
-            orgService: __props.orgService,
-            orgAction: __props.orgAction,
-            orgparas: __props.params,
-            title: __props.title,
-            userService: __props.userService,
-            userAction: __props.userAction,
-            userParams: __props.params,
-            onChange: handleSelectDialogChange
-          }, null, 8, ["visible", "orgService", "orgAction", "orgparas", "title", "userService", "userAction", "userParams"])) : createCommentVNode("v-if", true),
-          __props.openType == 2 ? (openBlock(), createBlock(_sfc_main$2, {
-            key: 1,
-            visible: visibleopenDialog.value,
-            "onUpdate:visible": _cache[2] || (_cache[2] = ($event) => visibleopenDialog.value = $event),
-            title: __props.title,
-            userService: __props.userService,
-            userAction: __props.userAction,
-            userParams: __props.params,
-            onChange: handleSelectDialogChange
-          }, null, 8, ["visible", "title", "userService", "userAction", "userParams"])) : createCommentVNode("v-if", true)
-        ]),
-        _: 1
-        /* STABLE */
-      }, 8, ["modelValue", "placeholder"]);
+        _: 2
+        /* DYNAMIC */
+      }, [
+        __props.openType > -1 ? {
+          name: "suffix",
+          fn: withCtx(() => [
+            createVNode(_component_el_icon, {
+              color: "#E6A23C",
+              size: __props.searchsize,
+              onClick: _cache[0] || (_cache[0] = withModifiers(() => visibleopenDialog.value = true, ["stop"]))
+            }, {
+              default: withCtx(() => [
+                createVNode(unref(Search))
+              ]),
+              _: 1
+              /* STABLE */
+            }, 8, ["size"]),
+            __props.openType == 0 ? (openBlock(), createBlock(_sfc_main$1, {
+              key: 0,
+              visible: visibleopenDialog.value,
+              "onUpdate:visible": _cache[1] || (_cache[1] = ($event) => visibleopenDialog.value = $event),
+              orgService: __props.orgService,
+              orgAction: __props.orgAction,
+              orgparas: __props.params,
+              title: __props.title,
+              userService: __props.userService,
+              userAction: __props.userAction,
+              userParams: __props.params,
+              onChange: handleSelectDialogChange
+            }, null, 8, ["visible", "orgService", "orgAction", "orgparas", "title", "userService", "userAction", "userParams"])) : createCommentVNode("v-if", true),
+            __props.openType == 2 ? (openBlock(), createBlock(_sfc_main$2, {
+              key: 1,
+              visible: visibleopenDialog.value,
+              "onUpdate:visible": _cache[2] || (_cache[2] = ($event) => visibleopenDialog.value = $event),
+              title: __props.title,
+              userService: __props.userService,
+              userAction: __props.userAction,
+              userParams: __props.params,
+              onChange: handleSelectDialogChange
+            }, null, 8, ["visible", "title", "userService", "userAction", "userParams"])) : createCommentVNode("v-if", true)
+          ]),
+          key: "0"
+        } : void 0
+      ]), 1032, ["modelValue", "placeholder"]);
     };
   }
 });

package/es/packages/components/fm-datepicker/index.mjs

@@ -0,0 +1,6 @@
+import './index.vue.mjs';
+import _sfc_main from './index2.vue.mjs';
+
+const Fmdatepicker = _sfc_main;
+
+export { Fmdatepicker };

package/es/packages/components/fm-datepicker/index.vue.mjs

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

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

@@ -0,0 +1,56 @@
+import { defineComponent, useModel, onMounted, nextTick, resolveComponent, openBlock, createBlock, mergeModels } from 'vue';
+import '../../utils/index.mjs';
+import { getBdate, getEdate, formatDate } from '../../utils/formatTime.mjs';
+
+var _sfc_main = /* @__PURE__ */ defineComponent({
+  ...{
+    name: "Fmdatepicker"
+  },
+  __name: "index",
+  props: /* @__PURE__ */ mergeModels({
+    dateType: {
+      type: String,
+      default: "bdate"
+    },
+    adddaynum: {
+      type: Number,
+      default: 0
+    }
+  }, {
+    "modelValue": {},
+    "modelModifiers": {}
+  }),
+  emits: ["update:modelValue"],
+  setup(__props) {
+    const modeValue = useModel(__props, "modelValue");
+    const props = __props;
+    onMounted(() => {
+      nextTick(() => {
+        initdate();
+      });
+    });
+    const initdate = () => {
+      if (props.dateType === "bdate" && (modeValue.value == null || modeValue.value == void 0 || modeValue.value == "")) {
+        modeValue.value = getBdate(props.adddaynum);
+      } else if (props.dateType === "edate" && (modeValue.value == null || modeValue.value == void 0 || modeValue.value == "")) {
+        modeValue.value = getEdate(props.adddaynum);
+      } else if (props.dateType === "curday" && (modeValue.value == null || modeValue.value == void 0 || modeValue.value == "")) {
+        modeValue.value = formatDate(/* @__PURE__ */ new Date(), "YYYY-mm-dd");
+      }
+    };
+    initdate();
+    return (_ctx, _cache) => {
+      const _component_el_date_picker = resolveComponent("el-date-picker");
+      return openBlock(), createBlock(_component_el_date_picker, {
+        class: "fmdatepicker",
+        modelValue: modeValue.value,
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => modeValue.value = $event),
+        type: "date",
+        format: "YYYY-MM-DD",
+        "value-format": "YYYY-MM-DD"
+      }, null, 8, ["modelValue"]);
+    };
+  }
+});
+
+export { _sfc_main as default };

package/es/packages/components/index.mjs

@@ -15,3 +15,4 @@ export { FmSelect } from './fm-select/index.mjs';
 export { Fminputdropdown } from './fm-inputdropdown/index.mjs';
 export { FmInputNumber } from './fm-inputnumber/index.mjs';
 export { FmAutocomplete } from './fm-autocomplete/index.mjs';
+export { Fmdatepicker } from './fm-datepicker/index.mjs';

package/es/packages/hooks/useVxeTableOptionsHook.mjs

@@ -7,7 +7,7 @@ import '../api/index.mjs';
 import { useBaseApi } from '../api/base/index.mjs';
 
 const useVxeTable = (opt, extras) => {
-  var _a, _b;
+  var _a, _b, _c;
   const vxeSize = useThemeConfig().themeConfig.globalComponentSize == "small" ? "mini" : useThemeConfig().themeConfig.globalComponentSize == "default" ? "small" : "medium";
   const userStore = useUserInfo();
   const processColumns = (columns) => {
@@ -58,7 +58,25 @@ const useVxeTable = (opt, extras) => {
         }
       }
     }
-  } : opt.spanMethod ? opt.spanMethod : ({ row, rowIndex, column, visibleData }) => {
+  } : opt.spanMethod ? opt.spanMethod : opt.spanRules && ((_c = opt.spanRules) == null ? void 0 : _c.length) > 0 ? ({ row, rowIndex, column, visibleData }) => {
+    if (!opt.spanRules || opt.spanRules.length === 0) return void 0;
+    const rule = opt.spanRules.find((r) => r.targetFields.includes(column.field));
+    if (!rule) return;
+    const cellValue = row[rule.valueField];
+    if (!cellValue && cellValue !== 0) return;
+    const prevRow = visibleData[rowIndex - 1];
+    if (prevRow && prevRow[rule.valueField] === cellValue) {
+      return { rowspan: 0, colspan: 0 };
+    }
+    let rowspanCount = 1;
+    let nextIndex = rowIndex + 1;
+    while (nextIndex < visibleData.length && visibleData[nextIndex][rule.valueField] === cellValue) {
+      rowspanCount++;
+      nextIndex++;
+    }
+    if (rowspanCount > 1)
+      return { rowspan: rowspanCount, colspan: 1 };
+  } : ({ row, rowIndex, column, visibleData }) => {
   };
   const options = reactive({
     stripe: false,
@@ -159,11 +177,11 @@ const useVxeTable = (opt, extras) => {
   }
   if (opt.remoteCustom && options.customConfig != void 0) {
     options.customConfig.restoreStore = async ({ id, storeData }) => {
-      var _a2, _b2, _c, _d;
+      var _a2, _b2, _c2, _d;
       const { data } = await useBaseApi("sysColumnCustom").get({ id }, "sysColumnCustomDetail");
       if ((_a2 = data.result) == null ? void 0 : _a2.fixedData) storeData.fixedData = data.result.fixedData;
       if ((_b2 = data.result) == null ? void 0 : _b2.resizableData) storeData.resizableData = data.result.resizableData;
-      if ((_c = data.result) == null ? void 0 : _c.sortData) storeData.sortData = data.result.sortData;
+      if ((_c2 = data.result) == null ? void 0 : _c2.sortData) storeData.sortData = data.result.sortData;
       if ((_d = data.result) == null ? void 0 : _d.visibleData) storeData.visibleData = data.result.visibleData;
       return storeData;
     };

package/es/packages/utils/formatTime.mjs

@@ -106,5 +106,16 @@ function formatAxis(param, t) {
   else if (hour < 22) return getMessage("eveningGreeting");
   else return getMessage("nightGreeting");
 }
+function getBdate(num = 1) {
+  const firstDay = /* @__PURE__ */ new Date();
+  firstDay.setDate(num);
+  return formatDate(firstDay, "YYYY-mm-dd");
+}
+function getEdate(num = 0) {
+  const lastDay = /* @__PURE__ */ new Date();
+  lastDay.setMonth(lastDay.getMonth() + 1, 0);
+  if (num > 0) lastDay.setDate(num);
+  return formatDate(lastDay, "YYYY-mm-dd");
+}
 
-export { formatAxis, formatDate, formatPast, getWeek };
+export { formatAxis, formatDate, formatPast, getBdate, getEdate, getWeek };

package/es/packages/utils/index.mjs

@@ -5,7 +5,7 @@ export { signatureByKSort } from './data-signature.mjs';
 export { downloadByBase64, downloadByData, downloadByOnlineUrl, downloadByUrl, downloadStreamFile, getFileName, openWindow } from './download.mjs';
 export { exportExcel } from './exportExcel.mjs';
 export { flowLoading } from './flowLoading.mjs';
-export { formatAxis, formatDate, formatPast, getWeek } from './formatTime.mjs';
+export { formatAxis, formatDate, formatPast, getBdate, getEdate, getWeek } from './formatTime.mjs';
 export { useFormRulePresets } from './formRule.mjs';
 export { validateFormWithScroll, validateFormWithScrollCallback } from './formValidate.mjs';
 import './getStyleSheets.mjs';

package/es/utils/formatTime.d.ts

@@ -35,3 +35,13 @@ export declare function formatPast(param: string | Date, format?: string): strin
  * @returns 返回拼接后的时间字符串
  */
 export declare function formatAxis(param: Date, t?: Function): string;
+/**
+ *
+ * @returns 返回当前月的第一天
+ */
+export declare function getBdate(num?: number): string;
+/**
+ *
+ * @returns 返回当前月的最后一天
+ */
+export declare function getEdate(num?: number): string;