@ccs-ui/rc-pro 2.3.6-alpha-9 → 2.3.6-alpha-10

package/es/group-form-item/index.js

@@ -84,7 +84,7 @@ function GroupFormItem(_ref2) {
   var groupItemNames = _ref2.groupItemNames,
     name = _ref2.name,
     formItemProps = _objectWithoutProperties(_ref2, _excluded);
-  var _useState = useState(name || "_".concat(JSON.stringify(groupItemNames).replace(/[^a-zA-Z]/g, ''))),
+  var _useState = useState(name || "_".concat(JSON.stringify(groupItemNames).replace(/[^a-zA-Z]/g, ''), "_")),
     _useState2 = _slicedToArray(_useState, 1),
     itemName = _useState2[0];
   return /*#__PURE__*/_jsxs(_Fragment, {

package/es/pro-table/table.d.ts

@@ -13,14 +13,16 @@ export type ShowDependType = {
     value: any;
 };
 export declare enum TableEvent {
-    Search = "search",
-    Reset = "reset",
-    Reload = "reload",
-    ChangePage = "changePage",
-    InitSearch = "initSearch",
-    FullScreen = "fullScreen",
-    ColumnFilter = "columnFilter",
-    SelectedRows = "SelectedRows"
+    Search = "search",// 查询
+    Reset = "reset",// 重置
+    Reload = "reload",// 刷新
+    ChangePage = "changePage",// 分页
+    InitSearch = "initSearch",// 初始化查询
+    FullScreen = "fullScreen",// 全屏
+    ColumnFilter = "columnFilter",// 列过滤
+    SelectedRows = "SelectedRows",// 选中行
+    Expand = "Expand",// 异步树展开
+    PartialReload = "PartialReload"
 }
 export type TableColumn<RecordType = any> = (Omit<ColumnGroupType<RecordType>, 'ellipsis'> | Omit<ColumnType<RecordType>, 'ellipsis'>) & {
     dataIndex?: keyof RecordType;

package/es/pro-table/table.js

@@ -55,8 +55,10 @@ export var TableEvent = /*#__PURE__*/function (TableEvent) {
   TableEvent["FullScreen"] = "fullScreen";
   TableEvent["ColumnFilter"] = "columnFilter";
   TableEvent["SelectedRows"] = "SelectedRows";
+  TableEvent["Expand"] = "Expand";
+  TableEvent["PartialReload"] = "PartialReload";
   return TableEvent;
-}({});
+}({}); // 异步树局部刷新
 export var classPrefix = 'ccs-pl';
 
 /**
@@ -169,7 +171,7 @@ var InternalProTable = function InternalProTable(props) {
   var getFormValues = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _formRef$current;
-      var formValues;
+      var formValues, _delField;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -177,8 +179,19 @@ var InternalProTable = function InternalProTable(props) {
             return (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.validateFields();
           case 2:
             formValues = _context.sent;
-            // 格式化条件
+            // 删除无意义字段
+            if (formValues) {
+              _delField = Object.keys(formValues).filter(function (k) {
+                return k.startsWith('_') && k.endsWith('_');
+              });
+              if (_delField.length > 0) {
+                _delField.forEach(function (d) {
+                  return delete formValues[d];
+                });
+              }
+            }
             if (formatFormItems.length) {
+              // 格式化条件
               Object.keys(formValues).forEach(function (k) {
                 if (formValues[k] !== undefined) {
                   var s = formatFormItems.find(function (f) {
@@ -189,7 +202,7 @@ var InternalProTable = function InternalProTable(props) {
               });
             }
             return _context.abrupt("return", _objectSpread(_objectSpread(_objectSpread({}, requestParam), formInitValues), formValues));
-          case 5:
+          case 6:
           case "end":
             return _context.stop();
         }
@@ -274,9 +287,10 @@ var InternalProTable = function InternalProTable(props) {
               _context2.next = 19;
               break;
             }
-            (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 || _treeRef$current.onRequestTree(params.query, record);
+            (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 || _treeRef$current.onRequestTree(eventType, params.query, record);
             return _context2.abrupt("return");
           case 19:
+            // 事件回调，请求中
             onEvent === null || onEvent === void 0 || onEvent(eventType, {
               loading: true,
               params: params
@@ -292,6 +306,7 @@ var InternalProTable = function InternalProTable(props) {
             return httpRequest(params);
           case 23:
             requestResult = _context2.sent;
+            // 事件回调，请求完成
             onEvent === null || onEvent === void 0 || onEvent(eventType, {
               loading: false,
               params: params,
@@ -367,7 +382,7 @@ var InternalProTable = function InternalProTable(props) {
     var ids = getAllChildrenId(treeNode.children || [], rowKey);
     // 局部重载
     (_treeRef$current2 = treeRef.current) === null || _treeRef$current2 === void 0 || _treeRef$current2.onExpandKeys(ids);
-    (_treeRef$current3 = treeRef.current) === null || _treeRef$current3 === void 0 || _treeRef$current3.onRequestTree({}, treeNode);
+    (_treeRef$current3 = treeRef.current) === null || _treeRef$current3 === void 0 || _treeRef$current3.onRequestTree(TableEvent.PartialReload, {}, treeNode);
   };
   useEffect(function () {
     // 判断是否在弹出框中
@@ -547,6 +562,7 @@ var InternalProTable = function InternalProTable(props) {
         sticky: stickyRef.current || true,
         parentFieldName: parentFieldName,
         setData: setData,
+        onEvent: onEvent,
         handlePageChange: handlePageChange
       });
     }

package/es/pro-table/tree.d.ts

@@ -4,12 +4,12 @@ import { RefObject } from 'react';
 import CCS from '..';
 import { CcsFieldNamesType } from '../context';
 import { TableRefType } from '../table';
-import { CcsProTableProps } from './table';
+import { CcsProTableProps, TableEvent } from './table';
 export type TreeInstance<T> = {
-    onRequestTree: (query: any, record: T | any) => void;
+    onRequestTree: (eventType: TableEvent, query: any, record: T | any) => void;
     onExpandKeys: (ids: string[]) => void;
 };
-type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'parentFieldName' | 'leafNode'> & {
+type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'parentFieldName' | 'leafNode' | 'onEvent'> & {
     data: CCS.TableData<T>;
     sticky: boolean | TableSticky;
     tableRowSize: TableProps['size'];

package/es/pro-table/tree.js

@@ -22,6 +22,7 @@ import { useImperativeHandle, useState } from 'react';
 import { CcsTable } from '..';
 import { useProTableTreeFields } from "../hooks/use-app";
 import { getDataFromFields } from "../select";
+import { TableEvent } from "./table";
 import { jsx as _jsx } from "react/jsx-runtime";
 var TableTree = function TableTree(props) {
   var data = props.data,
@@ -34,7 +35,8 @@ var TableTree = function TableTree(props) {
     tableContentRef = props.tableContentRef,
     parentFieldName = props.parentFieldName,
     handlePageChange = props.handlePageChange,
-    setData = props.setData;
+    setData = props.setData,
+    onEvent = props.onEvent;
   // async tree expand key
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -53,8 +55,8 @@ var TableTree = function TableTree(props) {
   var fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), props.fieldNames);
 
   // 获取数据
-  var _onRequestTree = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var onRequestTree = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(eventType) {
       var query,
         record,
         params,
@@ -64,13 +66,18 @@ var TableTree = function TableTree(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            query = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-            record = _args.length > 1 ? _args[1] : undefined;
+            query = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
+            record = _args.length > 2 ? _args[2] : undefined;
             params = query;
             if (record) {
               params[parentFieldName] = record[rowKey];
             }
 
+            // 事件回调，请求中
+            onEvent === null || onEvent === void 0 || onEvent(eventType, {
+              loading: true,
+              params: params
+            });
             // 发起请求
             setData(function (d) {
               return _objectSpread(_objectSpread({}, d), {}, {
@@ -79,15 +86,21 @@ var TableTree = function TableTree(props) {
             });
             _context.t0 = httpRequest;
             if (!_context.t0) {
-              _context.next = 10;
+              _context.next = 11;
               break;
             }
-            _context.next = 9;
+            _context.next = 10;
             return httpRequest(params);
-          case 9:
-            _context.t0 = _context.sent;
           case 10:
+            _context.t0 = _context.sent;
+          case 11:
             requestResult = _context.t0;
+            onEvent === null || onEvent === void 0 || onEvent(eventType, {
+              loading: true,
+              params: params,
+              data: requestResult
+            });
+
             // 请求结果
             if (requestResult) {
               // 获取table数据
@@ -126,21 +139,19 @@ var TableTree = function TableTree(props) {
                 });
               });
             }
-          case 12:
+          case 14:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function onRequestTree() {
+    return function onRequestTree(_x) {
       return _ref2.apply(this, arguments);
     };
   }();
   useImperativeHandle(treeRef, function () {
     return {
-      onRequestTree: function onRequestTree(query, record) {
-        _onRequestTree(query, record);
-      },
+      onRequestTree: onRequestTree,
       onExpandKeys: function onExpandKeys(ids) {
         setExpandKeys(expandKeys.filter(function (e) {
           return !ids.includes(e);
@@ -158,7 +169,7 @@ var TableTree = function TableTree(props) {
       var _record$childrenColum;
       expandKeys.push(expandId);
       if (((_record$childrenColum = record[childrenColumnName]) === null || _record$childrenColum === void 0 ? void 0 : _record$childrenColum.length) > 0) return;
-      _onRequestTree({}, record);
+      onRequestTree(TableEvent.Expand, {}, record);
     } else {
       setExpandKeys(expandKeys.filter(function (e) {
         return e !== expandId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.3.6-alpha-9",
+  "version": "2.3.6-alpha-10",
   "description": "",
   "license": "MIT",
   "author": {