@sdata/web-vue 1.8.0 → 1.10.0

package/es/cascader/cascader-panel.vue.d.ts

@@ -1,6 +1,5 @@
 import { PropType } from 'vue';
-import { Data } from '../_utils/types';
-import { CascaderFieldNames, CascaderOption, CascaderOptionInfo } from './interface';
+import { CascaderFieldNames, CascaderModelValue, CascaderOption, CascaderOptionInfo } from './interface';
 declare const _default: typeof __VLS_export;
 export default _default;
 declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
@@ -13,11 +12,17 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         default: boolean;
     };
     modelValue: {
-        type: PropType<string | number | Record<string, any> | (string | number | Record<string, any> | (string | number | Record<string, any>)[])[] | undefined>;
+        type: PropType<CascaderModelValue>;
+    };
+    value: {
+        type: PropType<CascaderModelValue>;
     };
     defaultValue: {
-        type: PropType<string | number | Record<string, any> | (string | number | Record<string, any> | (string | number | Record<string, any>)[])[] | undefined>;
-        default: (props: Data) => "" | never[] | undefined;
+        type: PropType<CascaderModelValue>;
+        default: (props: {
+            multiple?: boolean;
+            pathMode?: boolean;
+        }) => CascaderModelValue;
     };
     options: {
         type: PropType<CascaderOption[]>;
@@ -47,13 +52,31 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
     };
 }>, {
     optionInfos: import("vue").Ref<{
-        [x: string]: any;
-        raw: Record<string, unknown>;
+        [x: string]: unknown;
+        raw: {
+            [x: string]: unknown;
+            value?: import("./interface").CascaderOptionValue | undefined;
+            label?: string | undefined;
+            disabled?: boolean | undefined;
+            tagProps?: {
+                color?: (import("..").TagColor | string) | undefined;
+                size?: "small" | "medium" | "large" | undefined;
+                visible?: boolean | undefined;
+                defaultVisible?: boolean | undefined;
+                loading?: boolean | undefined;
+                closable?: boolean | undefined;
+                checkable?: boolean | undefined;
+                checked?: boolean | undefined;
+                defaultChecked?: boolean | undefined;
+            } | undefined;
+            children?: any[] | undefined;
+            isLeaf?: boolean | undefined;
+        };
         key: string;
         valueKey: string;
         level: number;
         index: number;
-        value: string | number;
+        value: import("./interface").CascaderOptionValue;
         label: string;
         disabled: boolean;
         selectionDisabled: boolean;
@@ -61,9 +84,8 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         parent?: any | undefined;
         children?: any[] | undefined;
         path: any[];
-        pathValue: any[];
+        pathValue: import("./interface").CascaderOptionValue[];
         totalLeafOptions?: number | undefined;
-        render?: import("vue").RenderFunction | undefined;
         tagProps?: {
             color?: (import("..").TagColor | string) | undefined;
             size?: "small" | "medium" | "large" | undefined;
@@ -76,13 +98,31 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
             defaultChecked?: boolean | undefined;
         } | undefined;
     }[], CascaderOptionInfo[] | {
-        [x: string]: any;
-        raw: Record<string, unknown>;
+        [x: string]: unknown;
+        raw: {
+            [x: string]: unknown;
+            value?: import("./interface").CascaderOptionValue | undefined;
+            label?: string | undefined;
+            disabled?: boolean | undefined;
+            tagProps?: {
+                color?: (import("..").TagColor | string) | undefined;
+                size?: "small" | "medium" | "large" | undefined;
+                visible?: boolean | undefined;
+                defaultVisible?: boolean | undefined;
+                loading?: boolean | undefined;
+                closable?: boolean | undefined;
+                checkable?: boolean | undefined;
+                checked?: boolean | undefined;
+                defaultChecked?: boolean | undefined;
+            } | undefined;
+            children?: any[] | undefined;
+            isLeaf?: boolean | undefined;
+        };
         key: string;
         valueKey: string;
         level: number;
         index: number;
-        value: string | number;
+        value: import("./interface").CascaderOptionValue;
         label: string;
         disabled: boolean;
         selectionDisabled: boolean;
@@ -90,9 +130,8 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         parent?: any | undefined;
         children?: any[] | undefined;
         path: any[];
-        pathValue: any[];
+        pathValue: import("./interface").CascaderOptionValue[];
         totalLeafOptions?: number | undefined;
-        render?: import("vue").RenderFunction | undefined;
         tagProps?: {
             color?: (import("..").TagColor | string) | undefined;
             size?: "small" | "medium" | "large" | undefined;
@@ -106,13 +145,31 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         } | undefined;
     }[]>;
     filteredLeafOptions: import("vue").ComputedRef<{
-        [x: string]: any;
-        raw: Record<string, unknown>;
+        [x: string]: unknown;
+        raw: {
+            [x: string]: unknown;
+            value?: import("./interface").CascaderOptionValue | undefined;
+            label?: string | undefined;
+            disabled?: boolean | undefined;
+            tagProps?: {
+                color?: (import("..").TagColor | string) | undefined;
+                size?: "small" | "medium" | "large" | undefined;
+                visible?: boolean | undefined;
+                defaultVisible?: boolean | undefined;
+                loading?: boolean | undefined;
+                closable?: boolean | undefined;
+                checkable?: boolean | undefined;
+                checked?: boolean | undefined;
+                defaultChecked?: boolean | undefined;
+            } | undefined;
+            children?: any[] | undefined;
+            isLeaf?: boolean | undefined;
+        };
         key: string;
         valueKey: string;
         level: number;
         index: number;
-        value: string | number;
+        value: import("./interface").CascaderOptionValue;
         label: string;
         disabled: boolean;
         selectionDisabled: boolean;
@@ -120,9 +177,8 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         parent?: any | undefined;
         children?: any[] | undefined;
         path: any[];
-        pathValue: any[];
+        pathValue: import("./interface").CascaderOptionValue[];
         totalLeafOptions?: number | undefined;
-        render?: import("vue").RenderFunction | undefined;
         tagProps?: {
             color?: (import("..").TagColor | string) | undefined;
             size?: "small" | "medium" | "large" | undefined;
@@ -141,8 +197,9 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
     handleKeyDown: (event: KeyboardEvent) => void;
     totalLevel: import("vue").Ref<number, number>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    'update:modelValue': (_value: string | number | Record<string, any> | (string | number | Record<string, any> | (string | number | Record<string, any>)[])[] | undefined) => true;
-    change: (_value: string | number | Record<string, any> | (string | number | Record<string, any> | (string | number | Record<string, any>)[])[] | undefined) => true;
+    'update:modelValue': (_value: CascaderModelValue) => true;
+    'update:value': (_value: CascaderModelValue) => true;
+    change: (_value: CascaderModelValue) => true;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     pathMode: {
         type: BooleanConstructor;
@@ -153,11 +210,17 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         default: boolean;
     };
     modelValue: {
-        type: PropType<string | number | Record<string, any> | (string | number | Record<string, any> | (string | number | Record<string, any>)[])[] | undefined>;
+        type: PropType<CascaderModelValue>;
+    };
+    value: {
+        type: PropType<CascaderModelValue>;
     };
     defaultValue: {
-        type: PropType<string | number | Record<string, any> | (string | number | Record<string, any> | (string | number | Record<string, any>)[])[] | undefined>;
-        default: (props: Data) => "" | never[] | undefined;
+        type: PropType<CascaderModelValue>;
+        default: (props: {
+            multiple?: boolean;
+            pathMode?: boolean;
+        }) => CascaderModelValue;
     };
     options: {
         type: PropType<CascaderOption[]>;
@@ -186,17 +249,18 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         default: boolean;
     };
 }>> & Readonly<{
-    onChange?: ((_value: string | number | Record<string, any> | (string | number | Record<string, any> | (string | number | Record<string, any>)[])[] | undefined) => any) | undefined;
-    "onUpdate:modelValue"?: ((_value: string | number | Record<string, any> | (string | number | Record<string, any> | (string | number | Record<string, any>)[])[] | undefined) => any) | undefined;
+    onChange?: ((_value: CascaderModelValue) => any) | undefined;
+    "onUpdate:modelValue"?: ((_value: CascaderModelValue) => any) | undefined;
+    "onUpdate:value"?: ((_value: CascaderModelValue) => any) | undefined;
 }>, {
-    defaultValue: string | number | Record<string, any> | (string | number | Record<string, any> | (string | number | Record<string, any>)[])[] | undefined;
+    defaultValue: CascaderModelValue;
     options: CascaderOption[];
     valueKey: string;
     multiple: boolean;
+    expandTrigger: string;
     checkStrictly: boolean;
     pathMode: boolean;
     expandChild: boolean;
-    expandTrigger: string;
 }, {}, {
     BaseCascaderPanel: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
         displayColumns: {
@@ -217,7 +281,7 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         loading: BooleanConstructor;
         dropdown: BooleanConstructor;
         virtualListProps: {
-            type: PropType<import("../_components/virtual-list-v2/interface").VirtualListProps>;
+            type: PropType<import("../_components/virtual-list/interface").VirtualListProps>;
         };
     }>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
         displayColumns: {
@@ -238,7 +302,7 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         loading: BooleanConstructor;
         dropdown: BooleanConstructor;
         virtualListProps: {
-            type: PropType<import("../_components/virtual-list-v2/interface").VirtualListProps>;
+            type: PropType<import("../_components/virtual-list/interface").VirtualListProps>;
         };
     }>> & Readonly<{}>, {
         loading: boolean;

package/es/cascader/cascader-panel.vue_vue_type_script_lang.js

@@ -7,6 +7,11 @@ import base_cascader_panel_default from "./base-cascader-panel.js";
 import { useSelectedPath } from "./hooks/use-selected-path.js";
 import { computed, defineComponent, provide, reactive, ref, toRefs, watch } from "vue";
 //#region components/cascader/cascader-panel.vue?vue&type=script&lang.ts
+var getDefaultValue = (multiple, pathMode) => {
+	if (multiple) return [];
+	if (pathMode) return;
+	return "";
+};
 var cascader_panel_vue_vue_type_script_lang_default = defineComponent({
 	name: "CascaderPanel",
 	components: { BaseCascaderPanel: base_cascader_panel_default },
@@ -22,15 +27,23 @@ var cascader_panel_vue_vue_type_script_lang_default = defineComponent({
 		modelValue: { type: [
 			String,
 			Number,
+			Object,
+			Array
+		] },
+		value: { type: [
+			String,
+			Number,
+			Object,
 			Array
 		] },
 		defaultValue: {
 			type: [
 				String,
 				Number,
+				Object,
 				Array
 			],
-			default: (props) => props.multiple ? [] : props.pathMode ? void 0 : ""
+			default: (props) => getDefaultValue(Boolean(props.multiple), Boolean(props.pathMode))
 		},
 		options: {
 			type: Array,
@@ -57,13 +70,15 @@ var cascader_panel_vue_vue_type_script_lang_default = defineComponent({
 	},
 	emits: {
 		"update:modelValue": (_value) => true,
+		"update:value": (_value) => true,
 		"change": (_value) => true
 	},
 	setup(props, { emit, slots }) {
-		const { options, checkStrictly, loadMore, modelValue, valueKey, expandChild, expandTrigger } = toRefs(props);
+		const { options, checkStrictly, loadMore, modelValue, value: valueProp, valueKey, expandChild, expandTrigger } = toRefs(props);
 		const _value = ref(props.defaultValue);
-		watch(modelValue, (value) => {
-			if (isUndefined(value) || isNull(value)) _value.value = props.multiple ? [] : void 0;
+		watch([modelValue, valueProp], ([nextModelValue, nextValue]) => {
+			const mergedValue = nextModelValue !== null && nextModelValue !== void 0 ? nextModelValue : nextValue;
+			if (isUndefined(mergedValue) || isNull(mergedValue)) _value.value = getDefaultValue(props.multiple, props.pathMode);
 		});
 		const optionInfos = ref([]);
 		const totalLevel = ref(1);
@@ -81,7 +96,6 @@ var cascader_panel_vue_vue_type_script_lang_default = defineComponent({
 			disabled: "disabled",
 			children: "children",
 			tagProps: "tagProps",
-			render: "render",
 			isLeaf: "isLeaf"
 		};
 		watch([
@@ -107,8 +121,8 @@ var cascader_panel_vue_vue_type_script_lang_default = defineComponent({
 			});
 		}, { immediate: true });
 		const computedValueMap = computed(() => {
-			var _props$modelValue;
-			const values = getValidValues((_props$modelValue = props.modelValue) !== null && _props$modelValue !== void 0 ? _props$modelValue : _value.value, {
+			var _ref, _props$modelValue;
+			const values = getValidValues((_ref = (_props$modelValue = props.modelValue) !== null && _props$modelValue !== void 0 ? _props$modelValue : props.value) !== null && _ref !== void 0 ? _ref : _value.value, {
 				multiple: props.multiple,
 				pathMode: props.pathMode
 			});
@@ -127,6 +141,7 @@ var cascader_panel_vue_vue_type_script_lang_default = defineComponent({
 			}
 			_value.value = value;
 			emit("update:modelValue", value);
+			emit("update:value", value);
 			emit("change", value);
 		};
 		const selectSingle = (option) => {
@@ -164,7 +179,7 @@ var cascader_panel_vue_vue_type_script_lang_default = defineComponent({
 			addLazyLoadOptions,
 			slots,
 			valueMap: computedValueMap,
-			expandTrigger
+			expandTrigger: expandTrigger.value
 		}));
 		return {
 			optionInfos,

package/es/cascader/cascader.js

@@ -18,7 +18,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
 		"auto-fit-popup-width": _ctx.showSearchPanel,
 		"popup-container": _ctx.popupContainer,
 		"prevent-focus": true,
-		"click-to-close": !_ctx.allowSearch,
+		"click-to-close": !Boolean(_ctx.mergedAllowSearch),
 		onPopupVisibleChange: _ctx.handlePopupVisibleChange
 	}), {
 		content: withCtx(() => [_ctx.showSearchPanel ? (openBlock(), createBlock(_component_cascader_search_panel, {
@@ -49,7 +49,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
 			"total-level": _ctx.totalLevel,
 			"check-strictly": _ctx.checkStrictly,
 			loading: _ctx.loading,
-			"virtual-list-props": _ctx.virtualListProps,
+			"virtual-list-props": _ctx.resolvedVirtualListProps,
 			dropdown: ""
 		}, createSlots({ _: 2 }, [_ctx.$slots.empty ? {
 			name: "empty",
@@ -72,7 +72,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
 			error: _ctx.error,
 			multiple: _ctx.multiple,
 			"allow-clear": _ctx.mergedAllowClear,
-			"allow-search": _ctx.allowSearch,
+			"allow-search": Boolean(_ctx.mergedAllowSearch),
 			size: _ctx.size,
 			opened: _ctx.computedPopupVisible,
 			placeholder: _ctx.placeholder,