vxe-pc-ui 4.11.42 → 4.11.44

package/lib/index.umd.js

@@ -3661,14 +3661,14 @@ function checkDynamic() {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.11.42"}`;
+const log_version = `ui v${"4.11.44"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-const ui_version = "4.11.42";
+const ui_version = "4.11.44";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -7538,6 +7538,7 @@ const Button = VxeButton;
 
 
 
+
 function createInternalData() {
   return {
     targetEl: null
@@ -7545,7 +7546,8 @@ function createInternalData() {
 }
 function createReactData() {
   return {
-    showBtn: false
+    showBtn: false,
+    backtopZindex: 0
   };
 }
 /* harmony default export */ var backtop = (defineVxeComponent({
@@ -7632,9 +7634,11 @@ function createReactData() {
     const computeWrapperStyle = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
         right,
-        bottom,
-        zIndex
+        bottom
       } = props;
+      const {
+        backtopZindex
+      } = reactData;
       const stys = {};
       if (right) {
         stys.right = toCssUnit(right);
@@ -7642,8 +7646,8 @@ function createReactData() {
       if (bottom) {
         stys.bottom = toCssUnit(bottom);
       }
-      if (zIndex) {
-        stys.zIndex = zIndex;
+      if (backtopZindex) {
+        stys.zIndex = backtopZindex;
       }
       return stys;
     });
@@ -7662,13 +7666,38 @@ function createReactData() {
         $backtop: $xeBacktop
       }, params));
     };
+    const showBacktop = () => {
+      const {
+        position,
+        zIndex
+      } = props;
+      const {
+        backtopZindex
+      } = reactData;
+      if (zIndex) {
+        reactData.backtopZindex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(zIndex);
+      } else if (position === 'fixed') {
+        if (backtopZindex < getLastZIndex()) {
+          reactData.backtopZindex = nextZIndex();
+        }
+      }
+      reactData.showBtn = true;
+    };
+    const hideBacktop = () => {
+      reactData.showBtn = false;
+    };
     const handleScrollEvent = evnt => {
       const {
         threshold
       } = props;
       const currentEl = evnt.currentTarget;
       const scrollTop = currentEl.scrollTop;
-      reactData.showBtn = scrollTop > Math.max(1, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(threshold));
+      const showBtn = scrollTop > Math.max(1, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(threshold));
+      if (showBtn) {
+        showBacktop();
+      } else {
+        hideBacktop();
+      }
     };
     const handleToTop = () => {
       const {
@@ -31795,7 +31824,12 @@ function select_createInternalData() {
       default: () => getConfig().select.size || getConfig().size
     },
     filterable: Boolean,
+    /**
+     * 已废弃，被 filter-config.filterMethod 替换
+     * @deprecated
+     */
     filterMethod: Function,
+    filterConfig: Object,
     remote: Boolean,
     remoteConfig: Object,
     emptyText: String,
@@ -31979,6 +32013,9 @@ function select_createInternalData() {
     const computeRemoteOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, getConfig().select.remoteConfig, props.remoteConfig);
     });
+    const computeFilterOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      return Object.assign({}, getConfig().select.filterConfig, props.filterConfig);
+    });
     const computeOptionOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, getConfig().select.optionConfig, props.optionConfig);
     });
@@ -32179,8 +32216,7 @@ function select_createInternalData() {
       const {
         remote,
         modelValue,
-        filterable,
-        filterMethod
+        filterable
       } = props;
       const {
         searchValue
@@ -32191,13 +32227,15 @@ function select_createInternalData() {
       } = 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({
+        if (filterable && frMethod) {
+          avList = fullData.filter(option => isOptionVisible(option) && frMethod({
             $select: $xeSelect,
             group: null,
             option,
@@ -32299,7 +32337,7 @@ function select_createInternalData() {
         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 {
             handleOption();
@@ -32325,7 +32363,23 @@ function select_createInternalData() {
       }
     };
     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(() => {
@@ -32676,17 +32730,16 @@ function select_createInternalData() {
     const handleSearchEvent = () => {
       const {
         modelValue,
-        remote,
-        remoteMethod
+        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({
+        Promise.resolve(qyMethod({
           $select: $xeSelect,
           searchValue,
           value: modelValue