@quansitech/antd-admin 1.2.0 → 1.2.2

package/dist/components/Column/SelectText.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import { ColumnProps } from './types';
+export default function (props: ColumnProps & {
+    valueEnum?: Map<string | number, string>;
+    fieldProps?: {
+        placeholder?: string;
+    };
+    text: [string, string | number];
+}): React.JSX.Element;

package/dist/components/Column/SelectText.js

@@ -0,0 +1,43 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useEffect, useState } from 'react';
+import { Input, Select, Space } from 'antd';
+export default function (props) {
+  var _props$fieldProps2;
+  var options = [];
+  (props.valueEnum || []).forEach(function (value, key) {
+    options.push({
+      label: value,
+      value: key
+    });
+  });
+  var _useState = useState(['', '']),
+    _useState2 = _slicedToArray(_useState, 2),
+    value = _useState2[0],
+    setValue = _useState2[1];
+  useEffect(function () {
+    setValue([props.text[0] || options[0].value, props.text[1]]);
+  }, [props.text]);
+  var _onChange = function onChange(value) {
+    var _props$fieldProps;
+    setValue(value);
+    (_props$fieldProps = props.fieldProps) === null || _props$fieldProps === void 0 || _props$fieldProps.onChange(value);
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space.Compact, null, /*#__PURE__*/React.createElement(Select, {
+    onChange: function onChange(v) {
+      return _onChange([v, value[1]]);
+    },
+    value: value[0],
+    options: options
+  }), /*#__PURE__*/React.createElement(Input, {
+    placeholder: (_props$fieldProps2 = props.fieldProps) === null || _props$fieldProps2 === void 0 ? void 0 : _props$fieldProps2.placeholder,
+    onChange: function onChange(e) {
+      return _onChange([value[0], e.target.value]);
+    },
+    value: value[1]
+  })));
+}

package/dist/components/Column/index.d.ts

@@ -2,5 +2,6 @@ declare const _default: {
     Cascader: () => Promise<typeof import("./Cascader")>;
     File: () => Promise<typeof import("./File")>;
     Image: () => Promise<typeof import("./Image")>;
+    SelectText: () => Promise<typeof import("./SelectText")>;
 };
 export default _default;

package/dist/components/Column/index.js

@@ -7,5 +7,8 @@ export default {
   },
   Image: function Image() {
     return import("./Image");
+  },
+  SelectText: function SelectText() {
+    return import("./SelectText");
   }
 };

package/dist/components/Table.d.ts

@@ -17,5 +17,6 @@ export type TableProps = ProTableProps<any, any> & {
     extraRenderValues?: Record<string, any>[];
     rowSelection: boolean;
     dateFormatter: string;
+    description?: string;
 };
 export default function (props: TableProps): React.JSX.Element;

package/dist/components/Table.js

@@ -39,6 +39,15 @@ export default function (props) {
           case 0:
             data = _objectSpread(_objectSpread(_objectSpread({}, params), filter), {}, {
               sort: sort
+            }); // 兼容 key:value 的写法
+            Object.keys(data).forEach(function (key) {
+              if (key.indexOf(':') !== -1) {
+                var keys = key.split(':');
+                keys.map(function (k, i) {
+                  data[k] = data[key][i];
+                });
+                delete data[key];
+              }
             });
             if (props.pagination) {
               data[props.pagination.paramName || 'page'] = params.current;
@@ -49,7 +58,7 @@ export default function (props) {
             setEditableValues([]);
             setSelectedRows([]);
             if (modalContext.inModal) {
-              _context.next = 8;
+              _context.next = 9;
               break;
             }
             // 如果不在 modal 中，则使用 routerNavigateTo
@@ -76,16 +85,16 @@ export default function (props) {
               }
             });
             return _context.abrupt("return");
-          case 8:
-            _context.prev = 8;
-            _context.next = 11;
+          case 9:
+            _context.prev = 9;
+            _context.next = 12;
             return http.get(searchUrl, {
               params: data,
               headers: {
                 'X-Table-Search': '1'
               }
             });
-          case 11:
+          case 12:
             res = _context.sent;
             _props = res.data;
             setToolActions(_props.actions);
@@ -98,15 +107,15 @@ export default function (props) {
               data: res.data.dataSource || [],
               success: true
             });
-          case 20:
-            _context.prev = 20;
+          case 21:
+            _context.prev = 21;
             setLoading(false);
-            return _context.finish(20);
-          case 23:
+            return _context.finish(21);
+          case 24:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[8,, 20, 23]]);
+      }, _callee, null, [[9,, 21, 24]]);
     }));
     return function request(_x, _x2, _x3) {
       return _ref.apply(this, arguments);
@@ -143,7 +152,7 @@ export default function (props) {
     setSearchUrl = _useState2[1];
   var formRef = useRef();
   var actionRef = useRef();
-  var _useState3 = useState({}),
+  var _useState3 = useState(props.defaultSearchValue || {}),
     _useState4 = _slicedToArray(_useState3, 2),
     lastQuery = _useState4[0],
     setLastQuery = _useState4[1];
@@ -199,7 +208,7 @@ export default function (props) {
      */
     var createSearchRangeColumn = function createSearchRangeColumn(column, rangeType) {
       return _objectSpread(_objectSpread({}, column), {}, {
-        dataIndex: column.dataIndex + '_range',
+        dataIndex: column.dataIndex,
         valueType: rangeType,
         title: typeof column.title === 'string' ? "".concat(column.title, "\u8303\u56F4") : column.title,
         hideInTable: true,
@@ -219,18 +228,6 @@ export default function (props) {
         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;
@@ -248,10 +245,15 @@ export default function (props) {
         processedColumns.push(searchColumn, tableColumn);
       } else {
         // 处理普通column
-        processNormalColumn(column, processedColumns);
+        processedColumns.push(column);
       }
     });
-    return processedColumns;
+    return processedColumns.map(function (column) {
+      if (container.schemaHandler[column.valueType]) {
+        column = container.schemaHandler[column.valueType](column);
+      }
+      return column;
+    });
   }, [columns]);
   var handleSearchRangeValue = function handleSearchRangeValue(processedValue) {
     Object.keys(processedValue).forEach(function (key) {
@@ -267,13 +269,21 @@ export default function (props) {
     });
   };
 
-  // 处理搜索表单的初始值转换（将字符串格式的日期范围转换为数组）
-  var processedDefaultSearchValue = useMemo(function () {
-    if (!props.defaultSearchValue) return props.defaultSearchValue;
-    var processedValue = _objectSpread({}, props.defaultSearchValue);
-    handleSearchRangeValue(processedValue);
-    return processedValue;
-  }, [props.defaultSearchValue]);
+  // 处理数组类型的搜索栏key {'key:value': ['【key】','【value】']}
+  var handleSearchArrayKey = function handleSearchArrayKey(processedValue) {
+    realColumns.forEach(function (col) {
+      var dataIndex = col.dataIndex;
+      if (dataIndex.indexOf(':') !== -1) {
+        var keys = dataIndex.split(':');
+        var values = [];
+        keys.map(function (key) {
+          values.push(processedValue[key]);
+          delete processedValue[key];
+        });
+        processedValue[dataIndex] = values;
+      }
+    });
+  };
   var modalContext = useContext(ModalContext);
   var tabsContext = useContext(TabsContext);
   useEffect(function () {
@@ -296,7 +306,6 @@ export default function (props) {
       });
       setSearchUrl(s);
     }
-    setLastQuery(props.defaultSearchValue || {});
     setDataSource(postData(props.dataSource || []));
     if (!modalContext.inModal) {
       var query = qs.parse(window.location.search.replace(/^\?/, ''));
@@ -308,12 +317,17 @@ export default function (props) {
           }
         });
         handleSearchRangeValue(query);
+        handleSearchArrayKey(query);
         (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.setFieldsValue(query);
         setLastQuery(query);
       }
     }
   }, []);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TableContext.Provider, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    dangerouslySetInnerHTML: {
+      __html: props.description
+    }
+  }), /*#__PURE__*/React.createElement(TableContext.Provider, {
     value: {
       getTableProps: function getTableProps() {
         return props;
@@ -354,7 +368,7 @@ export default function (props) {
       reload: true
     },
     form: {
-      initialValues: processedDefaultSearchValue,
+      initialValues: props.defaultSearchValue,
       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.2.0",
+  "version": "1.2.2",
   "type": "module",
   "files": [
     "dist"