vxe-pc-ui 4.11.43 → 4.11.45

package/es/pulldown/src/pulldown.js

@@ -14,6 +14,10 @@ export default defineVxeComponent({
             type: String,
             default: getConfig().pulldown.trigger
         },
+        /**
+         * 已废弃，请使用 popupConfig.zIndex
+         * @deprecated
+         */
         zIndex: Number,
         size: {
             type: String,
@@ -24,8 +28,13 @@ export default defineVxeComponent({
             type: [String, Function],
             default: getConfig().pulldown.className
         },
+        /**
+         * 已废弃，请使用 popupConfig.className
+         * @deprecated
+         */
         popupClassName: [String, Function],
         showPopupShadow: Boolean,
+        popupConfig: Object,
         destroyOnClose: {
             type: Boolean,
             default: getConfig().pulldown.destroyOnClose
@@ -68,6 +77,10 @@ export default defineVxeComponent({
         const refPulldownPanel = ref();
         const computeBtnTransfer = computed(() => {
             const { transfer } = props;
+            const popupOpts = computePopupOpts.value;
+            if (XEUtils.isBoolean(popupOpts.transfer)) {
+                return popupOpts.transfer;
+            }
             if (transfer === null) {
                 const globalTransfer = getConfig().pulldown.transfer;
                 if (XEUtils.isBoolean(globalTransfer)) {
@@ -79,6 +92,9 @@ export default defineVxeComponent({
             }
             return transfer;
         });
+        const computePopupOpts = computed(() => {
+            return Object.assign({}, getConfig().pulldown.popupConfig, props.popupConfig);
+        });
         const refMaps = {
             refElem
         };
@@ -92,9 +108,10 @@ export default defineVxeComponent({
         };
         let pulldownMethods = {};
         const updateZindex = () => {
-            const { zIndex } = props;
-            if (zIndex) {
-                reactData.panelIndex = zIndex;
+            const popupOpts = computePopupOpts.value;
+            const customZIndex = popupOpts.zIndex || props.zIndex;
+            if (customZIndex) {
+                reactData.panelIndex = XEUtils.toNumber(customZIndex);
             }
             else if (reactData.panelIndex < getLastZIndex()) {
                 reactData.panelIndex = nextZIndex();
@@ -112,9 +129,10 @@ export default defineVxeComponent({
             const targetElem = refPulldownContent.value;
             const panelElem = refPulldownPanel.value;
             const btnTransfer = computeBtnTransfer.value;
+            const popupOpts = computePopupOpts.value;
             const handleStyle = () => {
                 const ppObj = updatePanelPlacement(targetElem, panelElem, {
-                    placement,
+                    placement: popupOpts.placement || placement,
                     teleportTo: btnTransfer
                 });
                 const panelStyle = Object.assign(ppObj.style, {
@@ -309,14 +327,16 @@ export default defineVxeComponent({
                 : []);
         };
         const renderVN = () => {
-            const { className, options, popupClassName, showPopupShadow, destroyOnClose, disabled } = props;
+            const { className, options, showPopupShadow, destroyOnClose, disabled } = props;
             const { initialized, isActivated, isAniVisible, visiblePanel, panelStyle, panelPlacement } = reactData;
             const btnTransfer = computeBtnTransfer.value;
             const vSize = computeSize.value;
+            const popupOpts = computePopupOpts.value;
             const defaultSlot = slots.default;
             const headerSlot = slots.header;
             const footerSlot = slots.footer;
             const dropdownSlot = slots.dropdown;
+            const ppClassName = popupOpts.className || props.popupClassName;
             return h('div', {
                 ref: refElem,
                 class: ['vxe-pulldown', className ? (XEUtils.isFunction(className) ? className({ $pulldown: $xePulldown }) : className) : '', {
@@ -337,7 +357,7 @@ export default defineVxeComponent({
                 }, [
                     h('div', {
                         ref: refPulldownPanel,
-                        class: ['vxe-table--ignore-clear vxe-pulldown--panel', popupClassName ? (XEUtils.isFunction(popupClassName) ? popupClassName({ $pulldown: $xePulldown }) : popupClassName) : '', {
+                        class: ['vxe-table--ignore-clear vxe-pulldown--panel', ppClassName ? (XEUtils.isFunction(ppClassName) ? ppClassName({ $pulldown: $xePulldown }) : ppClassName) : '', {
                                 [`size--${vSize}`]: vSize,
                                 'is--transfer': btnTransfer,
                                 'ani--leave': isAniVisible,

package/es/select/src/select.js

@@ -71,18 +71,31 @@ export default defineVxeComponent({
         optionGroupProps: Object,
         optionConfig: Object,
         className: [String, Function],
+        /**
+         * 已废弃，请使用 popupConfig.className
+         * @deprecated
+         */
         popupClassName: [String, Function],
         max: {
             type: [String, Number],
             default: null
         },
+        /**
+         * 已废弃，请使用 popupConfig.zIndex
+         * @deprecated
+         */
         zIndex: Number,
         size: {
             type: String,
             default: () => getConfig().select.size || getConfig().size
         },
         filterable: Boolean,
+        /**
+         * 已废弃，被 filter-config.filterMethod 替换
+         * @deprecated
+         */
         filterMethod: Function,
+        filterConfig: Object,
         remote: Boolean,
         remoteConfig: Object,
         emptyText: String,
@@ -204,6 +217,10 @@ export default defineVxeComponent({
         });
         const computeBtnTransfer = computed(() => {
             const { transfer } = props;
+            const popupOpts = computePopupOpts.value;
+            if (XEUtils.isBoolean(popupOpts.transfer)) {
+                return popupOpts.transfer;
+            }
             if (transfer === null) {
                 const globalTransfer = getConfig().select.transfer;
                 if (XEUtils.isBoolean(globalTransfer)) {
@@ -256,7 +273,7 @@ export default defineVxeComponent({
             return checkMaxLimit(selectVals);
         });
         const computePopupOpts = computed(() => {
-            return Object.assign({}, getConfig().treeSelect.popupConfig, props.popupConfig);
+            return Object.assign({}, getConfig().select.popupConfig, props.popupConfig);
         });
         const computeVirtualYOpts = computed(() => {
             return Object.assign({}, getConfig().select.virtualYConfig || getConfig().select.scrollY, props.virtualYConfig || props.scrollY);
@@ -264,6 +281,9 @@ export default defineVxeComponent({
         const computeRemoteOpts = computed(() => {
             return Object.assign({}, getConfig().select.remoteConfig, props.remoteConfig);
         });
+        const computeFilterOpts = computed(() => {
+            return Object.assign({}, getConfig().select.filterConfig, props.filterConfig);
+        });
         const computeOptionOpts = computed(() => {
             return Object.assign({}, getConfig().select.optionConfig, props.optionConfig);
         });
@@ -432,19 +452,21 @@ export default defineVxeComponent({
          * 处理选项，当选项被动态显示/隐藏时可能会用到
          */
         const handleOption = () => {
-            const { remote, modelValue, filterable, filterMethod } = props;
+            const { remote, modelValue, filterable } = props;
             const { searchValue } = reactData;
             const { fullData, optFullValMaps } = internalData;
             const labelField = computeLabelField.value;
             const valueField = computeValueField.value;
+            const filterOpts = computeFilterOpts.value;
+            const frMethod = filterOpts.filterMethod || props.filterMethod;
             const searchStr = `${searchValue || ''}`.toLowerCase();
             let avList = [];
             if (remote) {
                 avList = fullData.filter(isOptionVisible);
             }
             else {
-                if (filterable && filterMethod) {
-                    avList = fullData.filter(option => isOptionVisible(option) && filterMethod({ $select: $xeSelect, group: null, option, searchValue, value: modelValue }));
+                if (filterable && frMethod) {
+                    avList = fullData.filter(option => isOptionVisible(option) && frMethod({ $select: $xeSelect, group: null, option, searchValue, value: modelValue }));
                 }
                 else if (filterable) {
                     avList = fullData.filter(option => isOptionVisible(option) && (!searchStr || `${option[labelField] || option[valueField]}`.toLowerCase().indexOf(searchStr) > -1));
@@ -468,9 +490,10 @@ export default defineVxeComponent({
             }
         };
         const updateZIndex = () => {
-            const { zIndex } = props;
-            if (zIndex) {
-                reactData.panelIndex = zIndex;
+            const popupOpts = computePopupOpts.value;
+            const customZIndex = popupOpts.zIndex || props.zIndex;
+            if (customZIndex) {
+                reactData.panelIndex = XEUtils.toNumber(customZIndex);
             }
             else if (reactData.panelIndex < getLastZIndex()) {
                 reactData.panelIndex = nextZIndex();
@@ -482,9 +505,10 @@ export default defineVxeComponent({
             const targetElem = refElem.value;
             const panelElem = refOptionPanel.value;
             const btnTransfer = computeBtnTransfer.value;
+            const popupOpts = computePopupOpts.value;
             const handleStyle = () => {
                 const ppObj = updatePanelPlacement(targetElem, panelElem, {
-                    placement,
+                    placement: popupOpts.placement || placement,
                     teleportTo: btnTransfer
                 });
                 const panelStyle = Object.assign(ppObj.style, {
@@ -525,7 +549,7 @@ export default defineVxeComponent({
                 reactData.isActivated = true;
                 reactData.isAniVisible = true;
                 if (filterable) {
-                    if (remote && remoteOpts.enabled && remoteOpts.autoLoad && !fullData.length) {
+                    if (remote && remoteOpts.enabled && ((remoteOpts.autoLoad && !fullData.length) || (fullData.length && remoteOpts.clearOnClose))) {
                         handleSearchEvent();
                     }
                     else {
@@ -550,7 +574,22 @@ export default defineVxeComponent({
             }
         };
         const hideOptionPanel = () => {
-            reactData.searchValue = '';
+            const { filterable, remote } = props;
+            const filterOpts = computeFilterOpts.value;
+            const remoteOpts = computeRemoteOpts.value;
+            if (remote) {
+                if (remoteOpts.clearOnClose) {
+                    reactData.searchValue = '';
+                }
+            }
+            else if (filterable) {
+                if (filterOpts.clearOnClose) {
+                    reactData.searchValue = '';
+                }
+            }
+            else {
+                reactData.searchValue = '';
+            }
             reactData.searchLoading = false;
             reactData.visiblePanel = false;
             internalData.hpTimeout = setTimeout(() => {
@@ -856,13 +895,13 @@ export default defineVxeComponent({
             reactData.isActivated = true;
         };
         const handleSearchEvent = () => {
-            const { modelValue, remote, remoteMethod } = props;
+            const { modelValue, remote } = props;
             const { searchValue } = reactData;
             const remoteOpts = computeRemoteOpts.value;
-            const queryMethod = remoteOpts.queryMethod || remoteMethod;
-            if (remote && queryMethod && remoteOpts.enabled) {
+            const qyMethod = remoteOpts.queryMethod || props.remoteMethod;
+            if (remote && qyMethod && remoteOpts.enabled) {
                 reactData.searchLoading = true;
-                Promise.resolve(queryMethod({ $select: $xeSelect, searchValue, value: modelValue })).then(() => nextTick())
+                Promise.resolve(qyMethod({ $select: $xeSelect, searchValue, value: modelValue })).then(() => nextTick())
                     .catch(() => nextTick())
                     .finally(() => {
                     reactData.searchLoading = false;
@@ -1344,11 +1383,11 @@ export default defineVxeComponent({
             const inpPlaceholder = computeInpPlaceholder.value;
             const popupWrapperStyle = computePopupWrapperStyle.value;
             const popupOpts = computePopupOpts.value;
-            const popupClassName = popupOpts.className || props.popupClassName;
             const defaultSlot = slots.default;
             const headerSlot = slots.header;
             const footerSlot = slots.footer;
             const prefixSlot = slots.prefix;
+            const ppClassName = popupOpts.className || props.popupClassName;
             if (formReadonly) {
                 return h('div', {
                     ref: refElem,
@@ -1408,7 +1447,7 @@ export default defineVxeComponent({
                 }, [
                     h('div', {
                         ref: refOptionPanel,
-                        class: ['vxe-table--ignore-clear vxe-select--panel', popupClassName ? (XEUtils.isFunction(popupClassName) ? popupClassName({ $select: $xeSelect }) : popupClassName) : '', {
+                        class: ['vxe-table--ignore-clear vxe-select--panel', ppClassName ? (XEUtils.isFunction(ppClassName) ? ppClassName({ $select: $xeSelect }) : ppClassName) : '', {
                                 [`size--${vSize}`]: vSize,
                                 'is--transfer': btnTransfer,
                                 'ani--leave': !loading && isAniVisible,