@weitutech/by-components 1.2.31 → 1.2.32

package/lib/by-components.common.js

@@ -78969,8 +78969,8 @@ var pair_number_input_component = normalizeComponent(
 )
 
 /* harmony default export */ var pair_number_input = (pair_number_input_component.exports);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"185687ec-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/form/comps/custom-date-picker.vue?vue&type=template&id=78d80522
-var custom_date_pickervue_type_template_id_78d80522_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"185687ec-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/form/comps/custom-date-picker.vue?vue&type=template&id=9d8d406a
+var custom_date_pickervue_type_template_id_9d8d406a_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -79040,7 +79040,7 @@ var custom_date_pickervue_type_template_id_78d80522_render = function render() {
     }, [_vm._v(" " + _vm._s(char) + " ")]);
   }) : [_vm._v(_vm._s(_vm.activeShortcutLabel))]], 2) : _vm._e()], 1)], 2);
 };
-var custom_date_pickervue_type_template_id_78d80522_staticRenderFns = [];
+var custom_date_pickervue_type_template_id_9d8d406a_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/moment/moment.js
 var moment = __webpack_require__(9412);
@@ -79051,6 +79051,17 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
 
 
 
+const DEFAULT_FORMAT_BY_TYPE = {
+  daterange: 'YYYY-MM-DD',
+  datetimerange: 'YYYY-MM-DD HH:mm:ss',
+  monthrange: 'YYYY-MM',
+  date: 'YYYY-MM-DD',
+  datetime: 'YYYY-MM-DD HH:mm:ss',
+  month: 'YYYY-MM',
+  year: 'YYYY',
+  week: 'YYYY-MM-DD'
+};
+const FORM_FIELD_TYPE = 'customDatePicker';
 /* harmony default export */ var custom_date_pickervue_type_script_lang_js = ({
   name: 'ByCustomDatePicker',
   props: {
@@ -79078,6 +79089,23 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
       type: String,
       default: ''
     },
+    /**
+     * 日期选择器类型（透传 el-date-picker 的 type）
+     * 默认 daterange；常见：daterange / datetimerange / monthrange
+     * 注意：Form 配置里字段 type 固定为 customDatePicker，请用本属性或 otherOption.type 指定面板类型
+     */
+    pickerType: {
+      type: String,
+      default: ''
+    },
+    /**
+     * 绑定值格式（moment 格式，也兼容 Element 的 yyyy/dd 写法）
+     * 不传时按 pickerType 自动推断，如 daterange → YYYY-MM-DD
+     */
+    valueFormat: {
+      type: String,
+      default: ''
+    },
     /**
      * 快捷按钮展示方式
      * external: 快捷按钮在输入框右侧（默认，保持原有样式）
@@ -79098,43 +79126,81 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
     };
   },
   computed: {
+    /** 实际生效的面板类型 */
+    resolvedPickerType() {
+      const fromProp = this.normalizePickerType(this.pickerType);
+      if (fromProp) return fromProp;
+      const fromOther = this.normalizePickerType(this.otherOption && this.otherOption.type);
+      if (fromOther) return fromOther;
+      return 'daterange';
+    },
+    /** 实际生效的输出格式（moment） */
+    resolvedValueFormat() {
+      const raw = this.valueFormat || this.otherOption && this.otherOption.valueFormat || DEFAULT_FORMAT_BY_TYPE[this.resolvedPickerType] || 'YYYY-MM-DD';
+      return this.toMomentDateFormat(raw);
+    },
+    /** 是否包含时分秒（用于快捷项起止时刻） */
+    includesTime() {
+      return /H{1,2}|m{1,2}|s{1,2}/.test(this.resolvedValueFormat);
+    },
     shortcuts() {
+      const fmt = this.resolvedValueFormat;
+      const rangeOfDay = dayMoment => ({
+        start_time: dayMoment.clone().startOf('day').format(fmt),
+        end_time: this.includesTime ? dayMoment.clone().endOf('day').format(fmt) : dayMoment.clone().startOf('day').format(fmt)
+      });
+      const yesterday = rangeOfDay(moment_default()().subtract(1, 'days'));
+      const today = rangeOfDay(moment_default()());
       return [{
         label: '上月',
-        start_time: moment_default()().subtract(1, 'months').startOf('month').format('YYYY-MM-DD'),
-        end_time: moment_default()().subtract(1, 'months').endOf('month').format('YYYY-MM-DD'),
+        start_time: moment_default()().subtract(1, 'months').startOf('month').format(fmt),
+        end_time: moment_default()().subtract(1, 'months').endOf('month').format(fmt),
         key: 'last_month'
       }, {
         label: '昨天',
-        start_time: moment_default()().subtract(1, 'days').format('YYYY-MM-DD'),
-        end_time: moment_default()().subtract(1, 'days').format('YYYY-MM-DD'),
+        start_time: yesterday.start_time,
+        end_time: yesterday.end_time,
         key: 'yesterday'
       }, {
         label: '今天',
-        start_time: moment_default()().startOf('day').format('YYYY-MM-DD'),
-        end_time: moment_default()().startOf('day').format('YYYY-MM-DD'),
+        start_time: today.start_time,
+        end_time: today.end_time,
         key: 'today'
       }, {
         label: '本周',
-        start_time: moment_default()().startOf('isoWeek').format('YYYY-MM-DD'),
-        end_time: moment_default()().endOf('isoWeek').format('YYYY-MM-DD'),
+        start_time: moment_default()().startOf('isoWeek').format(fmt),
+        end_time: moment_default()().endOf('isoWeek').format(fmt),
         key: 'week'
       }, {
         label: '本月',
-        start_time: moment_default()().startOf('month').format('YYYY-MM-DD'),
-        end_time: moment_default()().endOf('month').format('YYYY-MM-DD'),
+        start_time: moment_default()().startOf('month').format(fmt),
+        end_time: moment_default()().endOf('month').format(fmt),
         key: 'month'
       }];
     },
     dateOptions() {
+      const {
+        type: _type,
+        valueFormat: _valueFormat,
+        format: userFormat,
+        ...restOther
+      } = this.otherOption || {};
+      const pickerType = this.resolvedPickerType;
+      const elementFormat = this.toElementDateFormat(this.resolvedValueFormat);
+      const needDefaultTime = pickerType === 'datetimerange' || pickerType === 'datetime';
       return {
         startPlaceholder: '开始时间',
         endPlaceholder: '结束时间',
-        type: 'daterange',
         rangeSeparator: '至',
         size: 'mini',
         active: '',
-        ...this.otherOption
+        format: userFormat || elementFormat,
+        ...(needDefaultTime ? {
+          defaultTime: ['00:00:00', '23:59:59']
+        } : {}),
+        ...restOther,
+        // 最终以解析后的 pickerType 为准，避免 Form 的 type=customDatePicker 或旧配置干扰
+        type: pickerType
       };
     },
     panelDateOptions() {
@@ -79199,10 +79265,25 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
     this.destroyShortcutTagObserver();
   },
   methods: {
+    normalizePickerType(type) {
+      if (!type || type === FORM_FIELD_TYPE) return '';
+      return type;
+    },
+    /** Element 格式(yyyy/dd) → moment 格式(YYYY/DD) */
+    toMomentDateFormat(fmt) {
+      return String(fmt).replace(/yyyy/g, 'YYYY').replace(/dd/g, 'DD');
+    },
+    /** moment 格式 → Element 展示格式 */
+    toElementDateFormat(fmt) {
+      return String(fmt).replace(/YYYY/g, 'yyyy').replace(/DD/g, 'dd');
+    },
+    formatMomentValue(val) {
+      return moment_default()(val).format(this.resolvedValueFormat);
+    },
     syncActiveFromValue(newValue) {
       if (Array.isArray(newValue) && newValue.length) {
-        const start = moment_default()(newValue[0]).format('YYYY-MM-DD');
-        const end = moment_default()(newValue[1]).format('YYYY-MM-DD');
+        const start = this.formatMomentValue(newValue[0]);
+        const end = this.formatMomentValue(newValue[1]);
         let matchedKey = '';
         this.shortcuts.forEach(item => {
           if (item.start_time === start && item.end_time === end) {
@@ -79229,12 +79310,13 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
           });
         }
       } else {
-        const formattedDates = e.map(item => moment_default()(item).format('YYYY-MM-DD'));
+        const list = Array.isArray(e) ? e : [e];
+        const formattedDates = list.map(item => this.formatMomentValue(item));
         this.$emit('input', formattedDates);
         if (this.startTimeField && this.endTimeField) {
           this.$emit('range-change', {
-            startTime: formattedDates[0],
-            endTime: formattedDates[1]
+            startTime: formattedDates[0] || '',
+            endTime: formattedDates[1] || ''
           });
         }
 
@@ -79344,8 +79426,8 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
 ;
 var custom_date_picker_component = normalizeComponent(
   comps_custom_date_pickervue_type_script_lang_js,
-  custom_date_pickervue_type_template_id_78d80522_render,
-  custom_date_pickervue_type_template_id_78d80522_staticRenderFns,
+  custom_date_pickervue_type_template_id_9d8d406a_render,
+  custom_date_pickervue_type_template_id_9d8d406a_staticRenderFns,
   false,
   null,
   null,

package/lib/by-components.umd.js

@@ -78979,8 +78979,8 @@ var pair_number_input_component = normalizeComponent(
 )
 
 /* harmony default export */ var pair_number_input = (pair_number_input_component.exports);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"185687ec-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/form/comps/custom-date-picker.vue?vue&type=template&id=78d80522
-var custom_date_pickervue_type_template_id_78d80522_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"185687ec-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/form/comps/custom-date-picker.vue?vue&type=template&id=9d8d406a
+var custom_date_pickervue_type_template_id_9d8d406a_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -79050,7 +79050,7 @@ var custom_date_pickervue_type_template_id_78d80522_render = function render() {
     }, [_vm._v(" " + _vm._s(char) + " ")]);
   }) : [_vm._v(_vm._s(_vm.activeShortcutLabel))]], 2) : _vm._e()], 1)], 2);
 };
-var custom_date_pickervue_type_template_id_78d80522_staticRenderFns = [];
+var custom_date_pickervue_type_template_id_9d8d406a_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/moment/moment.js
 var moment = __webpack_require__(9618);
@@ -79061,6 +79061,17 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
 
 
 
+const DEFAULT_FORMAT_BY_TYPE = {
+  daterange: 'YYYY-MM-DD',
+  datetimerange: 'YYYY-MM-DD HH:mm:ss',
+  monthrange: 'YYYY-MM',
+  date: 'YYYY-MM-DD',
+  datetime: 'YYYY-MM-DD HH:mm:ss',
+  month: 'YYYY-MM',
+  year: 'YYYY',
+  week: 'YYYY-MM-DD'
+};
+const FORM_FIELD_TYPE = 'customDatePicker';
 /* harmony default export */ var custom_date_pickervue_type_script_lang_js = ({
   name: 'ByCustomDatePicker',
   props: {
@@ -79088,6 +79099,23 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
       type: String,
       default: ''
     },
+    /**
+     * 日期选择器类型（透传 el-date-picker 的 type）
+     * 默认 daterange；常见：daterange / datetimerange / monthrange
+     * 注意：Form 配置里字段 type 固定为 customDatePicker，请用本属性或 otherOption.type 指定面板类型
+     */
+    pickerType: {
+      type: String,
+      default: ''
+    },
+    /**
+     * 绑定值格式（moment 格式，也兼容 Element 的 yyyy/dd 写法）
+     * 不传时按 pickerType 自动推断，如 daterange → YYYY-MM-DD
+     */
+    valueFormat: {
+      type: String,
+      default: ''
+    },
     /**
      * 快捷按钮展示方式
      * external: 快捷按钮在输入框右侧（默认，保持原有样式）
@@ -79108,43 +79136,81 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
     };
   },
   computed: {
+    /** 实际生效的面板类型 */
+    resolvedPickerType() {
+      const fromProp = this.normalizePickerType(this.pickerType);
+      if (fromProp) return fromProp;
+      const fromOther = this.normalizePickerType(this.otherOption && this.otherOption.type);
+      if (fromOther) return fromOther;
+      return 'daterange';
+    },
+    /** 实际生效的输出格式（moment） */
+    resolvedValueFormat() {
+      const raw = this.valueFormat || this.otherOption && this.otherOption.valueFormat || DEFAULT_FORMAT_BY_TYPE[this.resolvedPickerType] || 'YYYY-MM-DD';
+      return this.toMomentDateFormat(raw);
+    },
+    /** 是否包含时分秒（用于快捷项起止时刻） */
+    includesTime() {
+      return /H{1,2}|m{1,2}|s{1,2}/.test(this.resolvedValueFormat);
+    },
     shortcuts() {
+      const fmt = this.resolvedValueFormat;
+      const rangeOfDay = dayMoment => ({
+        start_time: dayMoment.clone().startOf('day').format(fmt),
+        end_time: this.includesTime ? dayMoment.clone().endOf('day').format(fmt) : dayMoment.clone().startOf('day').format(fmt)
+      });
+      const yesterday = rangeOfDay(moment_default()().subtract(1, 'days'));
+      const today = rangeOfDay(moment_default()());
       return [{
         label: '上月',
-        start_time: moment_default()().subtract(1, 'months').startOf('month').format('YYYY-MM-DD'),
-        end_time: moment_default()().subtract(1, 'months').endOf('month').format('YYYY-MM-DD'),
+        start_time: moment_default()().subtract(1, 'months').startOf('month').format(fmt),
+        end_time: moment_default()().subtract(1, 'months').endOf('month').format(fmt),
         key: 'last_month'
       }, {
         label: '昨天',
-        start_time: moment_default()().subtract(1, 'days').format('YYYY-MM-DD'),
-        end_time: moment_default()().subtract(1, 'days').format('YYYY-MM-DD'),
+        start_time: yesterday.start_time,
+        end_time: yesterday.end_time,
         key: 'yesterday'
       }, {
         label: '今天',
-        start_time: moment_default()().startOf('day').format('YYYY-MM-DD'),
-        end_time: moment_default()().startOf('day').format('YYYY-MM-DD'),
+        start_time: today.start_time,
+        end_time: today.end_time,
         key: 'today'
       }, {
         label: '本周',
-        start_time: moment_default()().startOf('isoWeek').format('YYYY-MM-DD'),
-        end_time: moment_default()().endOf('isoWeek').format('YYYY-MM-DD'),
+        start_time: moment_default()().startOf('isoWeek').format(fmt),
+        end_time: moment_default()().endOf('isoWeek').format(fmt),
         key: 'week'
       }, {
         label: '本月',
-        start_time: moment_default()().startOf('month').format('YYYY-MM-DD'),
-        end_time: moment_default()().endOf('month').format('YYYY-MM-DD'),
+        start_time: moment_default()().startOf('month').format(fmt),
+        end_time: moment_default()().endOf('month').format(fmt),
         key: 'month'
       }];
     },
     dateOptions() {
+      const {
+        type: _type,
+        valueFormat: _valueFormat,
+        format: userFormat,
+        ...restOther
+      } = this.otherOption || {};
+      const pickerType = this.resolvedPickerType;
+      const elementFormat = this.toElementDateFormat(this.resolvedValueFormat);
+      const needDefaultTime = pickerType === 'datetimerange' || pickerType === 'datetime';
       return {
         startPlaceholder: '开始时间',
         endPlaceholder: '结束时间',
-        type: 'daterange',
         rangeSeparator: '至',
         size: 'mini',
         active: '',
-        ...this.otherOption
+        format: userFormat || elementFormat,
+        ...(needDefaultTime ? {
+          defaultTime: ['00:00:00', '23:59:59']
+        } : {}),
+        ...restOther,
+        // 最终以解析后的 pickerType 为准，避免 Form 的 type=customDatePicker 或旧配置干扰
+        type: pickerType
       };
     },
     panelDateOptions() {
@@ -79209,10 +79275,25 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
     this.destroyShortcutTagObserver();
   },
   methods: {
+    normalizePickerType(type) {
+      if (!type || type === FORM_FIELD_TYPE) return '';
+      return type;
+    },
+    /** Element 格式(yyyy/dd) → moment 格式(YYYY/DD) */
+    toMomentDateFormat(fmt) {
+      return String(fmt).replace(/yyyy/g, 'YYYY').replace(/dd/g, 'DD');
+    },
+    /** moment 格式 → Element 展示格式 */
+    toElementDateFormat(fmt) {
+      return String(fmt).replace(/YYYY/g, 'yyyy').replace(/DD/g, 'dd');
+    },
+    formatMomentValue(val) {
+      return moment_default()(val).format(this.resolvedValueFormat);
+    },
     syncActiveFromValue(newValue) {
       if (Array.isArray(newValue) && newValue.length) {
-        const start = moment_default()(newValue[0]).format('YYYY-MM-DD');
-        const end = moment_default()(newValue[1]).format('YYYY-MM-DD');
+        const start = this.formatMomentValue(newValue[0]);
+        const end = this.formatMomentValue(newValue[1]);
         let matchedKey = '';
         this.shortcuts.forEach(item => {
           if (item.start_time === start && item.end_time === end) {
@@ -79239,12 +79320,13 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
           });
         }
       } else {
-        const formattedDates = e.map(item => moment_default()(item).format('YYYY-MM-DD'));
+        const list = Array.isArray(e) ? e : [e];
+        const formattedDates = list.map(item => this.formatMomentValue(item));
         this.$emit('input', formattedDates);
         if (this.startTimeField && this.endTimeField) {
           this.$emit('range-change', {
-            startTime: formattedDates[0],
-            endTime: formattedDates[1]
+            startTime: formattedDates[0] || '',
+            endTime: formattedDates[1] || ''
           });
         }
 
@@ -79354,8 +79436,8 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
 ;
 var custom_date_picker_component = normalizeComponent(
   comps_custom_date_pickervue_type_script_lang_js,
-  custom_date_pickervue_type_template_id_78d80522_render,
-  custom_date_pickervue_type_template_id_78d80522_staticRenderFns,
+  custom_date_pickervue_type_template_id_9d8d406a_render,
+  custom_date_pickervue_type_template_id_9d8d406a_staticRenderFns,
   false,
   null,
   null,