@jnrs/vue-core 1.2.30 → 1.2.32

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 # 发版日志
 
-## [1.2.30] - 2026-07-27 【latest】
+## [1.2.32] - 2026-07-27 【latest】
+
+### Fixed
+
+- `JnDateQuery`：修复 `switcher-style="select"` 时切换时间类型导致 `modelValue` 错乱的问题，将 `v-model="currentType"` 改为 `:model-value="currentType"` + `@change` 手动处理，确保类型切换逻辑通过 `handleTypeChange` 统一处理，避免 v-model 提前更新跳过值转换
+
+## [1.2.31] - 2026-07-27
+
+### Fixed
+
+- `JnDateQuery`：修复 `switcher-style="select"` 时切换时间类型导致 `modelValue` 错乱的问题（初始修复使用 `:value` 导致显示为空，已更正为 `:model-value`）
+
+## [1.2.30] - 2026-07-27
 
 ### Fixed
 

package/dist/components/index.js

@@ -1,4 +1,4 @@
-(function(){"use strict";try{if(typeof document<"u"){var e=document.createElement("style");e.appendChild(document.createTextNode(".jn_globalSetting_header{margin-bottom:0;padding-bottom:20px}.jn_globalSetting_item[data-v-2b8b00a5]{margin-bottom:20px}.jn_imageView[data-v-1e2b2aae]{display:block;width:100%;height:100%}.jn_imageView .jn_imageView_error[data-v-1e2b2aae]{display:flex;align-items:center;justify-content:center;width:100%;height:100%;font-size:.8em;line-height:1.1em;text-align:center;filter:opacity(.7)}.jn_image_view_icon[data-v-1e2b2aae]:hover{color:var(--jnrs-color-primary);transform:scale(1.2);transition:all .3s ease}.jn_fileView[data-v-00dee50f]{display:block;width:100%;height:100%;line-height:1em;cursor:pointer}.jn_fileView:hover .jn_fileView_button[data-v-00dee50f]{color:var(--jnrs-color-primary)}.jn_fileView .jn_fileView_fileName[data-v-00dee50f]{font-size:.8em;color:var(--jnrs-font-primary-05);white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.jn_fileView .jn_fileView_button[data-v-00dee50f]{height:auto;padding:0;text-decoration:underline;font-size:.9em;transition:all .3s ease}.jn_fileUpload[data-v-40647e72]{position:relative;width:100%;color:var(--jnrs-font-primary-05)}.jn_fileUpload[data-v-40647e72] .el-upload-dragger{padding:30px 0 10px}.jn_fileUpload .jn_uploadTips[data-v-40647e72]{display:block;width:100%;margin-top:5px;line-height:1.2em}.jn_fileUpload .jn_uploadTips span[data-v-40647e72]{display:inline-block;margin-right:10px}.jn_fileUpload .jn_uploadTips b[data-v-40647e72]{color:var(--el-color-danger, #ff3300)}.jn_fileUpload .jn_uploadTips_isDrag[data-v-40647e72]{position:absolute;top:4px;left:0;text-align:center}.jn_fileUpload .jn_fileList[data-v-40647e72]{width:100%}.jn_fileUpload .jn_fileList .jn_fileLis_item[data-v-40647e72]{display:flex;align-items:center;justify-content:space-between;width:100%;margin-top:8px;padding:5px 0;border:1px solid var(--jnrs-font-primary-03);background:var(--jnrs-background-primary)}.jn_fileUpload .jn_fileList .jn_fileLis_item .fileLis_item_left[data-v-40647e72]{flex:1;position:relative;display:flex;align-items:center;justify-content:flex-start;padding-right:50px;line-height:1.1em}.jn_fileUpload .jn_fileList .jn_fileLis_item .fileLis_item_right[data-v-40647e72]{flex-shrink:0;width:60px;display:flex;align-items:center;justify-content:flex-end;padding-right:4px}.jn_fileUpload .jn_fileList .jn_fileLis_item .fileLis_item_index[data-v-40647e72]{flex-shrink:0;width:20px;height:20px;line-height:20px;text-align:center}.jn_fileUpload .jn_fileList .jn_fileLis_item .fileLis_item_icon[data-v-40647e72]{flex-shrink:0;width:20px;height:20px}.jn_fileUpload .jn_fileList .jn_fileLis_item .fileLis_item_name[data-v-40647e72]{padding:0 4px;word-break:break-all}.jn_fileUpload .jn_fileList .jn_fileLis_item .fileLis_item_size[data-v-40647e72]{position:absolute;right:0;width:50px;color:#999;white-space:nowrap;text-align:right}.jn_fileUpload .jn_fileList .jn_fileLis_item .fileLis_item_btn[data-v-40647e72]{flex-shrink:0;display:flex;align-items:center;justify-content:center;width:20px;height:20px;margin:0 2px;border-radius:3px;font-size:16px;color:var(--el-color-primary, #5887f7);transition:all .3s ease;cursor:pointer}.jn_fileUpload .jn_fileList .jn_fileLis_item .fileLis_item_btn[data-v-40647e72]:hover{background-color:var(--jnrs-card-primary)}.jn_fileUpload .jn_fileList .jn_fileLis_item .fileLis_item_btn_danger[data-v-40647e72]{color:var(--el-color-danger, #ff3300)}.jnImportAndExport_button.is-text[data-v-7f168c95]{padding:0}.jnImportAndExport_underlineBtn[data-v-7f168c95]{display:inline-block;margin-right:36px;color:#3697fc;text-decoration:underline;cursor:pointer}.jnImportAndExport_underlineBtn[data-v-7f168c95]:hover{opacity:.8}.jn_table[data-v-080c5c53]{width:100%}.jn_table[data-v-080c5c53] .jn_table_header{color:var(--jnrs-font-primary)!important;background:var(--jnrs-background-head)!important}.jn_table[data-v-080c5c53] .jn_table_header .cell{padding:0 8px;line-height:1.2em}.jn-main-table[data-v-080c5c53] .el-table__row{cursor:pointer}.jn-main-table[data-v-080c5c53] .jn-row-selected td{background-color:var(--jnrs-color-primary-fade03)!important}.jn_selectTemplate[data-v-1634df13]{display:flex;align-items:center;font-size:0}.jn_selectTemplate .jn_select[data-v-1634df13]{flex:1;right:-1px;z-index:1}.jn_selectTemplate .jn_select[data-v-1634df13] .el-select__wrapper{border-top-right-radius:0;border-bottom-right-radius:0}.jn_selectTemplate .jn_select_button[data-v-1634df13]{border-radius:0 3px 3px 0}.jn_selectTemplate .jn_select_button[data-v-1634df13]:hover{z-index:1}.t_select_button_only[data-v-1634df13]{margin-left:0;border-top-left-radius:3px;border-bottom-left-radius:3px}.jn_dialog_header[data-v-1634df13]{display:flex;align-items:center}[data-v-1634df13] .el-input__validateIcon{display:none}[data-v-1634df13] th .el-checkbox--small{display:none!important}[data-v-1634df13] .el-table__row{cursor:pointer}.tableIsSingle[data-v-1634df13] .el-checkbox__inner{border-radius:50%}.jn-date-query[data-v-4663860e]{display:flex;align-items:center;gap:12px}.jn-date-query__main[data-v-4663860e]{display:flex;align-items:center;gap:8px}.jn-date-query__switcher[data-v-4663860e]{display:flex;align-items:center}")),document.head.appendChild(e)}}catch(i){console.error("vite-plugin-css-injected-by-js",i)}})();
+(function(){"use strict";try{if(typeof document<"u"){var e=document.createElement("style");e.appendChild(document.createTextNode(".jn_globalSetting_header{margin-bottom:0;padding-bottom:20px}.jn_globalSetting_item[data-v-2b8b00a5]{margin-bottom:20px}.jn_imageView[data-v-1e2b2aae]{display:block;width:100%;height:100%}.jn_imageView .jn_imageView_error[data-v-1e2b2aae]{display:flex;align-items:center;justify-content:center;width:100%;height:100%;font-size:.8em;line-height:1.1em;text-align:center;filter:opacity(.7)}.jn_image_view_icon[data-v-1e2b2aae]:hover{color:var(--jnrs-color-primary);transform:scale(1.2);transition:all .3s ease}.jn_fileView[data-v-00dee50f]{display:block;width:100%;height:100%;line-height:1em;cursor:pointer}.jn_fileView:hover .jn_fileView_button[data-v-00dee50f]{color:var(--jnrs-color-primary)}.jn_fileView .jn_fileView_fileName[data-v-00dee50f]{font-size:.8em;color:var(--jnrs-font-primary-05);white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.jn_fileView .jn_fileView_button[data-v-00dee50f]{height:auto;padding:0;text-decoration:underline;font-size:.9em;transition:all .3s ease}.jn_fileUpload[data-v-40647e72]{position:relative;width:100%;color:var(--jnrs-font-primary-05)}.jn_fileUpload[data-v-40647e72] .el-upload-dragger{padding:30px 0 10px}.jn_fileUpload .jn_uploadTips[data-v-40647e72]{display:block;width:100%;margin-top:5px;line-height:1.2em}.jn_fileUpload .jn_uploadTips span[data-v-40647e72]{display:inline-block;margin-right:10px}.jn_fileUpload .jn_uploadTips b[data-v-40647e72]{color:var(--el-color-danger, #ff3300)}.jn_fileUpload .jn_uploadTips_isDrag[data-v-40647e72]{position:absolute;top:4px;left:0;text-align:center}.jn_fileUpload .jn_fileList[data-v-40647e72]{width:100%}.jn_fileUpload .jn_fileList .jn_fileLis_item[data-v-40647e72]{display:flex;align-items:center;justify-content:space-between;width:100%;margin-top:8px;padding:5px 0;border:1px solid var(--jnrs-font-primary-03);background:var(--jnrs-background-primary)}.jn_fileUpload .jn_fileList .jn_fileLis_item .fileLis_item_left[data-v-40647e72]{flex:1;position:relative;display:flex;align-items:center;justify-content:flex-start;padding-right:50px;line-height:1.1em}.jn_fileUpload .jn_fileList .jn_fileLis_item .fileLis_item_right[data-v-40647e72]{flex-shrink:0;width:60px;display:flex;align-items:center;justify-content:flex-end;padding-right:4px}.jn_fileUpload .jn_fileList .jn_fileLis_item .fileLis_item_index[data-v-40647e72]{flex-shrink:0;width:20px;height:20px;line-height:20px;text-align:center}.jn_fileUpload .jn_fileList .jn_fileLis_item .fileLis_item_icon[data-v-40647e72]{flex-shrink:0;width:20px;height:20px}.jn_fileUpload .jn_fileList .jn_fileLis_item .fileLis_item_name[data-v-40647e72]{padding:0 4px;word-break:break-all}.jn_fileUpload .jn_fileList .jn_fileLis_item .fileLis_item_size[data-v-40647e72]{position:absolute;right:0;width:50px;color:#999;white-space:nowrap;text-align:right}.jn_fileUpload .jn_fileList .jn_fileLis_item .fileLis_item_btn[data-v-40647e72]{flex-shrink:0;display:flex;align-items:center;justify-content:center;width:20px;height:20px;margin:0 2px;border-radius:3px;font-size:16px;color:var(--el-color-primary, #5887f7);transition:all .3s ease;cursor:pointer}.jn_fileUpload .jn_fileList .jn_fileLis_item .fileLis_item_btn[data-v-40647e72]:hover{background-color:var(--jnrs-card-primary)}.jn_fileUpload .jn_fileList .jn_fileLis_item .fileLis_item_btn_danger[data-v-40647e72]{color:var(--el-color-danger, #ff3300)}.jnImportAndExport_button.is-text[data-v-7f168c95]{padding:0}.jnImportAndExport_underlineBtn[data-v-7f168c95]{display:inline-block;margin-right:36px;color:#3697fc;text-decoration:underline;cursor:pointer}.jnImportAndExport_underlineBtn[data-v-7f168c95]:hover{opacity:.8}.jn_table[data-v-080c5c53]{width:100%}.jn_table[data-v-080c5c53] .jn_table_header{color:var(--jnrs-font-primary)!important;background:var(--jnrs-background-head)!important}.jn_table[data-v-080c5c53] .jn_table_header .cell{padding:0 8px;line-height:1.2em}.jn-main-table[data-v-080c5c53] .el-table__row{cursor:pointer}.jn-main-table[data-v-080c5c53] .jn-row-selected td{background-color:var(--jnrs-color-primary-fade03)!important}.jn_selectTemplate[data-v-1634df13]{display:flex;align-items:center;font-size:0}.jn_selectTemplate .jn_select[data-v-1634df13]{flex:1;right:-1px;z-index:1}.jn_selectTemplate .jn_select[data-v-1634df13] .el-select__wrapper{border-top-right-radius:0;border-bottom-right-radius:0}.jn_selectTemplate .jn_select_button[data-v-1634df13]{border-radius:0 3px 3px 0}.jn_selectTemplate .jn_select_button[data-v-1634df13]:hover{z-index:1}.t_select_button_only[data-v-1634df13]{margin-left:0;border-top-left-radius:3px;border-bottom-left-radius:3px}.jn_dialog_header[data-v-1634df13]{display:flex;align-items:center}[data-v-1634df13] .el-input__validateIcon{display:none}[data-v-1634df13] th .el-checkbox--small{display:none!important}[data-v-1634df13] .el-table__row{cursor:pointer}.tableIsSingle[data-v-1634df13] .el-checkbox__inner{border-radius:50%}.jn-date-query[data-v-66564241]{display:flex;align-items:center;gap:12px}.jn-date-query__main[data-v-66564241]{display:flex;align-items:center;gap:8px}.jn-date-query__switcher[data-v-66564241]{display:flex;align-items:center}")),document.head.appendChild(e)}}catch(i){console.error("vite-plugin-css-injected-by-js",i)}})();
 import { defineComponent as N, ref as L, createBlock as z, openBlock as f, unref as l, withCtx as m, createElementVNode as D, createVNode as b, toDisplayString as C, isRef as Rt, createElementBlock as w, Fragment as O, renderList as Z, createTextVNode as V, computed as H, normalizeStyle as ke, createCommentVNode as U, renderSlot as Ae, withDirectives as Le, normalizeClass as be, vShow as Gt, nextTick as se, withModifiers as Ve, watch as ue, onMounted as Nt, mergeProps as Jt } from "vue";
 import { storeToRefs as qt } from "pinia";
 import { ElDrawer as Yt, ElSwitch as Zt, ElRadioGroup as je, ElRadio as Pe, ElImage as Wt, ElIcon as M, ElButton as F, ElDialog as Et, ElUpload as $t, vLoading as Fe, ElMessage as q, ElForm as pt, ElFormItem as _t, ElMessageBox as qe, ElLoading as Be, ElPagination as wt, ElTable as kt, ElTableColumn as Ie, ElSelect as Qt, ElOption as St, ElCheckbox as ea, ElDatePicker as ta, ElButtonGroup as Ye } from "element-plus";
@@ -375,7 +375,7 @@ const wa = { class: "jn_globalSetting_item" }, ka = { class: "jn_globalSetting_i
       o(e.autoUploadApi?.(s.file)), d(new Error("上传失败"));
     }), c = (s) => {
       e.downloadFileFn?.(s);
-    }, S = (s) => {
+    }, Q = (s) => {
       const o = e.modelValue, d = e.modelValue?.findIndex((k) => {
         if ("id" in s && "id" in k)
           return k.id === s.id;
@@ -463,7 +463,7 @@ const wa = { class: "jn_globalSetting_item" }, ka = { class: "jn_globalSetting_i
               ], 8, An)) : U("", !0),
               D("span", {
                 class: "fileLis_item_btn fileLis_item_btn_danger",
-                onClick: (P) => S(d)
+                onClick: (P) => Q(d)
               }, [
                 b(l(M), null, {
                   default: m(() => [
@@ -488,7 +488,7 @@ const wa = { class: "jn_globalSetting_item" }, ka = { class: "jn_globalSetting_i
             D("div", bn, [
               D("span", {
                 class: "fileLis_item_btn fileLis_item_btn_danger",
-                onClick: (P) => S(d)
+                onClick: (P) => Q(d)
               }, [
                 b(l(M), null, {
                   default: m(() => [
@@ -610,7 +610,7 @@ const wa = { class: "jn_globalSetting_item" }, ka = { class: "jn_globalSetting_i
       } finally {
         s.close();
       }
-    }, S = () => {
+    }, Q = () => {
       if (!e.importApi)
         return q.error(n("@jnrs/vue-core.components.JnImportAndExport.noImportApi")), !1;
       A.value?.validate(async (s) => {
@@ -686,7 +686,7 @@ const wa = { class: "jn_globalSetting_item" }, ka = { class: "jn_globalSetting_i
             b(l(F), {
               type: "success",
               icon: "Select",
-              onClick: S
+              onClick: Q
             }, {
               default: m(() => [
                 V(C(l(n)("@jnrs/vue-core.components.JnImportAndExport.submit")), 1)
@@ -1263,9 +1263,9 @@ function ye(e, t, a, n, u, i) {
   }) : Ai(e) && e.forEach(function(s, o) {
     A.set(o, ye(s, t, a, o, e, i));
   });
-  var c = xe, S = h ? void 0 : c(e);
-  return Mn(S || e, function(s, o) {
-    S && (o = s, s = e[o]), Zn(A, o, ye(s, t, a, o, e, i));
+  var c = xe, Q = h ? void 0 : c(e);
+  return Mn(Q || e, function(s, o) {
+    Q && (o = s, s = e[o]), Zn(A, o, ye(s, t, a, o, e, i));
   }), A;
 }
 var xi = 1, Hi = 4;
@@ -1303,7 +1303,7 @@ function Ot(e, t, a, n, u, i) {
   var r = i.get(e), g = i.get(t);
   if (r && g)
     return r == t && g == e;
-  var c = -1, S = !0, s = a & Ji ? new we() : void 0;
+  var c = -1, Q = !0, s = a & Ji ? new we() : void 0;
   for (i.set(e, t), i.set(t, e); ++c < h; ) {
     var o = e[c], d = t[c];
     if (n)
@@ -1311,7 +1311,7 @@ function Ot(e, t, a, n, u, i) {
     if (k !== void 0) {
       if (k)
         continue;
-      S = !1;
+      Q = !1;
       break;
     }
     if (s) {
@@ -1319,15 +1319,15 @@ function Ot(e, t, a, n, u, i) {
         if (!Gi(s, X) && (o === P || u(o, P, a, n, i)))
           return s.push(X);
       })) {
-        S = !1;
+        Q = !1;
         break;
       }
     } else if (!(o === d || u(o, d, a, n, i))) {
-      S = !1;
+      Q = !1;
       break;
     }
   }
-  return i.delete(e), i.delete(t), S;
+  return i.delete(e), i.delete(t), Q;
 }
 function qi(e) {
   var t = -1, a = Array(e.size);
@@ -1383,8 +1383,8 @@ function fr(e, t, a, n, u, i) {
   if (y != g && !A)
     return !1;
   for (var c = y; c--; ) {
-    var S = h[c];
-    if (!(A ? S in t : Ar.call(t, S)))
+    var Q = h[c];
+    if (!(A ? Q in t : Ar.call(t, Q)))
       return !1;
   }
   var s = i.get(e), o = i.get(t);
@@ -1393,15 +1393,15 @@ function fr(e, t, a, n, u, i) {
   var d = !0;
   i.set(e, t), i.set(t, e);
   for (var k = A; ++c < y; ) {
-    S = h[c];
-    var P = e[S], X = t[S];
+    Q = h[c];
+    var P = e[Q], X = t[Q];
     if (n)
-      var ee = A ? n(X, P, S, t, e, i) : n(P, X, S, e, t, i);
+      var ee = A ? n(X, P, Q, t, e, i) : n(P, X, Q, e, t, i);
     if (!(ee === void 0 ? P === X || u(P, X, a, n, i) : ee)) {
       d = !1;
       break;
     }
-    k || (k = S == "constructor");
+    k || (k = Q == "constructor");
   }
   if (d && !k) {
     var x = e.constructor, K = t.constructor;
@@ -1413,13 +1413,13 @@ var gr = 1, bt = "[object Arguments]", It = "[object Array]", he = "[object Obje
 function vr(e, t, a, n, u, i) {
   var A = fe(e), h = fe(t), y = A ? It : G(e), r = h ? It : G(t);
   y = y == bt ? he : y, r = r == bt ? he : r;
-  var g = y == he, c = r == he, S = y == r;
-  if (S && Ee(e)) {
+  var g = y == he, c = r == he, Q = y == r;
+  if (Q && Ee(e)) {
     if (!Ee(t))
       return !1;
     A = !0, g = !1;
   }
-  if (S && !g)
+  if (Q && !g)
     return i || (i = new W()), A || Lt(e) ? Ot(e, t, a, n, u, i) : ur(e, t, y, a, n, u, i);
   if (!(a & gr)) {
     var s = g && Ct.call(e, "__wrapped__"), o = c && Ct.call(t, "__wrapped__");
@@ -1428,7 +1428,7 @@ function vr(e, t, a, n, u, i) {
       return i || (i = new W()), u(d, k, a, n, i);
     }
   }
-  return S ? (i || (i = new W()), fr(e, t, a, n, u, i)) : !1;
+  return Q ? (i || (i = new W()), fr(e, t, a, n, u, i)) : !1;
 }
 function Kt(e, t, a, n, u) {
   return e === t ? !0 : e == null || t == null || !ne(e) && !ne(t) ? e !== e && t !== t : vr(e, t, a, n, Kt, u);
@@ -1546,7 +1546,7 @@ const yr = /* @__PURE__ */ N({
       set: (I) => {
         a("update:modelValue", I || (s.value ? "" : []));
       }
-    }), S = H(() => typeof e.modelValue == "string" || typeof e.modelValue == "number" ? 0 : s.value ? e.modelValue && Object.hasOwn(e.modelValue, e.keyValue.id) ? 1 : 0 : e.modelValue ? e.modelValue.length : 0), s = H(() => e.limit === 1);
+    }), Q = H(() => typeof e.modelValue == "string" || typeof e.modelValue == "number" ? 0 : s.value ? e.modelValue && Object.hasOwn(e.modelValue, e.keyValue.id) ? 1 : 0 : e.modelValue ? e.modelValue.length : 0), s = H(() => e.limit === 1);
     ue(
       () => e.modelValue,
       (I) => {
@@ -1673,7 +1673,7 @@ const yr = /* @__PURE__ */ N({
       }, {
         default: m(() => [
           V(C(e.buttonDialogText) + " ", 1),
-          e.limit !== 1 ? (f(), w("span", br, "（" + C(S.value) + "/" + C(e.limit) + "）", 1)) : U("", !0)
+          e.limit !== 1 ? (f(), w("span", br, "（" + C(Q.value) + "/" + C(e.limit) + "）", 1)) : U("", !0)
         ]),
         _: 1
       }, 8, ["class", "plain", "size", "loading"])) : Le((f(), w("div", {
@@ -1738,7 +1738,7 @@ const yr = /* @__PURE__ */ N({
         }, {
           default: m(() => [
             V(C(e.buttonDialogText) + " ", 1),
-            e.limit !== 1 ? (f(), w("span", Er, "（" + C(S.value) + "/" + C(e.limit) + "）", 1)) : U("", !0)
+            e.limit !== 1 ? (f(), w("span", Er, "（" + C(Q.value) + "/" + C(e.limit) + "）", 1)) : U("", !0)
           ]),
           _: 1
         }, 8, ["plain", "size"]))
@@ -1901,36 +1901,36 @@ const yr = /* @__PURE__ */ N({
   emits: ["update:modelValue", "change", "type-change"],
   setup(e, { emit: t }) {
     function a(v) {
-      const Q = v.getFullYear(), p = String(v.getMonth() + 1).padStart(2, "0"), Y = String(v.getDate()).padStart(2, "0");
-      return `${Q}-${p}-${Y}`;
+      const S = v.getFullYear(), p = String(v.getMonth() + 1).padStart(2, "0"), Y = String(v.getDate()).padStart(2, "0");
+      return `${S}-${p}-${Y}`;
     }
     function n(v) {
       return new Date(v.replace(/\//g, "-"));
     }
-    function u(v, Q) {
+    function u(v, S) {
       const p = new Date(v);
-      return p.setDate(p.getDate() + Q), p;
+      return p.setDate(p.getDate() + S), p;
     }
-    function i(v, Q) {
+    function i(v, S) {
       const p = new Date(v);
-      return p.setMonth(p.getMonth() + Q), p;
+      return p.setMonth(p.getMonth() + S), p;
     }
-    function A(v, Q) {
+    function A(v, S) {
       const p = new Date(v);
-      return p.setFullYear(p.getFullYear() + Q), p;
+      return p.setFullYear(p.getFullYear() + S), p;
     }
     function h(v) {
-      const Q = new Date(v);
-      return Q.setDate(Q.getDate() - Q.getDay()), Q;
+      const S = new Date(v);
+      return S.setDate(S.getDate() - S.getDay()), S;
     }
     function y(v) {
       return u(h(v), 6);
     }
-    const r = e, g = t, c = L(r.type), S = L(r.modelValue);
+    const r = e, g = t, c = L(r.type), Q = L(r.modelValue);
     ue(
       () => r.modelValue,
       (v) => {
-        S.value = v;
+        Q.value = v;
       }
     ), ue(
       () => r.type,
@@ -1955,31 +1955,31 @@ const yr = /* @__PURE__ */ N({
       daterange: "任意区间"
     }, k = H(() => r.typeOptions.map((v) => ({ label: d[v], value: v })));
     function P(v) {
-      S.value = v, g("update:modelValue", v), g("change", v, c.value);
+      Q.value = v, g("update:modelValue", v), g("change", v, c.value);
     }
     function X(v) {
       if (v === c.value) return;
       c.value = v;
-      const Q = S.value;
+      const S = Q.value;
       let p;
       if (v === "week" || v === "daterange")
-        if (Array.isArray(Q))
-          p = Q;
+        if (Array.isArray(S))
+          p = S;
         else {
-          const Y = Q ? n(Q) : /* @__PURE__ */ new Date();
+          const Y = S ? n(S) : /* @__PURE__ */ new Date();
           v === "week" ? p = [a(h(Y)), a(y(Y))] : p = [a(Y), a(Y)];
         }
       else
-        Array.isArray(Q) ? p = Q[0] || a(/* @__PURE__ */ new Date()) : p = Q || a(/* @__PURE__ */ new Date());
+        Array.isArray(S) ? p = S[0] || a(/* @__PURE__ */ new Date()) : p = S || a(/* @__PURE__ */ new Date());
       P(p), g("type-change", v);
     }
     function ee() {
-      const v = S.value;
+      const v = Q.value;
       return Array.isArray(v) ? v[0] ? n(v[0]) : /* @__PURE__ */ new Date() : v ? n(v) : /* @__PURE__ */ new Date();
     }
     function x(v) {
-      const Q = v === 0 ? /* @__PURE__ */ new Date() : ee();
-      P(a(u(Q, v)));
+      const S = v === 0 ? /* @__PURE__ */ new Date() : ee();
+      P(a(u(S, v)));
     }
     function K(v) {
       if (v === 0) {
@@ -1987,21 +1987,21 @@ const yr = /* @__PURE__ */ N({
         P([a(h(Je)), a(y(Je))]);
         return;
       }
-      const Q = S.value, p = n(Q[0]), Y = n(Q[1]);
+      const S = Q.value, p = n(S[0]), Y = n(S[1]);
       P([a(u(p, v)), a(u(Y, v))]);
     }
     function ae(v) {
       if (v === 0) {
-        const Q = /* @__PURE__ */ new Date();
-        P(a(new Date(Q.getFullYear(), Q.getMonth(), 1)));
+        const S = /* @__PURE__ */ new Date();
+        P(a(new Date(S.getFullYear(), S.getMonth(), 1)));
         return;
       }
       P(a(i(ee(), v)));
     }
     function J(v) {
       if (v === 0) {
-        const Q = /* @__PURE__ */ new Date();
-        P(a(new Date(Q.getFullYear(), 0, 1)));
+        const S = /* @__PURE__ */ new Date();
+        P(a(new Date(S.getFullYear(), 0, 1)));
         return;
       }
       P(a(A(ee(), v)));
@@ -2070,7 +2070,7 @@ const yr = /* @__PURE__ */ N({
           break;
       }
     }
-    return (v, Q) => (f(), w("div", Dr, [
+    return (v, S) => (f(), w("div", Dr, [
       D("div", jr, [
         E.value ? (f(), z(l(F), {
           key: 0,
@@ -2079,8 +2079,8 @@ const yr = /* @__PURE__ */ N({
           onClick: R
         }, null, 8, ["icon", "size"])) : U("", !0),
         b(l(ta), {
-          modelValue: S.value,
-          "onUpdate:modelValue": Q[0] || (Q[0] = (p) => S.value = p),
+          modelValue: Q.value,
+          "onUpdate:modelValue": S[0] || (S[0] = (p) => Q.value = p),
           type: s.value,
           placeholder: e.placeholder,
           "start-placeholder": e.startPlaceholder,
@@ -2118,11 +2118,10 @@ const yr = /* @__PURE__ */ N({
       e.showTypeSwitcher ? (f(), w("div", Pr, [
         e.switcherStyle === "select" ? (f(), z(l(Qt), {
           key: 0,
-          modelValue: c.value,
-          "onUpdate:modelValue": Q[1] || (Q[1] = (p) => c.value = p),
+          "model-value": c.value,
           size: e.size,
           style: { width: "120px" },
-          onChange: Q[2] || (Q[2] = (p) => X(p))
+          onChange: S[1] || (S[1] = (p) => X(p))
         }, {
           default: m(() => [
             (f(!0), w(O, null, Z(k.value, (p) => (f(), z(l(St), {
@@ -2132,7 +2131,7 @@ const yr = /* @__PURE__ */ N({
             }, null, 8, ["label", "value"]))), 128))
           ]),
           _: 1
-        }, 8, ["modelValue", "size"])) : (f(), z(l(Ye), { key: 1 }, {
+        }, 8, ["model-value", "size"])) : (f(), z(l(Ye), { key: 1 }, {
           default: m(() => [
             (f(!0), w(O, null, Z(k.value, (p) => (f(), z(l(F), {
               key: p.value,
@@ -2151,7 +2150,7 @@ const yr = /* @__PURE__ */ N({
       ])) : U("", !0)
     ]));
   }
-}), qr = /* @__PURE__ */ te(Br, [["__scopeId", "data-v-4663860e"]]);
+}), qr = /* @__PURE__ */ te(Br, [["__scopeId", "data-v-66564241"]]);
 export {
   Hr as GlobalSetting,
   qr as JnDateQuery,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jnrs/vue-core",
-  "version": "1.2.30",
+  "version": "1.2.32",
   "description": "巨能（JNRS）前端工程化开发，Vue 专用核心功能包。",
   "keywords": [
     "jnrs",