@sdata/web-vue 1.10.0 → 1.11.1

package/es/tree/tree.vue_vue_type_script_lang.js

@@ -11,7 +11,7 @@ import useCheckedState from "./hooks/use-checked-state.js";
 import { isLeafNode, isNodeExpandable, isNodeSelectable } from "./utils/index.js";
 import useTreeData from "./hooks/use-tree-data.js";
 import node_default from "./node.js";
-import { computed, defineComponent, provide, reactive, ref, toRefs } from "vue";
+import { computed, defineComponent, provide, reactive, ref, toRefs, watch } from "vue";
 //#region components/tree/tree.vue?vue&type=script&lang.ts
 var TREE_VIRTUAL_ITEM_SIZE = {
 	mini: 24,
@@ -120,10 +120,6 @@ var tree_vue_vue_type_script_lang_default = defineComponent({
 			},
 			`${prefixCls}-size-${size.value}`
 		]);
-		const isDynamicVirtualList = computed(() => {
-			if (!virtualListProps.value) return false;
-			return virtualListProps.value.itemSize === void 0 && virtualListProps.value.minItemSize !== void 0;
-		});
 		const resolvedVirtualListProps = computed(() => {
 			if (!virtualListProps.value) return;
 			const nextVirtualListProps = _objectSpread2({}, virtualListProps.value);
@@ -133,7 +129,7 @@ var tree_vue_vue_type_script_lang_default = defineComponent({
 		});
 		const enableVirtualExpandAnimation = computed(() => {
 			if (!virtualListProps.value) return animation.value;
-			return animation.value && isDynamicVirtualList.value;
+			return false;
 		});
 		const treeStyle = computed(() => {
 			if (!virtualListProps.value || virtualListProps.value.height !== void 0) return;
@@ -142,6 +138,9 @@ var tree_vue_vue_type_script_lang_default = defineComponent({
 				minHeight: 0
 			};
 		});
+		const virtualListRef = ref(null);
+		const virtualListVersion = ref(0);
+		const virtualListKey = computed(() => `tree-virtual-list-${virtualListVersion.value}`);
 		const switcherIcon = usePickSlots(slots, "switcher-icon");
 		const loadingIcon = usePickSlots(slots, "loading-icon");
 		const dragIcon = usePickSlots(slots, "drag-icon");
@@ -197,17 +196,29 @@ var tree_vue_vue_type_script_lang_default = defineComponent({
 			return [];
 		}
 		const [expandedKeys, setExpandState] = useMergeState(getDefaultExpandedKeys(), reactive({ value: propExpandedKeys }));
+		watch(() => expandedKeys.value.join(","), () => {
+			if (!virtualListProps.value || enableVirtualExpandAnimation.value) return;
+			virtualListVersion.value += 1;
+		});
 		const currentExpandKeys = ref([]);
 		const visibleTreeNodeList = computed(() => {
 			const expandedKeysSet = new Set(expandedKeys.value);
 			const currentExpandKeysSet = new Set(currentExpandKeys.value);
-			return flattenTreeData.value.filter((node) => {
+			const filteredNodeList = flattenTreeData.value.filter((node) => {
 				var _node$pathParentKeys;
 				if (!(!filterTreeNode || !filterTreeNode.value || (filterTreeNode === null || filterTreeNode === void 0 ? void 0 : filterTreeNode.value(node.treeNodeData)))) return false;
 				const isRoot = isUndefined(node.parentKey);
 				const isVisibleNode = (_node$pathParentKeys = node.pathParentKeys) === null || _node$pathParentKeys === void 0 ? void 0 : _node$pathParentKeys.every((_key) => expandedKeysSet.has(_key) && !currentExpandKeysSet.has(_key));
 				return isRoot || isVisibleNode;
 			});
+			const uniqueNodeList = [];
+			const seenNodeKeys = /* @__PURE__ */ new Set();
+			filteredNodeList.forEach((node) => {
+				if (seenNodeKeys.has(node.key)) return;
+				seenNodeKeys.add(node.key);
+				uniqueNodeList.push(node);
+			});
+			return uniqueNodeList;
 		});
 		function getPublicCheckedKeys(rawCheckedKeys, rawCheckedStrategy = checkedStrategy.value) {
 			let publicCheckedKeys = [...rawCheckedKeys];
@@ -392,7 +403,7 @@ var tree_vue_vue_type_script_lang_default = defineComponent({
 		}
 		function onExpandEnd(key) {
 			const index = currentExpandKeys.value.indexOf(key);
-			currentExpandKeys.value.splice(index, 1);
+			if (index > -1) currentExpandKeys.value.splice(index, 1);
 		}
 		const treeContext = reactive({
 			treeProps: props,
@@ -478,9 +489,10 @@ var tree_vue_vue_type_script_lang_default = defineComponent({
 			classNames,
 			treeStyle,
 			resolvedVirtualListProps,
+			virtualListKey,
 			visibleTreeNodeList,
 			treeContext,
-			virtualListRef: ref(),
+			virtualListRef,
 			computedSelectedKeys: selectedKeys,
 			computedExpandedKeys: expandedKeys,
 			computedCheckedKeys: checkedKeys,

package/es/tree-select/hooks/use-selected-state.js

@@ -58,9 +58,11 @@ function useSelectedState(props) {
 					if (fallbackResult === false) return;
 					if (isObject(fallbackResult)) fallbackNodeData = fallbackResult;
 				}
+				const fallbackLabel = fallbackNodeData === null || fallbackNodeData === void 0 ? void 0 : fallbackNodeData[nodeDataTitle];
+				const label = (_ref = (_ref2 = (_ref3 = (_ref4 = (_getLabel = getLabel(item)) !== null && _getLabel !== void 0 ? _getLabel : getPathLabel(key, node)) !== null && _ref4 !== void 0 ? _ref4 : typeof (node === null || node === void 0 ? void 0 : node.title) === "string" || typeof (node === null || node === void 0 ? void 0 : node.title) === "number" ? node.title : void 0) !== null && _ref3 !== void 0 ? _ref3 : originValueItem === null || originValueItem === void 0 ? void 0 : originValueItem.label) !== null && _ref2 !== void 0 ? _ref2 : typeof fallbackLabel === "string" || typeof fallbackLabel === "number" ? fallbackLabel : void 0) !== null && _ref !== void 0 ? _ref : key;
 				res.push(_objectSpread2(_objectSpread2(_objectSpread2({}, isLabelValue(item) ? item : {}), originValueItem), {}, {
 					value: key,
-					label: (_ref = (_ref2 = (_ref3 = (_ref4 = (_getLabel = getLabel(item)) !== null && _getLabel !== void 0 ? _getLabel : getPathLabel(key, node)) !== null && _ref4 !== void 0 ? _ref4 : node === null || node === void 0 ? void 0 : node.title) !== null && _ref3 !== void 0 ? _ref3 : originValueItem === null || originValueItem === void 0 ? void 0 : originValueItem.label) !== null && _ref2 !== void 0 ? _ref2 : fallbackNodeData === null || fallbackNodeData === void 0 ? void 0 : fallbackNodeData[nodeDataTitle]) !== null && _ref !== void 0 ? _ref : key
+					label
 				}));
 			});
 		}

package/es/tree-select/index.d.ts

@@ -1,5 +1,8 @@
 import type { SFCWithInstall } from '../_utils/types';
+import type { TreeSelectProps } from './interface';
 import _TreeSelect from './tree-select.vue';
+export type { ChangeHandler as TreeSelectChangeHandler, ClearHandler as TreeSelectClearHandler, FallbackOption as TreeSelectFallbackOption, FilterTreeNode as TreeSelectFilterTreeNode, LabelValue, PopupVisibleChangeHandler as TreeSelectPopupVisibleChangeHandler, SearchHandler as TreeSelectSearchHandler, TreeSelectProps, TreeSelectValue, } from './interface';
 declare const TreeSelect: SFCWithInstall<typeof _TreeSelect>;
 export type TreeSelectInstance = InstanceType<typeof _TreeSelect>;
+export type TreeSelectLoadMore = NonNullable<TreeSelectProps['loadMore']>;
 export default TreeSelect;