@keyblade/pro-components 1.13.6 → 1.13.7-alpha.0

package/es/pro-date-range-picker/index.d.ts

@@ -1,16 +1,6 @@
 import { App } from 'vue';
 declare const ProDateRangePicker: {
-    new (...args: any[]): import('vue').CreateComponentPublicInstanceWithMixins<Readonly<{
-        modelValue: import('./type').IModelValue;
-        startField?: string;
-        endField?: string;
-        startPlaceholder?: string;
-        endPlaceholder?: string;
-        separator?: string;
-        hideLabel?: boolean;
-        formItemProps?: import('@arco-design/web-vue').FormItemInstance;
-        datePickerProps?: import('@arco-design/web-vue').DatePickerInstance;
-    }> & Readonly<{
+    new (...args: any[]): import('vue').CreateComponentPublicInstanceWithMixins<Readonly<import('./type').IProDateRangePickerProps> & Readonly<{
         "onUpdate:modelValue"?: ((value: import('./type').IModelValue) => any) | undefined;
     }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {} & {
         "update:modelValue": (value: import('./type').IModelValue) => any;
@@ -31,17 +21,7 @@ declare const ProDateRangePicker: {
         C: {};
         M: {};
         Defaults: {};
-    }, Readonly<{
-        modelValue: import('./type').IModelValue;
-        startField?: string;
-        endField?: string;
-        startPlaceholder?: string;
-        endPlaceholder?: string;
-        separator?: string;
-        hideLabel?: boolean;
-        formItemProps?: import('@arco-design/web-vue').FormItemInstance;
-        datePickerProps?: import('@arco-design/web-vue').DatePickerInstance;
-    }> & Readonly<{
+    }, Readonly<import('./type').IProDateRangePickerProps> & Readonly<{
         "onUpdate:modelValue"?: ((value: import('./type').IModelValue) => any) | undefined;
     }>, {}, {}, {}, {}, {
         hideLabel: boolean;
@@ -54,17 +34,7 @@ declare const ProDateRangePicker: {
     __isFragment?: never;
     __isTeleport?: never;
     __isSuspense?: never;
-} & import('vue').ComponentOptionsBase<Readonly<{
-    modelValue: import('./type').IModelValue;
-    startField?: string;
-    endField?: string;
-    startPlaceholder?: string;
-    endPlaceholder?: string;
-    separator?: string;
-    hideLabel?: boolean;
-    formItemProps?: import('@arco-design/web-vue').FormItemInstance;
-    datePickerProps?: import('@arco-design/web-vue').DatePickerInstance;
-}> & Readonly<{
+} & import('vue').ComponentOptionsBase<Readonly<import('./type').IProDateRangePickerProps> & Readonly<{
     "onUpdate:modelValue"?: ((value: import('./type').IModelValue) => any) | undefined;
 }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {} & {
     "update:modelValue": (value: import('./type').IModelValue) => any;

package/es/pro-date-range-picker/pro-date-range-picker.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 装载禁用时间
+ * @param start
+ * @param end
+ * @returns
+ */
+export declare const range: (start: number, end: number) => number[];

package/es/pro-date-range-picker/pro-date-range-picker.js

@@ -0,0 +1,9 @@
+const o = (e, n) => {
+  const t = [];
+  for (let r = e; r < n; r++)
+    t.push(r);
+  return t;
+};
+export {
+  o as range
+};

package/es/pro-date-range-picker/pro-date-range-picker.vue.d.ts

@@ -1,19 +1,7 @@
-import { IModelValue } from './type.ts';
-import { DatePickerInstance, FormItemInstance } from '@arco-design/web-vue';
-type __VLS_Props = {
-    modelValue: IModelValue;
-    startField?: string;
-    endField?: string;
-    startPlaceholder?: string;
-    endPlaceholder?: string;
-    separator?: string;
-    hideLabel?: boolean;
-    formItemProps?: FormItemInstance;
-    datePickerProps?: DatePickerInstance;
-};
-declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {} & {
+import { IModelValue, IProDateRangePickerProps } from './type.ts';
+declare const _default: import('vue').DefineComponent<IProDateRangePickerProps, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {} & {
     "update:modelValue": (value: IModelValue) => any;
-}, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{
+}, string, import('vue').PublicProps, Readonly<IProDateRangePickerProps> & Readonly<{
     "onUpdate:modelValue"?: ((value: IModelValue) => any) | undefined;
 }>, {
     hideLabel: boolean;

package/es/pro-date-range-picker/pro-date-range-picker.vue.js

@@ -1,7 +1,7 @@
 import o from "./pro-date-range-picker.vue2.js";
 /* empty css                           */
 import r from "../_virtual/_plugin-vue_export-helper.js";
-const a = /* @__PURE__ */ r(o, [["__scopeId", "data-v-ccbc7e81"]]);
+const _ = /* @__PURE__ */ r(o, [["__scopeId", "data-v-7db07ed0"]]);
 export {
-  a as default
+  _ as default
 };

package/es/pro-date-range-picker/pro-date-range-picker.vue2.js

@@ -1,6 +1,7 @@
-import { defineComponent as v, ref as V, computed as h, resolveComponent as k, createElementBlock as _, openBlock as E, normalizeClass as S, createVNode as d, mergeProps as i, withCtx as n, createTextVNode as B, toDisplayString as R, nextTick as P } from "vue";
+import { defineComponent as R, ref as u, computed as y, resolveComponent as D, createElementBlock as N, openBlock as q, normalizeClass as H, createVNode as o, mergeProps as m, withCtx as c, createTextVNode as I, toDisplayString as L, nextTick as F } from "vue";
 import r from "dayjs";
-const T = "keyblade-pro-date-range-picker", I = /* @__PURE__ */ v({
+import { range as p } from "./pro-date-range-picker.js";
+const M = "keyblade-pro-date-range-picker", w = /* @__PURE__ */ R({
   __name: "pro-date-range-picker",
   props: {
     modelValue: {},
@@ -9,94 +10,109 @@ const T = "keyblade-pro-date-range-picker", I = /* @__PURE__ */ v({
     startPlaceholder: { default: "开始日期" },
     endPlaceholder: { default: "结束日期" },
     separator: { default: "至" },
+    intraday: { type: Boolean },
     hideLabel: { type: Boolean, default: !0 },
     formItemProps: {},
     datePickerProps: {}
   },
   emits: ["update:modelValue"],
-  setup(g, { emit: F }) {
-    const e = g, s = F, u = V(), m = V(), p = h({
+  setup(P, { emit: g }) {
+    const e = P, f = g, V = u(), b = u(), n = u(), k = y({
       get: () => e.modelValue[e.startField],
-      set: (l) => {
-        s("update:modelValue", {
+      set: (t) => {
+        f("update:modelValue", {
           ...e.modelValue,
-          [e.startField]: l
+          [e.startField]: t
         });
       }
-    }), f = h({
+    }), h = y({
       get: () => e.modelValue[e.endField],
-      set: (l) => {
-        s("update:modelValue", {
+      set: (t) => {
+        f("update:modelValue", {
           ...e.modelValue,
-          [e.endField]: l
+          [e.endField]: t
         });
       }
-    }), b = (l) => e.modelValue[e.endField] ? r(l).isAfter(r(e.modelValue[e.endField])) : !1, D = (l) => e.modelValue[e.startField] ? r(l).isBefore(r(e.modelValue[e.startField])) : !1, y = () => {
+    }), v = (t) => e.modelValue[e.endField] ? r(t).isAfter(r(e.modelValue[e.endField])) : !1, S = (t) => e.modelValue[e.startField] ? (e.intraday && t.setDate(t.getDate() + 1), r(t).isBefore(r(e.modelValue[e.startField]))) : !1, C = (t) => {
+      if (!e.modelValue[e.startField] || !t || !e.intraday) {
+        n.value = {};
+        return;
+      }
+      const a = r(e.modelValue[e.startField]), i = r(t);
+      if (!a.isSame(i, "day")) {
+        n.value = {};
+        return;
+      }
+      const d = a.hour(), l = a.minute(), B = a.second();
+      n.value = {
+        disabledHours: () => p(0, d),
+        disabledMinutes: (s) => s === d ? p(0, l) : [],
+        disabledSeconds: (s, T) => s === d && T === l ? p(0, B) : []
+      };
+    }, E = () => {
       setTimeout(() => {
-        e.modelValue[e.startField] && !e.modelValue[e.endField] && P(() => {
-          var t;
-          const l = (t = m.value) == null ? void 0 : t.$el.parentElement.querySelector("input");
-          l && l.click();
+        e.modelValue[e.startField] && !e.modelValue[e.endField] && F(() => {
+          var a;
+          const t = (a = b.value) == null ? void 0 : a.$el.parentElement.querySelector("input");
+          t && t.click();
         });
       });
-    }, C = () => {
+    }, _ = () => {
       setTimeout(() => {
-        e.modelValue[e.endField] && !e.modelValue[e.startField] && P(() => {
-          var t;
-          const l = (t = u.value) == null ? void 0 : t.$el.parentElement.querySelector("input");
-          l && l.click();
+        e.modelValue[e.endField] && !e.modelValue[e.startField] && F(() => {
+          var a;
+          const t = (a = V.value) == null ? void 0 : a.$el.parentElement.querySelector("input");
+          t && t.click();
         });
       });
     };
-    return (l, t) => {
-      const c = k("a-date-picker"), o = k("a-form-item");
-      return E(), _("div", {
-        class: S(T)
+    return (t, a) => {
+      const i = D("a-date-picker"), d = D("a-form-item");
+      return q(), N("div", {
+        class: H(M)
       }, [
-        d(o, i(l.formItemProps, {
-          field: l.startField,
-          style: { "margin-right": "8px" },
-          "hide-label": l.hideLabel
+        o(d, m(t.formItemProps, {
+          field: t.startField,
+          "hide-label": t.hideLabel
         }), {
-          default: n(() => [
-            d(c, i({
+          default: c(() => [
+            o(i, m({
               ref_key: "startDatePickerRef",
-              ref: u,
-              modelValue: p.value,
-              "onUpdate:modelValue": t[0] || (t[0] = (a) => p.value = a)
-            }, l.datePickerProps, {
-              placeholder: l.startPlaceholder,
-              "disabled-date": (a) => b(a),
-              onChange: y
+              ref: V,
+              modelValue: k.value,
+              "onUpdate:modelValue": a[0] || (a[0] = (l) => k.value = l)
+            }, t.datePickerProps, {
+              placeholder: t.startPlaceholder,
+              "disabled-date": (l) => v(l),
+              onChange: E
             }), null, 16, ["modelValue", "placeholder", "disabled-date"])
           ]),
           _: 1
         }, 16, ["field", "hide-label"]),
-        d(o, {
-          "hide-label": "",
-          style: { "margin-right": "8px" }
-        }, {
-          default: n(() => [
-            B(R(l.separator), 1)
+        o(d, { "hide-label": "" }, {
+          default: c(() => [
+            I(L(t.separator), 1)
           ]),
           _: 1
         }),
-        d(o, {
-          field: l.endField,
+        o(d, {
+          field: t.endField,
           "hide-label": "",
           style: { "margin-right": "0px" }
         }, {
-          default: n(() => [
-            d(c, i({
+          default: c(() => [
+            o(i, m({
               ref_key: "endDatePickerRef",
-              ref: m,
-              modelValue: f.value,
-              "onUpdate:modelValue": t[1] || (t[1] = (a) => f.value = a)
-            }, l.datePickerProps, {
-              placeholder: l.endPlaceholder,
-              "disabled-date": (a) => D(a),
-              onChange: C
-            }), null, 16, ["modelValue", "placeholder", "disabled-date"])
+              ref: b,
+              modelValue: h.value,
+              "onUpdate:modelValue": a[1] || (a[1] = (l) => h.value = l)
+            }, t.datePickerProps, {
+              placeholder: t.endPlaceholder,
+              "disabled-date": (l) => S(l),
+              "disabled-time": () => n.value,
+              onSelect: C,
+              onChange: _
+            }), null, 16, ["modelValue", "placeholder", "disabled-date", "disabled-time"])
           ]),
           _: 1
         }, 8, ["field"])
@@ -105,5 +121,5 @@ const T = "keyblade-pro-date-range-picker", I = /* @__PURE__ */ v({
   }
 });
 export {
-  I as default
+  w as default
 };

package/es/pro-date-range-picker/type.d.ts

@@ -1,3 +1,22 @@
+import { DatePickerInstance, FormItemInstance } from '@arco-design/web-vue';
 export interface IModelValue {
     [key: string]: any;
 }
+export interface IProDateRangePickerProps {
+    modelValue: IModelValue;
+    /** 开始时间绑定字段 */
+    startField?: string;
+    /** 结束开始时间绑定字段 */
+    endField?: string;
+    /** 提示文本：开始日期 */
+    startPlaceholder?: string;
+    /** 提示文本：结束日期 */
+    endPlaceholder?: string;
+    /** 提示文本：至 */
+    separator?: string;
+    /** 是否可以选择当天 */
+    intraday?: boolean;
+    hideLabel?: boolean;
+    formItemProps?: FormItemInstance;
+    datePickerProps?: DatePickerInstance;
+}

package/es/style.css

@@ -1 +1 @@
-.keyblade-pro-page-header{background:var(--color-bg-2);padding:16px 32px}.keyblade-pro-page-header .keyblade-pro-page-header-section-breadcrumb .arco-breadcrumb-item:first-child{padding-left:0}.keyblade-pro-page-header .keyblade-pro-page-header-title.arco-typography{padding-top:4px;margin-top:0}.keyblade-pro-layout{width:100%;height:100%}.keyblade-pro-layout .keyblade-pro-layout-header{position:fixed;top:0;left:0;width:100%;height:var(--4a477a1a);z-index:100;display:flex;align-items:center;justify-content:space-between;padding:0 20px;background-color:var(--color-bg-2);border-bottom:1px solid var(--color-border);transition:all .2s cubic-bezier(.34,.69,.1,1)}.keyblade-pro-layout .keyblade-pro-layout-header-left{cursor:pointer;display:flex;align-items:center}.keyblade-pro-layout .keyblade-pro-layout-header-left-logo-img{width:28px;height:28px}.keyblade-pro-layout .keyblade-pro-layout-header-left-logo-title.arco-typography{margin:0;font-size:18px}.keyblade-pro-layout .keyblade-pro-layout-header-center{flex:1}.keyblade-pro-layout .keyblade-pro-layout-sider{padding-top:var(--4a477a1a);position:fixed;top:0;left:0;z-index:99;height:100%;transition:all .2s cubic-bezier(.34,.69,.1,1)}.keyblade-pro-layout .keyblade-pro-layout-sider-content{position:relative;height:100%;overflow:auto}.keyblade-pro-layout .keyblade-pro-layout-sider-collapse-btn.arco-btn{position:absolute;right:12px;bottom:12px}.keyblade-pro-layout .keyblade-pro-layout-body{padding-top:var(--4a477a1a);padding-left:var(--3599ef93);min-height:100vh;overflow-y:hidden;background-color:var(--color-fill-2);transition:padding .2s cubic-bezier(.34,.69,.1,1)}.keyblade-pro-layout .keyblade-pro-layout-body-hide-sider{padding-left:0}.keyblade-pro-layout .keyblade-pro-layout-body-affix .arco-affix{z-index:98}.keyblade-pro-layout .keyblade-pro-layout-body-footer{display:flex;align-items:center;justify-content:center;height:40px;color:var(--color-text-2);text-align:center}.keyblade-pro-layout .keyblade-pro-layout-body-collapsed{padding-left:var(--5b478c92)}.keyblade-pro-layout-side .keyblade-pro-layout-header{z-index:98;left:var(--3599ef93);width:calc(100% - var(--3599ef93))}.keyblade-pro-layout-side .keyblade-pro-layout-header-collapsed{left:var(--5b478c92);width:calc(100% - var(--5b478c92))}.keyblade-pro-layout-side .keyblade-pro-layout-sider{padding-top:0}.keyblade-pro-layout-side .keyblade-pro-layout-sider-content-logo{position:relative;display:flex;align-items:center;padding:16px;cursor:pointer;transition:padding .3s cubic-bezier(.645,.045,.355,1)}.keyblade-pro-layout-side .keyblade-pro-layout-sider-content-logo-img{width:28px;height:28px}.keyblade-pro-layout-side .keyblade-pro-layout-sider-content-logo-title.arco-typography{margin:0;font-size:18px}.keyblade-pro-layout-side .keyblade-pro-layout-sider-collapsed .keyblade-pro-layout-sider-content-logo{padding:16px 10px}.keyblade-pro-menu .keyblade-pro-menu-item-img{width:14px;height:auto}.keyblade-pro-reuse-tabs{position:relative;background-color:var(--color-bg-2);padding:4px 20px}.keyblade-pro-page-container .keyblade-pro-page-container-content{padding:20px}.keyblade-pro-image-upload-cropper-dialog-cropper-wrapper[data-v-1bddf267]{width:100%;height:400px}.keyblade-pro-image-upload-cropper-dialog-operate[data-v-1bddf267]{margin-top:24px;display:flex;align-items:center;justify-content:center}.keyblade-pro-image-upload-cropper-dialog-footer[data-v-1bddf267]{margin-top:24px;display:flex;align-items:center;justify-content:flex-end}.keyblade-pro-image-upload-cropper-dialog-footer-left[data-v-1bddf267]{display:flex;align-items:center;justify-content:flex-start;margin-right:12px}.keyblade-pro-image-upload-cropper-dialog-footer-right[data-v-1bddf267]{flex:1;display:flex;align-items:center;justify-content:flex-end}.keyblade-pro-date-range-picker[data-v-ccbc7e81]{display:flex;align-items:center}
+.keyblade-pro-page-header{background:var(--color-bg-2);padding:16px 32px}.keyblade-pro-page-header .keyblade-pro-page-header-section-breadcrumb .arco-breadcrumb-item:first-child{padding-left:0}.keyblade-pro-page-header .keyblade-pro-page-header-title.arco-typography{padding-top:4px;margin-top:0}.keyblade-pro-layout{width:100%;height:100%}.keyblade-pro-layout .keyblade-pro-layout-header{position:fixed;top:0;left:0;width:100%;height:var(--4a477a1a);z-index:100;display:flex;align-items:center;justify-content:space-between;padding:0 20px;background-color:var(--color-bg-2);border-bottom:1px solid var(--color-border);transition:all .2s cubic-bezier(.34,.69,.1,1)}.keyblade-pro-layout .keyblade-pro-layout-header-left{cursor:pointer;display:flex;align-items:center}.keyblade-pro-layout .keyblade-pro-layout-header-left-logo-img{width:28px;height:28px}.keyblade-pro-layout .keyblade-pro-layout-header-left-logo-title.arco-typography{margin:0;font-size:18px}.keyblade-pro-layout .keyblade-pro-layout-header-center{flex:1}.keyblade-pro-layout .keyblade-pro-layout-sider{padding-top:var(--4a477a1a);position:fixed;top:0;left:0;z-index:99;height:100%;transition:all .2s cubic-bezier(.34,.69,.1,1)}.keyblade-pro-layout .keyblade-pro-layout-sider-content{position:relative;height:100%;overflow:auto}.keyblade-pro-layout .keyblade-pro-layout-sider-collapse-btn.arco-btn{position:absolute;right:12px;bottom:12px}.keyblade-pro-layout .keyblade-pro-layout-body{padding-top:var(--4a477a1a);padding-left:var(--3599ef93);min-height:100vh;overflow-y:hidden;background-color:var(--color-fill-2);transition:padding .2s cubic-bezier(.34,.69,.1,1)}.keyblade-pro-layout .keyblade-pro-layout-body-hide-sider{padding-left:0}.keyblade-pro-layout .keyblade-pro-layout-body-affix .arco-affix{z-index:98}.keyblade-pro-layout .keyblade-pro-layout-body-footer{display:flex;align-items:center;justify-content:center;height:40px;color:var(--color-text-2);text-align:center}.keyblade-pro-layout .keyblade-pro-layout-body-collapsed{padding-left:var(--5b478c92)}.keyblade-pro-layout-side .keyblade-pro-layout-header{z-index:98;left:var(--3599ef93);width:calc(100% - var(--3599ef93))}.keyblade-pro-layout-side .keyblade-pro-layout-header-collapsed{left:var(--5b478c92);width:calc(100% - var(--5b478c92))}.keyblade-pro-layout-side .keyblade-pro-layout-sider{padding-top:0}.keyblade-pro-layout-side .keyblade-pro-layout-sider-content-logo{position:relative;display:flex;align-items:center;padding:16px;cursor:pointer;transition:padding .3s cubic-bezier(.645,.045,.355,1)}.keyblade-pro-layout-side .keyblade-pro-layout-sider-content-logo-img{width:28px;height:28px}.keyblade-pro-layout-side .keyblade-pro-layout-sider-content-logo-title.arco-typography{margin:0;font-size:18px}.keyblade-pro-layout-side .keyblade-pro-layout-sider-collapsed .keyblade-pro-layout-sider-content-logo{padding:16px 10px}.keyblade-pro-menu .keyblade-pro-menu-item-img{width:14px;height:auto}.keyblade-pro-reuse-tabs{position:relative;background-color:var(--color-bg-2);padding:4px 20px}.keyblade-pro-page-container .keyblade-pro-page-container-content{padding:20px}.keyblade-pro-image-upload-cropper-dialog-cropper-wrapper[data-v-1bddf267]{width:100%;height:400px}.keyblade-pro-image-upload-cropper-dialog-operate[data-v-1bddf267]{margin-top:24px;display:flex;align-items:center;justify-content:center}.keyblade-pro-image-upload-cropper-dialog-footer[data-v-1bddf267]{margin-top:24px;display:flex;align-items:center;justify-content:flex-end}.keyblade-pro-image-upload-cropper-dialog-footer-left[data-v-1bddf267]{display:flex;align-items:center;justify-content:flex-start;margin-right:12px}.keyblade-pro-image-upload-cropper-dialog-footer-right[data-v-1bddf267]{flex:1;display:flex;align-items:center;justify-content:flex-end}.keyblade-pro-date-range-picker[data-v-7db07ed0]{display:flex;align-items:center}.keyblade-pro-date-range-picker[data-v-7db07ed0] .arco-form-item{margin-right:8px;margin-bottom:0}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@keyblade/pro-components",
   "description": "KeyBlade Pro Components",
   "author": "yangshuai <704807396@qq.com>",
-  "version": "1.13.6",
+  "version": "1.13.7-alpha.0",
   "private": false,
   "type": "module",
   "main": "es/index.js",