vxe-pc-ui 4.9.35 → 4.9.37

package/lib/index.umd.js

@@ -3588,14 +3588,14 @@ function checkDynamic() {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.9.35"}`;
+const log_version = `ui v${"4.9.37"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-const ui_version = "4.9.35";
+const ui_version = "4.9.37";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -29905,6 +29905,27 @@ function select_createInternalData() {
       handleStyle();
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(handleStyle);
     };
+    const handleScrollSelect = () => {
+      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
+        const {
+          modelValue
+        } = props;
+        const {
+          isAniVisible,
+          visiblePanel
+        } = reactData;
+        const {
+          optFullValMaps
+        } = internalData;
+        const selectVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(modelValue) ? modelValue[0] : modelValue;
+        if (selectVal && isAniVisible && visiblePanel) {
+          const cacheItem = reactData.reactFlag ? optFullValMaps[`${selectVal}`] : null;
+          if (cacheItem) {
+            handleScrollToOption(cacheItem.item);
+          }
+        }
+      });
+    };
     const showOptionPanel = () => {
       const {
         loading,
@@ -29938,7 +29959,10 @@ function select_createInternalData() {
         setTimeout(() => {
           reactData.visiblePanel = true;
           handleFocusSearch();
-          recalculate().then(() => refreshScroll());
+          recalculate().then(() => {
+            handleScrollSelect();
+            refreshScroll();
+          });
         }, 10);
         setTimeout(() => {
           recalculate().then(() => refreshScroll());
@@ -35970,6 +35994,13 @@ const TabPane = VxeTabPane;
 function getRowUniqueId() {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId('row_');
 }
+function table_select_createInternalData() {
+  return {
+    // hpTimeout: undefined,
+    // vpTimeout: undefined,
+    fullRowMaps: {}
+  };
+}
 /* harmony default export */ var table_select = (defineVxeComponent({
   name: 'VxeTableSelect',
   props: {
@@ -36033,7 +36064,6 @@ function getRowUniqueId() {
       initialized: false,
       tableColumns: [],
       fullOptionList: [],
-      fullRowMaps: {},
       panelIndex: 0,
       panelStyle: {},
       panelPlacement: null,
@@ -36042,10 +36072,7 @@ function getRowUniqueId() {
       isAniVisible: false,
       isActivated: false
     });
-    const internalData = {
-      // hpTimeout: undefined,
-      // vpTimeout: undefined
-    };
+    const internalData = table_select_createInternalData();
     const refMaps = {
       refElem
     };
@@ -36120,6 +36147,7 @@ function getRowUniqueId() {
     const computeSelectGridOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const gridOpts = computeGridOpts.value;
       const {
+        pagerConfig,
         proxyConfig
       } = gridOpts;
       if (proxyConfig) {
@@ -36132,13 +36160,24 @@ function getRowUniqueId() {
             Object.assign(newProxyConfig.ajax, {
               query(params, ...args) {
                 return Promise.resolve(ajaxMethods(params, ...args)).then(rest => {
-                  const listProp = resConfigs.list;
-                  const tableData = (listProp ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(listProp) ? listProp({
-                    data: rest,
-                    $table: null,
-                    $grid: null,
-                    $gantt: null
-                  }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, listProp) : rest) || [];
+                  let tableData = [];
+                  if (pagerConfig) {
+                    const resultProp = resConfigs.result;
+                    tableData = (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(resultProp) ? resultProp({
+                      data: rest,
+                      $table: null,
+                      $grid: null,
+                      $gantt: null
+                    }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, resultProp || 'result')) || [];
+                  } else {
+                    const listProp = resConfigs.list;
+                    tableData = (listProp ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(listProp) ? listProp({
+                      data: rest,
+                      $table: null,
+                      $grid: null,
+                      $gantt: null
+                    }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, listProp) : rest) || [];
+                  }
                   cacheDataMap(tableData || []);
                   return rest;
                 });
@@ -36158,10 +36197,16 @@ function getRowUniqueId() {
         lazyOptions
       } = props;
       const {
-        fullRowMaps
+        fullOptionList
       } = reactData;
+      const {
+        fullRowMaps
+      } = internalData;
       const valueField = computeValueField.value;
       const labelField = computeLabelField.value;
+      if (!fullOptionList) {
+        return '';
+      }
       return (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(modelValue) ? modelValue : [modelValue]).map(val => {
         const cacheItem = fullRowMaps[val];
         if (cacheItem) {
@@ -36227,7 +36272,7 @@ function getRowUniqueId() {
     const getRowsByValue = modelValue => {
       const {
         fullRowMaps
-      } = reactData;
+      } = internalData;
       const rows = [];
       const vals = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(modelValue) ? [] : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(modelValue) ? modelValue : [modelValue];
       vals.forEach(val => {
@@ -36299,7 +36344,8 @@ function getRowUniqueId() {
       const valueField = computeValueField.value;
       const gridOpts = computeGridOpts.value;
       const {
-        treeConfig
+        treeConfig,
+        pagerConfig
       } = gridOpts;
       const rowMaps = {};
       const keyMaps = {};
@@ -36329,7 +36375,7 @@ function getRowUniqueId() {
         });
       }
       reactData.fullOptionList = dataList || options || [];
-      reactData.fullRowMaps = rowMaps;
+      internalData.fullRowMaps = pagerConfig ? Object.assign({}, internalData.fullRowMaps, rowMaps) : rowMaps;
       updateModel(props.modelValue);
     };
     const updateZindex = () => {
@@ -36690,6 +36736,7 @@ function getRowUniqueId() {
       globalEvents.off($xeTableSelect, 'mousedown');
       globalEvents.off($xeTableSelect, 'blur');
       globalEvents.off($xeTableSelect, 'resize');
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(internalData, table_select_createInternalData());
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
       if (!VxeTableGridComponent) {