vxe-pc-ui 4.9.24 → 4.9.26

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.24"}`;
+const log_version = `ui v${"4.9.26"}`;
 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.24";
+const ui_version = "4.9.26";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -19342,6 +19342,7 @@ const DatePicker = VxeDatePicker;
     labelFormat: String,
     valueFormat: String,
     timeFormat: String,
+    valueType: String,
     editable: {
       type: Boolean,
       default: true
@@ -19586,9 +19587,20 @@ const DatePicker = VxeDatePicker;
     };
     const getRangeValue = (sValue, eValue) => {
       const {
-        modelValue
+        modelValue,
+        valueType
       } = props;
-      const isArr = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(modelValue);
+      let isArr = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(modelValue);
+      if (valueType) {
+        switch (valueType) {
+          case 'array':
+            isArr = true;
+            break;
+          case 'string':
+            isArr = false;
+            break;
+        }
+      }
       if (sValue || eValue) {
         const rest = [sValue || '', eValue || ''];
         if (isArr) {
@@ -35985,35 +35997,45 @@ function getRowUniqueId() {
       return Object.assign({}, getConfig().tableSelect.popupConfig, props.popupConfig);
     });
     const computeGridOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      const opts = Object.assign({}, getConfig().tableSelect.gridConfig, props.gridConfig, {
+      return Object.assign({}, getConfig().tableSelect.gridConfig, props.gridConfig, {
         data: undefined,
         columns: undefined
       });
+    });
+    const computeSelectGridOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const gridOpts = computeGridOpts.value;
       const {
         proxyConfig
-      } = opts;
-      const ajaxMethods = proxyConfig && proxyConfig.ajax ? proxyConfig.ajax.query : null;
-      if (proxyConfig && ajaxMethods) {
-        const resConfigs = proxyConfig.response || proxyConfig.props || {};
-        opts.proxyConfig = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge({}, proxyConfig, {
-          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) || [];
-                cacheDataMap(tableData || []);
-                return rest;
-              });
-            }
+      } = gridOpts;
+      if (proxyConfig) {
+        const proxyAjax = proxyConfig.ajax;
+        if (proxyAjax && proxyAjax.query) {
+          const newProxyConfig = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(proxyConfig, true);
+          const ajaxMethods = proxyAjax.query;
+          if (ajaxMethods) {
+            const resConfigs = proxyConfig.response || proxyConfig.props || {};
+            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) || [];
+                  cacheDataMap(tableData || []);
+                  return rest;
+                });
+              }
+            });
           }
-        });
+          return Object.assign({}, gridOpts, {
+            proxyConfig: newProxyConfig
+          });
+        }
       }
-      return opts;
+      return gridOpts;
     });
     const computeSelectLabel = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
@@ -36421,7 +36443,7 @@ function getRowUniqueId() {
       const {
         className: popupClassName
       } = popupOpts;
-      const gridOpts = computeGridOpts.value;
+      const selectGridOpts = computeSelectGridOpts.value;
       const rowOpts = computeRowOpts.value;
       const popupWrapperStyle = computePopupWrapperStyle.value;
       const headerSlot = slots.header;
@@ -36489,7 +36511,7 @@ function getRowUniqueId() {
         class: 'vxe-table-select-grid--wrapper',
         style: popupWrapperStyle
       }, [VxeTableGridComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeTableGridComponent, {
-        ...gridOpts,
+        ...selectGridOpts,
         ...gridEvents,
         class: 'vxe-table-select--grid',
         ref: refGrid,
@@ -36528,9 +36550,6 @@ function getRowUniqueId() {
         if (gridConfig.proxyConfig.autoLoad !== false) {
           reactData.initialized = true;
         }
-        if (gridConfig.pagerConfig && gridConfig.pagerConfig.enabled !== false) {
-          warnLog('vxe.error.notProp', ['proxy-config & grid-config.pagerConfig']);
-        }
       }
       globalEvents.on($xeTableSelect, 'mousewheel', handleGlobalMousewheelEvent);
       globalEvents.on($xeTableSelect, 'mousedown', handleGlobalMousedownEvent);