ljs-tools 0.2.8 → 0.2.10

package/index.js

@@ -9287,7 +9287,7 @@ const __default__$3 = defineComponent({
   name: "ElIcon",
   inheritAttrs: false
 });
-const _sfc_main$c = /* @__PURE__ */ defineComponent({
+const _sfc_main$d = /* @__PURE__ */ defineComponent({
   ...__default__$3,
   props: iconProps,
   setup(__props) {
@@ -9312,7 +9312,7 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
     };
   }
 });
-var Icon = /* @__PURE__ */ _export_sfc$1(_sfc_main$c, [["__file", "/home/runner/work/element-plus/element-plus/packages/components/icon/src/icon.vue"]]);
+var Icon = /* @__PURE__ */ _export_sfc$1(_sfc_main$d, [["__file", "/home/runner/work/element-plus/element-plus/packages/components/icon/src/icon.vue"]]);
 const ElIcon = withInstall(Icon);
 const formContextKey = Symbol("formContextKey");
 const formItemContextKey = Symbol("formItemContextKey");
@@ -9556,14 +9556,14 @@ const inputEmits = {
   compositionupdate: (evt) => evt instanceof CompositionEvent,
   compositionend: (evt) => evt instanceof CompositionEvent
 };
-const _hoisted_1$7 = ["role"];
+const _hoisted_1$8 = ["role"];
 const _hoisted_2$6 = ["id", "type", "disabled", "formatter", "parser", "readonly", "autocomplete", "tabindex", "aria-label", "placeholder", "form", "autofocus"];
 const _hoisted_3$4 = ["id", "tabindex", "disabled", "readonly", "autocomplete", "aria-label", "placeholder", "form", "autofocus"];
 const __default__$2 = defineComponent({
   name: "ElInput",
   inheritAttrs: false
 });
-const _sfc_main$b = /* @__PURE__ */ defineComponent({
+const _sfc_main$c = /* @__PURE__ */ defineComponent({
   ...__default__$2,
   props: inputProps,
   emits: inputEmits,
@@ -9983,13 +9983,13 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
             class: normalizeClass(unref(nsInput).e("count"))
           }, toDisplayString(unref(textLength)) + " / " + toDisplayString(unref(attrs).maxlength), 7)) : createCommentVNode("v-if", true)
         ], 64))
-      ], 16, _hoisted_1$7)), [
+      ], 16, _hoisted_1$8)), [
         [vShow, _ctx.type !== "hidden"]
       ]);
     };
   }
 });
-var Input = /* @__PURE__ */ _export_sfc$1(_sfc_main$b, [["__file", "/home/runner/work/element-plus/element-plus/packages/components/input/src/input.vue"]]);
+var Input = /* @__PURE__ */ _export_sfc$1(_sfc_main$c, [["__file", "/home/runner/work/element-plus/element-plus/packages/components/input/src/input.vue"]]);
 const ElInput = withInstall(Input);
 const FOCUS_AFTER_TRAPPED = "focus-trap.focus-after-trapped";
 const FOCUS_AFTER_RELEASED = "focus-trap.focus-after-released";
@@ -10139,7 +10139,7 @@ const createFocusOutPreventedEvent = (detail) => {
     detail
   });
 };
-const _sfc_main$a = defineComponent({
+const _sfc_main$b = defineComponent({
   name: "ElFocusTrap",
   inheritAttrs: false,
   props: {
@@ -10375,10 +10375,10 @@ const _sfc_main$a = defineComponent({
     };
   }
 });
-function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) {
+function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
   return renderSlot(_ctx.$slots, "default", { handleKeydown: _ctx.onKeydown });
 }
-var ElFocusTrap = /* @__PURE__ */ _export_sfc$1(_sfc_main$a, [["render", _sfc_render$8], ["__file", "/home/runner/work/element-plus/element-plus/packages/components/focus-trap/src/focus-trap.vue"]]);
+var ElFocusTrap = /* @__PURE__ */ _export_sfc$1(_sfc_main$b, [["render", _sfc_render$9], ["__file", "/home/runner/work/element-plus/element-plus/packages/components/focus-trap/src/focus-trap.vue"]]);
 const buttonGroupContextKey = Symbol("buttonGroupContextKey");
 const useButton = (props, emit) => {
   useDeprecated({
@@ -11431,7 +11431,7 @@ function useButtonCustomStyle(props) {
 const __default__$1 = defineComponent({
   name: "ElButton"
 });
-const _sfc_main$9 = /* @__PURE__ */ defineComponent({
+const _sfc_main$a = /* @__PURE__ */ defineComponent({
   ...__default__$1,
   props: buttonProps,
   emits: buttonEmits,
@@ -11497,7 +11497,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-var Button = /* @__PURE__ */ _export_sfc$1(_sfc_main$9, [["__file", "/home/runner/work/element-plus/element-plus/packages/components/button/src/button.vue"]]);
+var Button = /* @__PURE__ */ _export_sfc$1(_sfc_main$a, [["__file", "/home/runner/work/element-plus/element-plus/packages/components/button/src/button.vue"]]);
 const buttonGroupProps = {
   size: buttonProps.size,
   type: buttonProps.type
@@ -11505,7 +11505,7 @@ const buttonGroupProps = {
 const __default__ = defineComponent({
   name: "ElButtonGroup"
 });
-const _sfc_main$8 = /* @__PURE__ */ defineComponent({
+const _sfc_main$9 = /* @__PURE__ */ defineComponent({
   ...__default__,
   props: buttonGroupProps,
   setup(__props) {
@@ -11524,7 +11524,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-var ButtonGroup = /* @__PURE__ */ _export_sfc$1(_sfc_main$8, [["__file", "/home/runner/work/element-plus/element-plus/packages/components/button/src/button-group.vue"]]);
+var ButtonGroup = /* @__PURE__ */ _export_sfc$1(_sfc_main$9, [["__file", "/home/runner/work/element-plus/element-plus/packages/components/button/src/button-group.vue"]]);
 const ElButton = withInstall(Button, {
   ButtonGroup
 });
@@ -11641,7 +11641,7 @@ var Overlay = defineComponent({
   }
 });
 const ElOverlay = Overlay;
-const _sfc_main$7 = defineComponent({
+const _sfc_main$8 = defineComponent({
   name: "ElMessageBox",
   directives: {
     TrapFocus
@@ -11910,10 +11910,10 @@ const _sfc_main$7 = defineComponent({
     };
   }
 });
-const _hoisted_1$6 = ["aria-label", "aria-describedby"];
+const _hoisted_1$7 = ["aria-label", "aria-describedby"];
 const _hoisted_2$5 = ["aria-label"];
 const _hoisted_3$3 = ["id"];
-function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
+function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_icon = resolveComponent("el-icon");
   const _component_close = resolveComponent("close");
   const _component_el_input = resolveComponent("el-input");
@@ -12101,7 +12101,7 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
               ]),
               _: 3
             }, 8, ["trapped", "focus-trap-el", "focus-start-el", "onReleaseRequested"])
-          ], 42, _hoisted_1$6)
+          ], 42, _hoisted_1$7)
         ]),
         _: 3
       }, 8, ["z-index", "overlay-class", "mask"]), [
@@ -12111,7 +12111,7 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
     _: 3
   });
 }
-var MessageBoxConstructor = /* @__PURE__ */ _export_sfc$1(_sfc_main$7, [["render", _sfc_render$7], ["__file", "/home/runner/work/element-plus/element-plus/packages/components/message-box/src/index.vue"]]);
+var MessageBoxConstructor = /* @__PURE__ */ _export_sfc$1(_sfc_main$8, [["render", _sfc_render$8], ["__file", "/home/runner/work/element-plus/element-plus/packages/components/message-box/src/index.vue"]]);
 const messageInstance = /* @__PURE__ */ new Map();
 const getAppendToElement = (props) => {
   let appendTo = document.body;
@@ -12277,7 +12277,7 @@ function delMessageBox({
 const LJSEl = {
   delMessageBox
 };
-const index$1 = {
+const index$3 = {
   // emits: ['input', 'update:value'],
   props: {
     // 转速，单位秒
@@ -12320,13 +12320,13 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const _sfc_main$6 = index$1;
-const _withScopeId$1 = (n) => (pushScopeId("data-v-295da8be"), n = n(), popScopeId(), n);
-const _hoisted_1$5 = { class: "text" };
+const _sfc_main$7 = index$3;
+const _withScopeId$3 = (n) => (pushScopeId("data-v-295da8be"), n = n(), popScopeId(), n);
+const _hoisted_1$6 = { class: "text" };
 const _hoisted_2$4 = { class: "g-container" };
-const _hoisted_3$2 = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ createElementVNode("div", { class: "g-circle" }, null, -1));
+const _hoisted_3$2 = /* @__PURE__ */ _withScopeId$3(() => /* @__PURE__ */ createElementVNode("div", { class: "g-circle" }, null, -1));
 const _hoisted_4 = { class: "g-bubbles" };
-function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
+function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("div", {
     class: "ljs-loading",
     id: "ljs-loading",
@@ -12338,7 +12338,7 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
       "--textcolor": _ctx.textColor
     })
   }, [
-    createElementVNode("div", _hoisted_1$5, [
+    createElementVNode("div", _hoisted_1$6, [
       renderSlot(_ctx.$slots, "default", {}, void 0, true)
     ]),
     createElementVNode("div", _hoisted_2$4, [
@@ -12354,9 +12354,9 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ], 4);
 }
-const LJSLoading = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["render", _sfc_render$6], ["__scopeId", "data-v-295da8be"]]);
+const LJSLoading = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["render", _sfc_render$7], ["__scopeId", "data-v-295da8be"]]);
 const pagination_vue_vue_type_style_index_0_scoped_fc144f23_lang = "";
-const _sfc_main$5 = {
+const _sfc_main$6 = {
   name: "pagination",
   props: {
     total: {
@@ -12436,11 +12436,11 @@ const _sfc_main$5 = {
     }
   }
 };
-const _hoisted_1$4 = { class: "pagination" };
+const _hoisted_1$5 = { class: "pagination" };
 const _hoisted_2$3 = { class: "note" };
-function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
+function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_pagination = resolveComponent("el-pagination");
-  return openBlock(), createElementBlock("div", _hoisted_1$4, [
+  return openBlock(), createElementBlock("div", _hoisted_1$5, [
     createElementVNode("div", _hoisted_2$3, toDisplayString($props.note), 1),
     createVNode(_component_el_pagination, mergeProps({
       background: $props.background,
@@ -12458,8 +12458,8 @@ function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
     }), null, 16, ["background", "current-page", "page-size", "layout", "page-sizes", "pager-count", "total", "onSizeChange", "onCurrentChange"])
   ]);
 }
-const Pagination = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["render", _sfc_render$5], ["__scopeId", "data-v-fc144f23"]]);
-const index = {
+const Pagination = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["render", _sfc_render$6], ["__scopeId", "data-v-fc144f23"]]);
+const index$2 = {
   name: "RightMenu",
   props: {
     modelValue: [Boolean],
@@ -12490,8 +12490,8 @@ const index = {
   }
 };
 const index_vue_vue_type_style_index_0_scoped_a4322b42_lang = "";
-const _sfc_main$4 = index;
-function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) {
+const _sfc_main$5 = index$2;
+function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createBlock(Teleport, { to: "body" }, [
     _ctx.modelValue ? (openBlock(), createElementBlock("div", {
       key: 0,
@@ -12505,9 +12505,9 @@ function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) {
     ], 6)) : createCommentVNode("", true)
   ]);
 }
-const RightMenu = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["render", _sfc_render$4], ["__scopeId", "data-v-a4322b42"]]);
+const RightMenu = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["render", _sfc_render$5], ["__scopeId", "data-v-a4322b42"]]);
 const index_vue_vue_type_style_index_0_scoped_2c007365_lang = "";
-const _sfc_main$3 = {
+const _sfc_main$4 = {
   name: "DatetypeChooseDate",
   props: {
     // 日期区间数据
@@ -12657,9 +12657,9 @@ const _sfc_main$3 = {
     }
   }
 };
-const _hoisted_1$3 = ["onClick"];
+const _hoisted_1$4 = ["onClick"];
 const _hoisted_2$2 = { class: "frequencyDate" };
-function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
+function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_date_picker = resolveComponent("el-date-picker");
   const _component_el_form_item = resolveComponent("el-form-item");
   return openBlock(), createBlock(_component_el_form_item, {
@@ -12678,7 +12678,7 @@ function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
             class: normalizeClass(["one", { active: $options.dateType === dict.dictValue }]),
             onClick: ($event) => $options.dateTypeF(dict.dictValue),
             key: dict.dictValue
-          }, toDisplayString(dict.dictLabel), 11, _hoisted_1$3);
+          }, toDisplayString(dict.dictLabel), 11, _hoisted_1$4);
         }), 128))
       ], 4),
       createVNode(Transition, { name: "frequencyDate" }, {
@@ -12703,9 +12703,8 @@ function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   }, 8, ["label"]);
 }
-const DatetypeChooseDate = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["render", _sfc_render$3], ["__scopeId", "data-v-2c007365"]]);
-const index_vue_vue_type_style_index_0_scoped_6e589d4a_lang = "";
-const _sfc_main$2 = {
+const DatetypeChooseDate = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["render", _sfc_render$4], ["__scopeId", "data-v-2c007365"]]);
+const index$1 = {
   name: "DatetypeChooseDateRange",
   props: {
     // 日期区间数据
@@ -12714,6 +12713,16 @@ const _sfc_main$2 = {
     dictValue: String,
     // 日期类型字典数据
     datetypeData: Array,
+    // 清除按钮
+    clearable: {
+      type: Boolean,
+      default: false
+    },
+    disabledDate: {
+      type: Function,
+      default: () => {
+      }
+    },
     // 字典key值对应的value值，按照年月日的顺序，默认年为1日为3
     dateTypeKeyValue: {
       type: Array,
@@ -12738,7 +12747,9 @@ const _sfc_main$2 = {
       date_type: [],
       // 日期参数
       opts: {
-        dateType: "daterange",
+        startDate: null,
+        endDate: null,
+        dateType: "date",
         // 日期类型，年year，月month，日date
         dateTypeTag: true,
         // 日期控件是否显示
@@ -12754,14 +12765,6 @@ const _sfc_main$2 = {
       set(val) {
         this.$emit("update:dictValue", val);
       }
-    },
-    dateValue: {
-      get() {
-        return this.date;
-      },
-      set(val) {
-        this.$emit("update:date", val);
-      }
     }
   },
   watch: {
@@ -12786,12 +12789,23 @@ const _sfc_main$2 = {
     this.init();
   },
   methods: {
-    yearChange() {
-      if (Number(this.dateValue[1]) < Number(this.dateValue[0])) {
-        const temp0 = this.dateValue[0];
-        const temp1 = this.dateValue[1];
-        this.dateValue = [temp1, temp0];
+    // 切换日期
+    dateChange() {
+      if (this.opts.startDate === null || this.opts.endDate === null) {
+        return;
+      }
+      let start = this.opts.startDate;
+      let end = this.opts.startDate;
+      if (this.dateType !== "year") {
+        start = new Date(this.opts.startDate).getTime();
+        end = new Date(this.opts.endDate).getTime();
+      }
+      if (Number(start) > Number(end)) {
+        const temp = this.opts.startDate;
+        this.opts.startDate = this.opts.endDate;
+        this.opts.endDate = temp;
       }
+      this.$emit("update:date", [this.opts.startDate, this.opts.endDate]);
     },
     init() {
       this.initData();
@@ -12812,6 +12826,10 @@ const _sfc_main$2 = {
         });
         this.date_type = res1;
       }
+      if (!LJSbase.fieldCheck(this.date) && this.date.length === 2) {
+        this.opts.startDate = this.date[0];
+        this.opts.endDate = this.date[1];
+      }
       this.dateTypeF(this.dateType);
     },
     // 日期类型切换
@@ -12819,109 +12837,112 @@ const _sfc_main$2 = {
       this.opts.dateTypeTag = false;
       this.dateType = val;
       let dateValue = [];
-      const date = /* @__PURE__ */ new Date();
+      let date = null;
       switch (val) {
         case this.dateTypeKeyValue[3]:
-          this.opts.dateType = "daterange";
-          this.opts.valueFormat = "YYYY-MM-DD";
-          dateValue = [LJSdate.formatTime(date, "{y}-{m}-{d}"), LJSdate.formatTime(date, "{y}-{m}-{d}")];
+          this.opts.dateType = "datetime";
+          this.opts.valueFormat = "YYYY-MM-DD HH:mm:ss";
           break;
         case this.dateTypeKeyValue[2]:
-          this.opts.dateType = "daterange";
+          this.opts.dateType = "date";
           this.opts.valueFormat = "YYYY-MM-DD";
-          dateValue = [LJSdate.formatTime(date, "{y}-{m}-01"), LJSdate.formatTime(date, "{y}-{m}-{d}")];
           break;
         case this.dateTypeKeyValue[1]:
-          this.opts.dateType = "monthrange";
+          this.opts.dateType = "month";
           this.opts.valueFormat = "YYYY-MM";
-          dateValue = [LJSdate.formatTime(date, "{y}-01"), LJSdate.formatTime(date, "{y}-{m}")];
           break;
         case this.dateTypeKeyValue[0]:
           this.opts.dateType = "year";
           this.opts.valueFormat = "YYYY";
-          dateValue = [(date.getFullYear() - 4).toString(), date.getFullYear().toString()];
           break;
       }
-      this.dateValue = dateValue;
+      if (!LJSbase.fieldCheck(this.date) && this.date.length === 2) {
+        date = [this.date[0], this.date[1]];
+        switch (val) {
+          case this.dateTypeKeyValue[3]:
+            dateValue = [LJSdate.formatTime(date[0], "{y}-{m}-{d}"), LJSdate.formatTime(date[1], "{y}-{m}-{d}")];
+            break;
+          case this.dateTypeKeyValue[2]:
+            dateValue = [LJSdate.formatTime(date[0], "{y}-{m}-{d}"), LJSdate.formatTime(date[1], "{y}-{m}-{d}")];
+            break;
+          case this.dateTypeKeyValue[1]:
+            dateValue = [LJSdate.formatTime(date[0], "{y}-{m}"), LJSdate.formatTime(date[1], "{y}-{m}")];
+            break;
+          case this.dateTypeKeyValue[0]:
+            dateValue = date;
+            break;
+        }
+        this.dateValue = dateValue;
+      }
       setTimeout(() => {
         this.opts.dateTypeTag = true;
       }, 0);
     }
   }
 };
-const _hoisted_1$2 = ["onClick"];
+const index_vue_vue_type_style_index_0_scoped_e45b32bb_lang = "";
+const _sfc_main$3 = index$1;
+const _withScopeId$2 = (n) => (pushScopeId("data-v-e45b32bb"), n = n(), popScopeId(), n);
+const _hoisted_1$3 = ["onClick"];
 const _hoisted_2$1 = {
   key: 0,
   class: "frequencyDate"
 };
-const _hoisted_3$1 = {
-  key: 2,
-  class: "zhi"
-};
-function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
+const _hoisted_3$1 = /* @__PURE__ */ _withScopeId$2(() => /* @__PURE__ */ createElementVNode("span", { class: "zhi" }, "~", -1));
+function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_date_picker = resolveComponent("el-date-picker");
   const _component_el_form_item = resolveComponent("el-form-item");
   return openBlock(), createBlock(_component_el_form_item, {
-    label: $props.formItemLabel,
+    label: _ctx.formItemLabel,
     prop: "date"
   }, {
     default: withCtx(() => [
       createElementVNode("div", {
         class: "frequency",
         style: normalizeStyle({
-          "--dateTypeNum": $data.date_type.length
+          "--dateTypeNum": _ctx.date_type.length
         })
       }, [
-        (openBlock(true), createElementBlock(Fragment, null, renderList($data.date_type, (dict) => {
+        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.date_type, (dict) => {
           return openBlock(), createElementBlock("div", {
-            class: normalizeClass(["one", { active: $options.dateType === dict.dictValue }]),
-            onClick: ($event) => $options.dateTypeF(dict.dictValue),
+            class: normalizeClass(["one", { active: _ctx.dateType === dict.dictValue }]),
+            onClick: ($event) => _ctx.dateTypeF(dict.dictValue),
             key: dict.dictValue
-          }, toDisplayString(dict.dictLabel), 11, _hoisted_1$2);
+          }, toDisplayString(dict.dictLabel), 11, _hoisted_1$3);
         }), 128))
       ], 4),
       createVNode(Transition, { name: "frequencyDate" }, {
         default: withCtx(() => [
-          $data.opts.dateTypeTag ? (openBlock(), createElementBlock("div", _hoisted_2$1, [
-            $data.opts.dateType !== "year" ? (openBlock(), createBlock(_component_el_date_picker, {
-              key: 0,
-              modelValue: $options.dateValue,
-              "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => $options.dateValue = $event),
-              style: { "width": "240px" },
-              "value-format": $data.opts.valueFormat,
-              type: $data.opts.dateType,
-              placeholder: "请选择",
-              editable: false,
-              clearable: false,
-              "disabled-date": $data.LJSfc.pickerOptions()
-            }, null, 8, ["modelValue", "value-format", "type", "disabled-date"])) : createCommentVNode("", true),
-            $data.opts.dateType === "year" ? (openBlock(), createBlock(_component_el_date_picker, {
-              key: 1,
-              modelValue: $options.dateValue[0],
-              "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => $options.dateValue[0] = $event),
-              style: { "width": "100px !important" },
-              "value-format": $data.opts.valueFormat,
-              type: $data.opts.dateType,
+          _ctx.opts.dateTypeTag ? (openBlock(), createElementBlock("div", _hoisted_2$1, [
+            createVNode(_component_el_date_picker, {
+              modelValue: _ctx.opts.startDate,
+              "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.opts.startDate = $event),
+              style: normalizeStyle({
+                width: `${_ctx.opts.dateType === "year" ? 100 : _ctx.opts.dateType === "month" ? 120 : _ctx.opts.dateType === "date" ? 140 : _ctx.opts.dateType === "datetime" ? 200 : 200}px !important`
+              }),
+              "value-format": _ctx.opts.valueFormat,
+              type: _ctx.opts.dateType,
               placeholder: "请选择",
               editable: false,
-              clearable: false,
-              "disabled-date": $data.LJSfc.pickerOptions(),
-              onChange: $options.yearChange
-            }, null, 8, ["modelValue", "value-format", "type", "disabled-date", "onChange"])) : createCommentVNode("", true),
-            $data.opts.dateType === "year" ? (openBlock(), createElementBlock("span", _hoisted_3$1, "~")) : createCommentVNode("", true),
-            $data.opts.dateType === "year" ? (openBlock(), createBlock(_component_el_date_picker, {
-              key: 3,
-              modelValue: $options.dateValue[1],
-              "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => $options.dateValue[1] = $event),
-              style: { "width": "100px !important" },
-              "value-format": $data.opts.valueFormat,
-              type: $data.opts.dateType,
+              clearable: _ctx.clearable,
+              "disabled-date": _ctx.disabledDate,
+              onChange: _ctx.dateChange
+            }, null, 8, ["modelValue", "style", "value-format", "type", "clearable", "disabled-date", "onChange"]),
+            _hoisted_3$1,
+            createVNode(_component_el_date_picker, {
+              modelValue: _ctx.opts.endDate,
+              "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => _ctx.opts.endDate = $event),
+              style: normalizeStyle({
+                width: `${_ctx.opts.dateType === "year" ? 100 : _ctx.opts.dateType === "month" ? 120 : _ctx.opts.dateType === "date" ? 140 : _ctx.opts.dateType === "datetime" ? 200 : 200}px !important`
+              }),
+              "value-format": _ctx.opts.valueFormat,
+              type: _ctx.opts.dateType,
               placeholder: "请选择",
               editable: false,
-              clearable: false,
-              "disabled-date": $data.LJSfc.pickerOptions(),
-              onChange: $options.yearChange
-            }, null, 8, ["modelValue", "value-format", "type", "disabled-date", "onChange"])) : createCommentVNode("", true)
+              clearable: _ctx.clearable,
+              "disabled-date": _ctx.disabledDate,
+              onChange: _ctx.dateChange
+            }, null, 8, ["modelValue", "style", "value-format", "type", "clearable", "disabled-date", "onChange"])
           ])) : createCommentVNode("", true)
         ]),
         _: 1
@@ -12930,7 +12951,145 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   }, 8, ["label"]);
 }
-const DatetypeChooseDateRange = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-6e589d4a"]]);
+const DatetypeChooseDateRange = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["render", _sfc_render$3], ["__scopeId", "data-v-e45b32bb"]]);
+const index = {
+  name: "DatetypeChooseDateRange",
+  props: {
+    // 日期区间数据
+    modelValue: Array,
+    // 日期类型
+    dateType: {
+      type: String,
+      default: "date"
+    },
+    // 默认类型，默认值：日。字典value
+    formItemLabel: {
+      type: String,
+      default: "日期"
+    },
+    // 清除按钮
+    clearable: {
+      type: Boolean,
+      default: true
+    },
+    disabledDate: {
+      type: Function,
+      default: () => {
+      }
+    }
+  },
+  data() {
+    return {
+      // 日期参数
+      opts: {
+        startDate: null,
+        endDate: null,
+        valueFormat: "YYYY-MM-DD"
+      }
+    };
+  },
+  watch: {
+    modelValue: {
+      handler(val) {
+        if (!LJSbase.fieldCheck(this.modelValue) && this.modelValue.length === 2) {
+          this.opts.startDate = this.modelValue[0];
+          this.opts.endDate = this.modelValue[1];
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  mounted() {
+    this.init();
+  },
+  methods: {
+    // 切换日期
+    dateChange() {
+      if (this.opts.startDate === null || this.opts.endDate === null) {
+        return;
+      }
+      let start = this.opts.startDate;
+      let end = this.opts.startDate;
+      if (this.dateType !== "year") {
+        start = new Date(this.opts.startDate).getTime();
+        end = new Date(this.opts.endDate).getTime();
+      }
+      if (Number(start) > Number(end)) {
+        const temp = this.opts.startDate;
+        this.opts.startDate = this.opts.endDate;
+        this.opts.endDate = temp;
+      }
+      this.$emit("update:modelValue", [this.opts.startDate, this.opts.endDate]);
+    },
+    init() {
+      this.dateTypeF();
+    },
+    // 日期类型切换
+    dateTypeF() {
+      switch (this.dateType) {
+        case "datetime":
+          this.opts.valueFormat = "YYYY-MM-DD HH:mm:ss";
+          break;
+        case "date":
+          this.opts.valueFormat = "YYYY-MM-DD";
+          break;
+        case "month":
+          this.opts.valueFormat = "YYYY-MM";
+          break;
+        case "year":
+          this.opts.valueFormat = "YYYY";
+          break;
+      }
+    }
+  }
+};
+const index_vue_vue_type_style_index_0_scoped_bb586ec7_lang = "";
+const _sfc_main$2 = index;
+const _withScopeId$1 = (n) => (pushScopeId("data-v-bb586ec7"), n = n(), popScopeId(), n);
+const _hoisted_1$2 = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ createElementVNode("span", { class: "and" }, "~", -1));
+function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_el_date_picker = resolveComponent("el-date-picker");
+  const _component_el_form_item = resolveComponent("el-form-item");
+  return openBlock(), createBlock(_component_el_form_item, {
+    label: _ctx.formItemLabel,
+    prop: "date"
+  }, {
+    default: withCtx(() => [
+      createVNode(_component_el_date_picker, {
+        modelValue: _ctx.opts.startDate,
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.opts.startDate = $event),
+        style: normalizeStyle({
+          width: `${_ctx.dateType === "year" ? 100 : _ctx.dateType === "month" ? 120 : _ctx.dateType === "date" ? 140 : _ctx.dateType === "datetime" ? 200 : 200}px !important`
+        }),
+        "value-format": _ctx.opts.valueFormat,
+        type: _ctx.dateType,
+        placeholder: "开始日期",
+        editable: false,
+        clearable: _ctx.clearable,
+        "disabled-date": _ctx.disabledDate,
+        onChange: _ctx.dateChange
+      }, null, 8, ["modelValue", "style", "value-format", "type", "clearable", "disabled-date", "onChange"]),
+      _hoisted_1$2,
+      createVNode(_component_el_date_picker, {
+        modelValue: _ctx.opts.endDate,
+        "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => _ctx.opts.endDate = $event),
+        style: normalizeStyle({
+          width: `${_ctx.dateType === "year" ? 100 : _ctx.dateType === "month" ? 120 : _ctx.dateType === "date" ? 140 : _ctx.dateType === "datetime" ? 200 : 200}px !important`
+        }),
+        "value-format": _ctx.opts.valueFormat,
+        type: _ctx.dateType,
+        placeholder: "结束日期",
+        editable: false,
+        clearable: _ctx.clearable,
+        "disabled-date": _ctx.disabledDate,
+        onChange: _ctx.dateChange
+      }, null, 8, ["modelValue", "style", "value-format", "type", "clearable", "disabled-date", "onChange"])
+    ]),
+    _: 1
+  }, 8, ["label"]);
+}
+const DateRange = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-bb586ec7"]]);
 const index_vue_vue_type_style_index_0_scoped_f2de2f23_lang = "";
 const _sfc_main$1 = {
   name: "DictTag",
@@ -14262,6 +14421,7 @@ const tools = [
   { type: "component", name: "RightMenu", entity: RightMenu },
   { type: "component", name: "DatetypeChooseDate", entity: DatetypeChooseDate },
   { type: "component", name: "DatetypeChooseDateRange", entity: DatetypeChooseDateRange },
+  { type: "component", name: "DateRange", entity: DateRange },
   { type: "component", name: "DictTag", entity: DictTag },
   { type: "component", name: "Particles", entity: Particles },
   { type: "other_function", name: "self", entity: self$1 }
@@ -14290,6 +14450,7 @@ const globals = {
   RightMenu,
   DatetypeChooseDate,
   DatetypeChooseDateRange,
+  DateRange,
   DictTag,
   Particles,
   // 方法