bkui-vue 0.0.1-beta.332 → 0.0.1-beta.333

package/dist/index.esm.js

@@ -14039,7 +14039,7 @@ var RadioButton = defineComponent({
         return null;
       }
       return createVNode("span", {
-        "class": "bk-radio-label"
+        "class": "bk-radio-button-label"
       }, [this.$slots.default ? this.$slots.default() : this.label]);
     };
     return createVNode("label", {
@@ -21948,6 +21948,7 @@ var Confirm = defineComponent({
     };
   },
   render() {
+    var _a, _b, _c;
     return createVNode("div", {
       "class": "bk-picker-confirm",
       "ref": "elRef",
@@ -21959,7 +21960,9 @@ var Confirm = defineComponent({
       "onClick": this.handleToggleTime
     }, {
       default: () => [this.labels.time]
-    }) : "", this.clearable ? createVNode("a", {
+    }) : "", (_c = (_b = (_a = this.$slots).confirm) == null ? void 0 : _b.call(_a)) != null ? _c : createVNode("div", {
+      "class": "bk-picker-confirm-action"
+    }, [this.clearable ? createVNode("a", {
       "href": "javascript: void(0);",
       "onClick": this.handleClear,
       "onKeydown": this.handleClear
@@ -21968,7 +21971,7 @@ var Confirm = defineComponent({
       "class": "confirm",
       "onClick": this.handleSuccess,
       "onKeydown_enter": this.handleSuccess
-    }, [this.labels.ok])]);
+    }, [this.labels.ok])])]);
   }
 });
 var oneDay = 1e3 * 60 * 60 * 24;
@@ -24138,15 +24141,6 @@ const formatDate = (val, type, multiple, format2) => {
 };
 const datePickerKey = Symbol("date-picker");
 const timePickerKey = Symbol("time-picker");
-function findChildComponents(context, componentName) {
-  return (context.$children || []).reduce((components2, child) => {
-    if (child.$options.name === componentName) {
-      components2.push(child);
-    }
-    const foundChilds = findChildComponents(child, componentName);
-    return components2.concat(foundChilds);
-  }, []);
-}
 function iconBtnCls(direction, type = "") {
   return [
     "bk-picker-panel-icon-btn",
@@ -25732,6 +25726,25 @@ var DateRangePanel = defineComponent({
       };
       setPanelDates(props2.startDate || state.dates[0] || new Date());
     });
+    watch(() => state.currentView, (v2) => {
+      const leftMonth = state.leftPanelDate.getMonth();
+      const rightMonth = state.rightPanelDate.getMonth();
+      const isSameYear = state.leftPanelDate.getFullYear() === state.rightPanelDate.getFullYear();
+      if (v2 === "date" && isSameYear && leftMonth === rightMonth) {
+        changePanelDate("right", "Month", 1);
+      }
+      if (v2 === "month" && isSameYear) {
+        changePanelDate("right", "FullYear", 1);
+      }
+      if (v2 === "year" && isSameYear) {
+        changePanelDate("right", "FullYear", 10);
+      }
+      if (state.currentView === "time") {
+        nextTick(() => {
+          timePickerRef.value.updateScroll();
+        });
+      }
+    });
     const isTime = computed(() => state.currentView === "time");
     const leftDatePanelLabel = computed(() => panelLabelConfig("left"));
     const rightDatePanelLabel = computed(() => panelLabelConfig("right"));
@@ -25776,6 +25789,7 @@ var DateRangePanel = defineComponent({
       emit("pick-click");
     }
     const timeDisabled = computed(() => !(state.dates[0] && state.dates[1]));
+    const timePickerRef = ref(null);
     return __spreadProps(__spreadValues({}, toRefs(state)), {
       isTime,
       hasShortcuts,
@@ -25802,7 +25816,8 @@ var DateRangePanel = defineComponent({
       handleToggleTime,
       handlePickSuccess,
       handlePickClear,
-      handlePickClick
+      handlePickClick,
+      timePickerRef
     });
   },
   render() {
@@ -25979,7 +25994,7 @@ var DateRangePanel = defineComponent({
       "onPick-toggle-time": this.handleToggleTime,
       "onPick-clear": this.handlePickClear,
       "onPick-success": this.handlePickSuccess
-    }, null) : ""]), shortcuts]);
+    }, this.$slots) : ""]), shortcuts]);
   }
 });
 var Component$a = defineComponent({
@@ -26072,6 +26087,7 @@ var Component$a = defineComponent({
     const hasHeader = computed(() => !!slots.header);
     const hasFooter = computed(() => !!slots.footer);
     const hasShortcuts = computed(() => !!slots.shortcuts);
+    const hasConfirm = computed(() => !!slots.confirm);
     const fontSizeCls = computed(() => {
       let cls = "";
       if (props2.fontSize === "medium") {
@@ -26341,6 +26357,10 @@ var Component$a = defineComponent({
       emit("shortcut-change", state.shortcut, shortcutIndex);
     };
     const triggerRef = ref(null);
+    const handleToggleTime = () => {
+      var _a, _b;
+      (_b = (_a = pickerPanelRef.value).handleToggleTime) == null ? void 0 : _b.call(_a);
+    };
     return __spreadProps(__spreadValues({}, toRefs(state)), {
       panel,
       publicStringValue,
@@ -26351,6 +26371,7 @@ var Component$a = defineComponent({
       hasHeader,
       hasFooter,
       hasShortcuts,
+      hasConfirm,
       fontSizeCls,
       longWidthCls,
       localReadonly,
@@ -26370,7 +26391,8 @@ var Component$a = defineComponent({
       handleInputChange,
       handleClear,
       onPick,
-      onPickSuccess
+      onPickSuccess,
+      handleToggleTime
     });
   },
   render() {
@@ -26448,6 +26470,10 @@ var Component$a = defineComponent({
         })) || null;
       }
     } : {};
+    const confirmSlot = this.hasConfirm ? {
+      confirm: this.$slots.confirm
+    } : {};
+    const slots = __spreadValues(__spreadValues({}, shortcutsSlot), confirmSlot);
     return withDirectives(createVNode("div", {
       "class": ["bk-date-picker", this.type === "datetimerange" ? "long" : "", this.longWidthCls]
     }, [createVNode("div", {
@@ -26491,7 +26517,7 @@ var Component$a = defineComponent({
               "onPick-clear": this.handleClear,
               "onPick-success": this.onPickSuccess,
               "onSelection-mode-change": this.onSelectionModeChange
-            }, shortcutsSlot) : createVNode(DatePanel, {
+            }, slots) : createVNode(DatePanel, {
               "ref": "pickerPanelRef",
               "clearable": this.clearable,
               "showTime": this.type === "datetime" || this.type === "datetimerange",
@@ -26509,7 +26535,7 @@ var Component$a = defineComponent({
               "onPick-clear": this.handleClear,
               "onPick-success": this.onPickSuccess,
               "onSelection-mode-change": this.onSelectionModeChange
-            }, shortcutsSlot), this.hasFooter ? createVNode("div", {
+            }, slots), this.hasFooter ? createVNode("div", {
               "class": ["bk-date-picker-footer-wrapper", this.footerSlotCls]
             }, [(_f = (_e = (_d = this.$slots).footer) == null ? void 0 : _e.call(_d)) != null ? _f : null]) : null];
           }
@@ -26650,8 +26676,8 @@ var TimePicker = defineComponent({
     watch(() => state.visible, (visible) => {
       if (visible) {
         nextTick(() => {
-          const spinners = findChildComponents(proxy, "TimeSpinner");
-          spinners.forEach((instance) => instance.updateScroll());
+          var _a, _b;
+          (_b = (_a = proxy.pickerPanelRef) == null ? void 0 : _a.timeSpinnerRef) == null ? void 0 : _b.updateScroll();
         });
       }
     });
@@ -28965,22 +28991,21 @@ var FormItem = defineComponent({
           const rule = rules[stepIndex];
           return Promise.resolve().then(() => {
             const result = rule.validator(value);
-            const errorMessage = getRuleMessage(rule);
             if (typeof result !== "boolean" && typeof result.then === "function") {
               return result.then((data2) => {
                 if (data2 === false) {
-                  return Promise.reject(errorMessage);
+                  return Promise.reject(getRuleMessage(rule));
                 }
               }).then(() => doValidate(), () => {
                 state.isError = true;
-                state.errorMessage = errorMessage;
-                return Promise.reject(errorMessage);
+                state.errorMessage = getRuleMessage(rule);
+                return Promise.reject(state.errorMessage);
               });
             }
             if (!result) {
               state.isError = true;
-              state.errorMessage = errorMessage;
-              return Promise.reject(errorMessage);
+              state.errorMessage = getRuleMessage(rule);
+              return Promise.reject(state.errorMessage);
             }
             return doValidate();
           });