sard-uniapp 1.11.0 → 1.11.2

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [1.11.2](https://github.com/sutras/sard-uniapp/compare/v1.11.1...v1.11.2) (2025-03-06)
+
+
+### Bug Fixes
+
+* 修复tree组件递归引用问题 ([25c48b7](https://github.com/sutras/sard-uniapp/commit/25c48b7d57fd178ea9a08688757da41b1394d297))
+
+
+
+## [1.11.1](https://github.com/sutras/sard-uniapp/compare/v1.11.0...v1.11.1) (2025-03-06)
+
+
+### Bug Fixes
+
+* 修复日期时间选择器min, max联动问题 ([81d9256](https://github.com/sutras/sard-uniapp/commit/81d9256c872b5711664abf1e8ff75de3b146f3da))
+
+
+
 # [1.11.0](https://github.com/sutras/sard-uniapp/compare/v1.10.4...v1.11.0) (2025-03-04)
 
 

package/README.md

@@ -114,7 +114,8 @@ npm run release
 - 修复问题
 - 测试
 - 修改版本号
-- 暂存、提交 `git commit -a -m 'fix: '`
+- 暂存 `git add .`
+- 提交 `git commit -m 'fix: '`
 - 给提交打标签 `npm run tag`
 - 生成 changelog `npm run changelog`
 - 暂存、提交 changelog `git commit -a -m 'chore: changelog'`

package/components/datetime-picker-input/datetime-picker-input.vue

@@ -12,6 +12,7 @@
   <sar-popout
     :root-class="rootClass"
     :root-style="rootStyle"
+    keep-render
     :visible="innerVisible"
     @update:visible="onVisible"
     :title="title ?? placeholder"
@@ -116,6 +117,20 @@ export default  _defineComponent({
       const maxDate2 = toDate(props.max || getMaxDate());
       return maxDate2 < minDate.value ? new Date(minDate.value) : maxDate2;
     });
+    const normalizeValue = (value) => {
+      const date = value ? toDate(value, props.valueFormat) :  new Date();
+      return date < minDate.value ? new Date(minDate.value) : date > maxDate.value ? new Date(maxDate.value) : date;
+    };
+    watch([minDate, maxDate], () => {
+      if (innerValue.value) {
+        const oldDate = toDate(innerValue.value, props.valueFormat);
+        const value = normalizeValue(innerValue.value);
+        if (value.getTime() !== oldDate.getTime()) {
+          popoutValue.value = value;
+          onConfirm();
+        }
+      }
+    });
     const onConfirm = () => {
       if (!popoutValue.value) {
         const initialValue = getInitialValue(minDate.value, maxDate.value);
@@ -175,7 +190,7 @@ export default  _defineComponent({
       innerVisible.value = true;
       emit("update:visible", true);
     };
-    const __returned__ = { props, emit, formItemContext, innerValue, popoutValue, onChange, onVisibleHook, minDate, maxDate, onConfirm, inputValue, getOutletText, getInputValue, onClear, innerVisible, onVisible, onInputClick, SarPopoutInput, SarPopout, SarDatetimePicker };
+    const __returned__ = { props, emit, formItemContext, innerValue, popoutValue, onChange, onVisibleHook, minDate, maxDate, normalizeValue, onConfirm, inputValue, getOutletText, getInputValue, onClear, innerVisible, onVisible, onInputClick, SarPopoutInput, SarPopout, SarDatetimePicker };
     return __returned__;
   }
 });

package/components/datetime-range-picker-input/datetime-range-picker-input.vue

@@ -12,6 +12,7 @@
   <sar-popout
     :root-class="rootClass"
     :root-style="rootStyle"
+    keep-render
     :visible="innerVisible"
     @update:visible="onVisible"
     :title="title ?? placeholder"

package/components/picker-input/picker-input.vue

@@ -12,6 +12,7 @@
   <sar-popout
     :root-class="rootClass"
     :root-style="rootStyle"
+    keep-render
     :visible="innerVisible"
     @update:visible="onVisible"
     :title="title ?? placeholder"

package/components/popout/common.d.ts

@@ -16,6 +16,7 @@ export interface PopoutProps {
     showFooter?: boolean;
     overlayClosable?: boolean;
     beforeClose?: (type: 'close' | 'cancel' | 'confirm') => boolean | undefined | Promise<any>;
+    keepRender?: boolean;
 }
 export declare const defaultPopoutProps: {
     type: PopoutProps["type"];

package/components/popout/popout.vue

@@ -3,6 +3,7 @@
     effect="slide-bottom"
     :visible="visible"
     :duration="duration"
+    :keep-render="keepRender"
     @overlay-click="onOverlayClick"
     @before-enter="onBeforeEnter"
     @after-leave="onAfterLeave"
@@ -126,7 +127,8 @@ export default  _defineComponent({
     showClose: { type: Boolean, required: false },
     showFooter: { type: Boolean, required: false },
     overlayClosable: { type: Boolean, required: false },
-    beforeClose: { type: Function, required: false }
+    beforeClose: { type: Function, required: false },
+    keepRender: { type: Boolean, required: false }
   }, defaultPopoutProps),
   emits: ["update:visible", "close", "cancel", "confirm", "visible-hook"],
   setup(__props, { expose: __expose, emit: __emit }) {

package/components/popup/common.d.ts

@@ -11,6 +11,7 @@ export interface PopupProps {
     overlayStyle?: string;
     background?: string;
     transparent?: boolean;
+    keepRender?: boolean;
 }
 export declare const defaultPopupProps: {
     duration: number;

package/components/popup/index.scss

@@ -76,19 +76,39 @@
     }
 
     // slide
-    @include m(slide-top-enter-from, slide-top-leave-to) {
+    @include m(
+      slide-top-enter-from,
+      slide-top-leave-to,
+      slide-top-keep,
+      slide-top-after-leave-keep
+    ) {
       transform: translate3d(0, -100%, 0);
     }
 
-    @include m(slide-right-enter-from, slide-right-leave-to) {
+    @include m(
+      slide-right-enter-from,
+      slide-right-leave-to,
+      slide-right-keep,
+      slide-right-after-leave-keep
+    ) {
       transform: translate3d(100%, 0, 0);
     }
 
-    @include m(slide-bottom-enter-from, slide-bottom-leave-to) {
+    @include m(
+      slide-bottom-enter-from,
+      slide-bottom-leave-to,
+      slide-bottom-keep,
+      slide-bottom-after-leave-keep
+    ) {
       transform: translate3d(0, 100%, 0);
     }
 
-    @include m(slide-left-enter-from, slide-left-leave-to) {
+    @include m(
+      slide-left-enter-from,
+      slide-left-leave-to,
+      slide-left-keep,
+      slide-left-after-leave-keep
+    ) {
       transform: translate3d(-100%, 0, 0);
     }
 

package/components/popup/popup.vue

@@ -21,7 +21,7 @@
 
 <script>
 import { mergeDefaults as _mergeDefaults, defineComponent as _defineComponent } from "vue";
-import { computed, reactive, toRef } from "vue";
+import { computed, reactive, ref, toRef } from "vue";
 import { classNames, stringifyStyle, createBem } from "../../utils";
 import { useTransition, useZIndex } from "../../use";
 import SarOverlay from "../overlay/overlay.vue";
@@ -50,7 +50,8 @@ export default  _defineComponent({
     overlayClass: { type: String, required: false },
     overlayStyle: { type: String, required: false },
     background: { type: String, required: false },
-    transparent: { type: Boolean, required: false }
+    transparent: { type: Boolean, required: false },
+    keepRender: { type: Boolean, required: false }
   }, defaultPopupProps),
   emits: ["overlay-click", "before-enter", "enter", "after-enter", "enter-cancelled", "before-leave", "leave", "after-leave", "leave-cancelled", "visible-hook"],
   setup(__props, { expose: __expose, emit: __emit }) {
@@ -60,6 +61,9 @@ export default  _defineComponent({
     const bem = createBem("popup");
     const [zIndex, increaseZIndex] = useZIndex();
     const callVisibleHook = usePopupVisibleHookProvide();
+    const keepRenderClass = ref(
+      props.keepRender ? bem.m(props.effect) + "-keep" : ""
+    );
     const onVisibleHook = (name) => {
       callVisibleHook(name);
       emit("visible-hook", name);
@@ -67,6 +71,9 @@ export default  _defineComponent({
       if (name === "before-enter") {
         increaseZIndex();
       }
+      if (props.keepRender) {
+        keepRenderClass.value = name === "after-leave" ? bem.m(props.effect) + "-" + name + "-keep" : "";
+      }
     };
     const { realVisible, transitionClass, onTransitionEnd } = useTransition(
       reactive({
@@ -84,17 +91,18 @@ export default  _defineComponent({
         bem.b(),
         bem.m(props.effect),
         props.rootClass,
-        transitionClass.value
+        transitionClass.value,
+        keepRenderClass.value
       );
     });
     const popupStyle = computed(() => {
       return stringifyStyle(props.rootStyle, {
         zIndex: zIndex.value,
-        display: realVisible.value ? "flex" : "none",
+        display: props.keepRender || realVisible.value ? "flex" : "none",
         transitionDuration: props.duration + "ms"
       });
     });
-    const __returned__ = { props, emit, bem, zIndex, increaseZIndex, callVisibleHook, onVisibleHook, realVisible, transitionClass, onTransitionEnd, onOverlayClick, popupClass, popupStyle, SarOverlay };
+    const __returned__ = { props, emit, bem, zIndex, increaseZIndex, callVisibleHook, keepRenderClass, onVisibleHook, realVisible, transitionClass, onTransitionEnd, onOverlayClick, popupClass, popupStyle, SarOverlay };
     return __returned__;
   }
 });

package/components/tree/tree.vue

@@ -1,6 +1,8 @@
 <template>
   <view :class="treeClass" :style="treeStyle">
-    <sar-tree-branch :nodes="treeData" />
+    <template v-for="(node, index) of treeData" :key="node.key">
+      <sar-tree-node v-if="node.visible" :index="index" :node="node" />
+    </template>
   </view>
 
   <sar-popover
@@ -45,7 +47,7 @@ import {
   treeContextSymbol,
   defaultTreeProps
 } from "./common";
-import SarTreeBranch from "../tree-branch/tree-branch.vue";
+import SarTreeNode from "../tree-node/tree-node.vue";
 import SarPopover from "../popover/popover.vue";
 import { usePopover } from "../popover";
 import SarInput from "../input/input.vue";
@@ -55,7 +57,7 @@ import { useTranslate } from "../locale";
 import { recurAncestor, recurDescendant, recurNodes } from "./utils";
 export default  _defineComponent({
   components: {
-    SarTreeBranch,
+    SarTreeNode,
     SarPopover,
     SarInput,
     SarDialog,
@@ -552,7 +554,7 @@ export default  _defineComponent({
       return currentEditNode;
     }, set currentEditNode(v) {
       currentEditNode = v;
-    }, currentEditType, currentEditValue, mapEditTypeTitle, currentEditTitle, dialogVisible, toastVisible, onPopoverSelect, beforeClose, edit, focused, onVisibleHook, defaultFilterMethod, filter, treeClass, treeStyle, SarTreeBranch, SarPopover, SarInput, SarDialog, SarToast };
+    }, currentEditType, currentEditValue, mapEditTypeTitle, currentEditTitle, dialogVisible, toastVisible, onPopoverSelect, beforeClose, edit, focused, onVisibleHook, defaultFilterMethod, filter, treeClass, treeStyle, SarTreeNode, SarPopover, SarInput, SarDialog, SarToast };
     return __returned__;
   }
 });

package/components/tree-node/tree-node.vue

@@ -68,10 +68,13 @@
     </view>
   </view>
 
-  <sar-tree-branch
-    v-if="!isLeaf && node.expanded"
-    :nodes="node.children || []"
-  />
+  <template
+    v-if="!isLeaf && node.expanded && node.children && node.children.length > 0"
+  >
+    <template v-for="(node, index) of node.children" :key="node.key">
+      <sar-tree-node v-if="node.visible" :index="index" :node="node" />
+    </template>
+  </template>
 
   <sar-popover
     v-if="treeContext.draggable"
@@ -99,7 +102,6 @@ import {
   treeContextSymbol
 } from "../tree/common";
 import { useMouseDown, useSimulatedClick, useSimulatedPress } from "../../use";
-import SarTreeBranch from "../tree-branch/tree-branch.vue";
 import SarIcon from "../icon/icon.vue";
 import SarCheckbox from "../checkbox/checkbox.vue";
 import SarPopover from "../popover/popover.vue";
@@ -107,12 +109,12 @@ import { usePopover } from "../popover";
 import { getNodeLevel, recurDescendant } from "../tree/utils";
 export default  _defineComponent({
   components: {
-    SarTreeBranch,
     SarIcon,
     SarCheckbox,
     SarPopover,
   },
   ...{
+    name: "SarTreeNode",
     options: {
       virtualHost: true,
       styleIsolation: "shared"
@@ -353,7 +355,7 @@ export default  _defineComponent({
       return obviousNodes;
     }, set obviousNodes(v) {
       obviousNodes = v;
-    }, onDragStart, onDragMove, onDragEnd, onDragSimulatedClickTouchStart, onDragSimulatedClickTouchEnd, onDragSimulatedPressTouchStart, onDragSimulatedPressTouchMove, onDragSimulatedPressTouchEnd, onDragTouchStart, onDragTouchMove, onDragTouchEnd, onDragMouseDown, dragId, popover, isLastNode, popoverOptions, onPopoverSelect, isLeaf, onNodeClick, nodeActive, onNodeTouchStart, onNodeTouchEnd, onNodeMouseDown, onSelectionTouchStart, onSelectionTouchEnd, onSelectionMouseDown, editId, getEditRect, onEditTouchStart, onEditTouchEnd, onEditMouseDown, nodeClass, nodeStyle, editClass, indentStyle, arrowClass, selectionClass, SarTreeBranch, SarIcon, SarCheckbox, SarPopover };
+    }, onDragStart, onDragMove, onDragEnd, onDragSimulatedClickTouchStart, onDragSimulatedClickTouchEnd, onDragSimulatedPressTouchStart, onDragSimulatedPressTouchMove, onDragSimulatedPressTouchEnd, onDragTouchStart, onDragTouchMove, onDragTouchEnd, onDragMouseDown, dragId, popover, isLastNode, popoverOptions, onPopoverSelect, isLeaf, onNodeClick, nodeActive, onNodeTouchStart, onNodeTouchEnd, onNodeMouseDown, onSelectionTouchStart, onSelectionTouchEnd, onSelectionMouseDown, editId, getEditRect, onEditTouchStart, onEditTouchEnd, onEditMouseDown, nodeClass, nodeStyle, editClass, indentStyle, arrowClass, selectionClass, SarIcon, SarCheckbox, SarPopover };
     return __returned__;
   }
 });

package/package.json

@@ -2,7 +2,7 @@
   "id": "sard-uniapp",
   "name": "sard-uniapp",
   "displayName": "sard-uniapp",
-  "version": "1.11.0",
+  "version": "1.11.2",
   "description": "sard-uniapp 是一套基于 Uniapp + Vue3 框架开发的兼容多端的 UI 组件库",
   "main": "index.js",
   "scripts": {