bkui-vue 2.0.1-beta.16 → 2.0.1-beta.18

package/lib/date-picker/date-picker.d.ts

@@ -131,7 +131,6 @@ declare const _default: import("vue").DefineComponent<{
     fontSizeCls: import("vue").ComputedRef<string>;
     longWidthCls: import("vue").ComputedRef<string>;
     localReadonly: import("vue").ComputedRef<boolean>;
-    allowCrossDayProp: import("vue").ComputedRef<boolean>;
     ownPickerProps: import("vue").ComputedRef<Record<string, any>>;
     teleportTo: import("vue").Ref<any>;
     pickerDropdownRef: import("vue").Ref<any>;

package/lib/date-picker/index.d.ts

@@ -140,7 +140,6 @@ declare const BkDatePicker: {
         fontSizeCls: import("vue").ComputedRef<string>;
         longWidthCls: import("vue").ComputedRef<string>;
         localReadonly: import("vue").ComputedRef<boolean>;
-        allowCrossDayProp: import("vue").ComputedRef<boolean>;
         ownPickerProps: import("vue").ComputedRef<Record<string, any>>;
         teleportTo: import("vue").Ref<any>;
         pickerDropdownRef: import("vue").Ref<any>;
@@ -490,7 +489,6 @@ declare const BkDatePicker: {
         fontSizeCls: import("vue").ComputedRef<string>;
         longWidthCls: import("vue").ComputedRef<string>;
         localReadonly: import("vue").ComputedRef<boolean>;
-        allowCrossDayProp: import("vue").ComputedRef<boolean>;
         ownPickerProps: import("vue").ComputedRef<Record<string, any>>;
         teleportTo: import("vue").Ref<any>;
         pickerDropdownRef: import("vue").Ref<any>;
@@ -703,7 +701,6 @@ declare const BkDatePicker: {
     fontSizeCls: import("vue").ComputedRef<string>;
     longWidthCls: import("vue").ComputedRef<string>;
     localReadonly: import("vue").ComputedRef<boolean>;
-    allowCrossDayProp: import("vue").ComputedRef<boolean>;
     ownPickerProps: import("vue").ComputedRef<Record<string, any>>;
     teleportTo: import("vue").Ref<any>;
     pickerDropdownRef: import("vue").Ref<any>;

package/lib/date-picker/index.js

@@ -3713,13 +3713,23 @@ var dateRangePanelProps = {
       }
       if (props.splitPanels) {
         var otherPanel = panel === 'left' ? 'right' : 'left';
-        if (panel === 'left' && (state.leftPanelDate >= state.rightPanelDate || Math.floor(state.leftPanelDate.getFullYear() / 10) * 10 === Math.floor(state.rightPanelDate.getFullYear() / 10) * 10)) {
-          // changePanelDate(otherPanel, type, 1);
-          changePanelDate(otherPanel, type, state.currentView === 'year' ? 10 : 1, false);
+        if (panel === 'left' && state.leftPanelDate >= state.rightPanelDate) {
+          if (state.currentView === 'year') {
+            if (Math.floor(state.leftPanelDate.getFullYear() / 10) * 10 === Math.floor(state.rightPanelDate.getFullYear() / 10) * 10) {
+              changePanelDate(otherPanel, type, 10);
+            }
+          } else {
+            changePanelDate(otherPanel, type, 1);
+          }
         }
-        if (panel === 'right' && (state.rightPanelDate <= state.leftPanelDate || Math.floor(state.leftPanelDate.getFullYear() / 10) * 10 === Math.floor(state.rightPanelDate.getFullYear() / 10) * 10)) {
-          // changePanelDate(otherPanel, type, -1);
-          changePanelDate(otherPanel, type, state.currentView === 'year' ? -10 : -1, false);
+        if (panel === 'right' && state.rightPanelDate <= state.leftPanelDate) {
+          if (state.currentView === 'year') {
+            if (Math.floor(state.leftPanelDate.getFullYear() / 10) * 10 === Math.floor(state.rightPanelDate.getFullYear() / 10) * 10) {
+              changePanelDate(otherPanel, type, -10);
+            }
+          } else {
+            changePanelDate(otherPanel, type, -1);
+          }
         }
       } else {
         var _otherPanel = panel === 'left' ? 'right' : 'left';
@@ -4282,6 +4292,7 @@ var dateRangePanelProps = {
       }
     }() : '']), [[external_vue_namespaceObject.vShow, !this.isTime]]), this.isTime ? (0,external_vue_namespaceObject.createVNode)(time_range, {
       "ref": "timePickerRef",
+      "allowCrossDay": !!this.timePickerOptions.allowCrossDay,
       "disabledDate": this.disabledDate,
       "format": this.format,
       "selectionMode": this.selectionMode,
@@ -4506,9 +4517,16 @@ function date_picker_objectSpread(e) { for (var r = 1; r < arguments.length; r++
       return props.options;
     });
     // 限制 allow-cross-day 属性只在 time-picker 组件 type 为 timerange 时生效
-    var allowCrossDayProp = (0,external_vue_namespaceObject.computed)(function () {
-      return panel.value === 'RangeTimePickerPanel' ? props.allowCrossDay : false;
-    });
+    // const allowCrossDayProp = computed(() => (panel.value === 'RangeTimePickerPanel' ? props.allowCrossDay : false));
+    // const allowCrossDayProp = computed(() => {
+    //   if (panel.value === 'RangeTimePickerPanel') {
+    //     return props.allowCrossDay;
+    //   }
+    //   if (panel.value === 'DateRangePanel') {
+    //     return (props?.timePickerOptions as any)?.allowCrossDay;
+    //   }
+    //   return false;
+    // });
     var inputRef = (0,external_vue_namespaceObject.ref)(null);
     var inputFocus = function inputFocus() {
       var _inputRef$value;
@@ -4633,7 +4651,10 @@ function date_picker_objectSpread(e) { for (var r = 1; r < arguments.length; r++
       //   return;
       // }
       state.showClose = false;
-      state.internalValue = state.tmpValue;
+      // state.internalValue = state.tmpValue;
+      if (state.internalValue !== state.tmpValue) {
+        handleInputChange(_e);
+      }
     };
     var emitChange = function emitChange(type) {
       (0,external_vue_namespaceObject.nextTick)(function () {
@@ -4655,7 +4676,7 @@ function date_picker_objectSpread(e) { for (var r = 1; r < arguments.length; r++
       var newValue = e.target.value;
       var newDate = parseDate(newValue, props.type, props.multiple, props.format);
       var valueToTest = isArrayValue ? newDate : newDate[0];
-      var isDisabled = (_props$disabledDate = props.disabledDate) === null || _props$disabledDate === void 0 ? void 0 : _props$disabledDate.call(props, valueToTest);
+      var isDisabled = !valueToTest ? false : (_props$disabledDate = props.disabledDate) === null || _props$disabledDate === void 0 ? void 0 : _props$disabledDate.call(props, valueToTest);
       var isValidDate = newDate.reduce(function (valid, date) {
         return valid && date instanceof Date;
       }, true);
@@ -4673,7 +4694,7 @@ function date_picker_objectSpread(e) { for (var r = 1; r < arguments.length; r++
       var newValue = e.target.value;
       var newDate = parseDate(newValue, props.type, props.multiple, props.format);
       var valueToTest = isArrayValue ? newDate : newDate[0];
-      var isDisabled = (_props$disabledDate2 = props.disabledDate) === null || _props$disabledDate2 === void 0 ? void 0 : _props$disabledDate2.call(props, valueToTest);
+      var isDisabled = !valueToTest ? false : (_props$disabledDate2 = props.disabledDate) === null || _props$disabledDate2 === void 0 ? void 0 : _props$disabledDate2.call(props, valueToTest);
       var isValidDate = newDate.reduce(function (valid, date) {
         return valid && date instanceof Date;
       }, true);
@@ -4869,7 +4890,7 @@ function date_picker_objectSpread(e) { for (var r = 1; r < arguments.length; r++
       fontSizeCls: fontSizeCls,
       longWidthCls: longWidthCls,
       localReadonly: localReadonly,
-      allowCrossDayProp: allowCrossDayProp,
+      // allowCrossDayProp,
       ownPickerProps: ownPickerProps,
       teleportTo: teleportTo,
       pickerDropdownRef: pickerDropdownRef,

package/lib/index.js

@@ -4,5 +4,5 @@ export { default } from './preset';
 export * from './config-provider';
 export * from './directives';
 export * as plugins from './plugins';
-export const version = "2.0.1-beta.16";
+export const version = "2.0.1-beta.18";
 window.__bkui_vue_version__ = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "2.0.1-beta.16",
+  "version": "2.0.1-beta.18",
   "workspaces": [
     "packages/**",
     "scripts/cli",