@touchvue/ui 1.0.0-beta.22 → 1.0.0-beta.23

package/es/components/cascader/src/cascader.vue.d.ts

@@ -49,6 +49,15 @@ declare const __VLS_component: import("vue").DefineComponent<Props, {
     setDisabled: (f: boolean) => void;
     errorTip: import("vue").Ref<string, string>;
     errorType: import("vue").Ref<string, string>;
+    getCheckData: () => {
+        [x: string]: any;
+        label?: string;
+        value?: string;
+        children?: string;
+        isSelect?: boolean;
+        isLeaf?: boolean;
+        level?: number;
+    }[];
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     change: (...args: any[]) => void;
     "update:modelValue": (...args: any[]) => void;

package/es/packages/components/calendar/src/calendar.vue2.mjs

@@ -775,21 +775,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       } else if (day.value === null && props.min && props.max) {
         return;
       }
-      emit("beforeChange", getStringValue());
-      if (props.beforeChange) {
-        const fn = props.beforeChange(getStringValue());
-        if (fn && isPromise(fn)) {
-          fn.then(() => {
-            selectTimeAction();
-          });
-        } else {
-          if (fn) {
-            selectTimeAction();
-          }
-        }
-      } else {
-        selectTimeAction();
-      }
     };
     const selectTimeAction = () => {
       submitValue.value = iValue.value;
@@ -807,8 +792,29 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       second.value = item;
       selectTime();
     };
+    const moment = () => {
+      hour.value = String((/* @__PURE__ */ new Date()).getHours());
+      minute.value = String((/* @__PURE__ */ new Date()).getMinutes());
+      second.value = String((/* @__PURE__ */ new Date()).getSeconds());
+      selectTime();
+    };
     const confirm = () => {
       emit("confirm", submitValue.value);
+      emit("beforeChange", getStringValue());
+      if (props.beforeChange) {
+        const fn = props.beforeChange(getStringValue());
+        if (fn && isPromise(fn)) {
+          fn.then(() => {
+            selectTimeAction();
+          });
+        } else {
+          if (fn) {
+            selectTimeAction();
+          }
+        }
+      } else {
+        selectTimeAction();
+      }
     };
     const setYearClass = (item) => {
       return {
@@ -838,6 +844,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           month: item,
           day: 1
         });
+        console.log("start.value", start.value);
+        console.log("end.value", end.value);
+        console.log("value", value);
+        console.log("getValue(start.value)", getValue(start.value));
+        console.log("getValue(end.value)", getValue(end.value));
         if ((value > getValue(start.value) || value === getValue(start.value)) && value < getValue(end.value)) {
           arr.push("is-range");
         }
@@ -1656,7 +1667,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             key: 0,
             class: "to-calendar-fn"
           }, [
-            createVNode(_component_to_button, { class: "to-calendar-fn-now" }, {
+            createVNode(_component_to_button, {
+              class: "to-calendar-fn-now",
+              onClick: moment
+            }, {
               default: withCtx(() => [
                 createTextVNode("\u6B64\u523B")
               ]),