@quansitech/antd-admin 1.1.48 → 1.2.0

package/dist/components/Table.js

@@ -118,6 +118,7 @@ export default function (props) {
     }
     realColumns === null || realColumns === void 0 || realColumns.map(function (column) {
       switch (column.valueType) {
+        case 'date':
         case 'dateTime':
           data = data.map(function (row) {
             var v = row[column.dataIndex];
@@ -191,15 +192,88 @@ export default function (props) {
     setColumns = _useState24[1];
   var realColumns = useMemo(function () {
     var _cloneDeep;
-    return (_cloneDeep = cloneDeep(columns)) === null || _cloneDeep === void 0 ? void 0 : _cloneDeep.map(function (c) {
-      c.key = c.dataIndex;
-      commonHandler(c);
-      if (container.schemaHandler[c.valueType]) {
-        c = container.schemaHandler[c.valueType](c);
+    var processedColumns = [];
+
+    /**
+     * 创建搜索用的range column
+     */
+    var createSearchRangeColumn = function createSearchRangeColumn(column, rangeType) {
+      return _objectSpread(_objectSpread({}, column), {}, {
+        dataIndex: column.dataIndex + '_range',
+        valueType: rangeType,
+        title: typeof column.title === 'string' ? "".concat(column.title, "\u8303\u56F4") : column.title,
+        hideInTable: true,
+        search: {
+          transform: function transform(value) {
+            return value ? value.join(' - ') : value;
+          }
+        }
+      });
+    };
+
+    /**
+     * 创建表格显示用的column（禁用搜索）
+     */
+    var createTableColumn = function createTableColumn(column) {
+      return _objectSpread(_objectSpread({}, column), {}, {
+        search: false
+      });
+    };
+
+    /**
+     * 处理普通column
+     */
+    var processNormalColumn = function processNormalColumn(column, processedColumns) {
+      if (container.schemaHandler[column.valueType]) {
+        var processedColumn = container.schemaHandler[column.valueType](column);
+        processedColumns.push(processedColumn);
+      } else {
+        processedColumns.push(column);
+      }
+    };
+    (_cloneDeep = cloneDeep(columns)) === null || _cloneDeep === void 0 || _cloneDeep.forEach(function (column) {
+      // 设置column的key
+      column.key = column.dataIndex;
+      commonHandler(column);
+
+      // 处理date和datetime类型的搜索栏range转换
+      if (column.search !== false && (column.valueType === 'date' || column.valueType === 'dateTime')) {
+        var rangeType = column.valueType === 'date' ? 'dateRange' : 'dateTimeRange';
+
+        // 创建搜索专用的range column
+        var searchColumn = createSearchRangeColumn(column, rangeType);
+
+        // 创建表格显示用的原column（禁用搜索）
+        var tableColumn = createTableColumn(column);
+        processedColumns.push(searchColumn, tableColumn);
+      } else {
+        // 处理普通column
+        processNormalColumn(column, processedColumns);
       }
-      return c;
     });
+    return processedColumns;
   }, [columns]);
+  var handleSearchRangeValue = function handleSearchRangeValue(processedValue) {
+    Object.keys(processedValue).forEach(function (key) {
+      var c = props.columns.find(function (c) {
+        return c.dataIndex === key;
+      });
+      if ((c === null || c === void 0 ? void 0 : c.valueType) === 'date' || (c === null || c === void 0 ? void 0 : c.valueType) === 'dateTime') {
+        var value = processedValue[key];
+        if (typeof value === 'string' && value.includes(' - ')) {
+          processedValue[key] = value.split(' - ');
+        }
+      }
+    });
+  };
+
+  // 处理搜索表单的初始值转换（将字符串格式的日期范围转换为数组）
+  var processedDefaultSearchValue = useMemo(function () {
+    if (!props.defaultSearchValue) return props.defaultSearchValue;
+    var processedValue = _objectSpread({}, props.defaultSearchValue);
+    handleSearchRangeValue(processedValue);
+    return processedValue;
+  }, [props.defaultSearchValue]);
   var modalContext = useContext(ModalContext);
   var tabsContext = useContext(TabsContext);
   useEffect(function () {
@@ -233,6 +307,7 @@ export default function (props) {
             /^\d+$/.test(query[key]) && (query[key] = parseInt(query[key]));
           }
         });
+        handleSearchRangeValue(query);
         (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.setFieldsValue(query);
         setLastQuery(query);
       }
@@ -279,7 +354,7 @@ export default function (props) {
       reload: true
     },
     form: {
-      initialValues: props.defaultSearchValue,
+      initialValues: processedDefaultSearchValue,
       onValuesChange: function onValuesChange(changedValues, allValues) {
         var _formRef$current2;
         var submit = realColumns.filter(function (c) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quansitech/antd-admin",
-  "version": "1.1.48",
+  "version": "1.2.0",
   "type": "module",
   "files": [
     "dist"