@ccs-ui/rc-pro 1.1.9 → 1.1.11

package/es/pro-table/tree.js

@@ -29,6 +29,7 @@ var TableTree = function TableTree(_ref) {
     setData = _ref.setData,
     onSearchAfter = _ref.onSearchAfter,
     onSearchBefore = _ref.onSearchBefore,
+    parentFieldName = _ref.parentFieldName,
     handlePageChange = _ref.handlePageChange,
     isInModalOrDrawer = _ref.isInModalOrDrawer;
   // async tree expand key
@@ -38,11 +39,10 @@ var TableTree = function TableTree(_ref) {
     setExpandKeys = _useState2[1];
   var _ref2 = table,
     rowKey = _ref2.rowKey,
-    asyncTree = _ref2.asyncTree,
-    _ref2$childrenColumnN = _ref2.childrenColumnName,
-    childrenColumnName = _ref2$childrenColumnN === void 0 ? 'children' : _ref2$childrenColumnN,
+    expandable = _ref2.expandable,
     columns = _ref2.columns,
     request = _ref2.request;
+  var childrenColumnName = (expandable === null || expandable === void 0 ? void 0 : expandable.childrenColumnName) || 'children';
 
   // 获取数据
   var _onRequestTree = /*#__PURE__*/function () {
@@ -61,8 +61,8 @@ var TableTree = function TableTree(_ref) {
             query = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
             record = _args.length > 1 ? _args[1] : undefined;
             params = query;
-            if (record && asyncTree !== null && asyncTree !== void 0 && asyncTree.parentName) {
-              params[asyncTree === null || asyncTree === void 0 ? void 0 : asyncTree.parentName] = record[rowKey];
+            if (record) {
+              params[parentFieldName] = record[rowKey];
             }
 
             // onSearchBefore 请求前回传参数，可以在父组件进行修改
@@ -134,12 +134,6 @@ var TableTree = function TableTree(_ref) {
     };
   });
   var onExpand = function onExpand(expanded, record) {
-    var _table$asyncTree;
-    if (!(table !== null && table !== void 0 && table.asyncTree)) return;
-    if (!(table !== null && table !== void 0 && (_table$asyncTree = table.asyncTree) !== null && _table$asyncTree !== void 0 && _table$asyncTree.parentName)) {
-      CcsUtils.showLogWarning('执行失败、参数treeParentName为空！！！');
-      return;
-    }
     if (!rowKey || (rowKey && record[rowKey]) === undefined) {
       CcsUtils.showLogWarning('rowKey未传入或传入rowKey不正确');
       return;
@@ -158,17 +152,12 @@ var TableTree = function TableTree(_ref) {
   };
 
   // 添加吸顶
-  var tableParams = _objectSpread({
+  var tableParams = _objectSpread(_objectSpread({
     sticky: sticky
-  }, table);
-
-  // 异步树
-  if (table !== null && table !== void 0 && table.asyncTree) {
-    tableParams.expandable = {
-      onExpand: onExpand,
-      expandedRowKeys: expandKeys
-    };
-  }
+  }, table), {}, {
+    onExpand: onExpand,
+    expandedRowKeys: expandKeys
+  });
   return /*#__PURE__*/_jsx(CcsTable, _objectSpread(_objectSpread({
     onChange: handlePageChange,
     data: data,

package/es/table/index.d.ts

@@ -1,4 +1,4 @@
-import { CcsTableProps } from '../pro-table';
+import { CcsTableProps } from '../pro-table/table';
 import './index.less';
 type TableProps<T> = Omit<CcsTableProps<T>, 'request' | 'requestParam'>;
 declare const CustomTable: <T extends object = any>(props: TableProps<T>) => import("react/jsx-runtime").JSX.Element;

package/es/table/index.js

@@ -8,13 +8,11 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { useDebounceFn, useEventListener, useUpdate, useUpdateEffect } from 'ahooks';
-import { Pagination, Table, Tooltip, theme } from 'antd';
+import { Table, Tooltip, theme } from 'antd';
 import classNames from 'classnames';
 import { useRef } from 'react';
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 var DEFAULT_PAGE = {
   totalNum: 0,
   result: [],
@@ -128,30 +126,7 @@ var CustomTable = function CustomTable(props) {
     style: _objectSpread(_objectSpread({}, style), {}, {
       background: token.colorBgContainer
     }),
-    children: restProps.render ? /*#__PURE__*/_jsxs(_Fragment, {
-      children: [restProps.render(result || []), pagination === false ? null : /*#__PURE__*/_jsx(Pagination, _objectSpread({}, _objectSpread({
-        total: totalNum,
-        pageSize: pageSize,
-        size: restProps.size === 'small' ? 'small' : 'default',
-        simple: restProps.size === 'small',
-        current: pageNo,
-        showSizeChanger: true,
-        showQuickJumper: true,
-        showTotal: function showTotal() {
-          return "\u5171".concat(totalNum, "\u6761\u8BB0\u5F55");
-        },
-        pageSizeOptions: ['10', '20', '30', '50', '100'],
-        onChange: function onChange(page, size) {
-          return restProps.onChange && restProps.onChange({
-            pageSize: size,
-            current: page
-          }, {}, {}, {
-            currentDataSource: [],
-            action: 'paginate'
-          });
-        }
-      }, pagination)))]
-    }) : /*#__PURE__*/_jsx("div", {
+    children: /*#__PURE__*/_jsx("div", {
       ref: ref,
       children: /*#__PURE__*/_jsx(Table, _objectSpread({}, _objectSpread(_objectSpread({
         rowKey: rowKey,

package/es/theme-dialog.js

@@ -27,10 +27,10 @@ var ThemeDialog = /*#__PURE__*/function () {
   }, {
     key: "easyMessage",
     value: function easyMessage(result, successText, failText) {
-      if (result.success) {
+      if (result !== null && result !== void 0 && result.success) {
         ThemeDialog.message.success(successText || '操作成功');
       } else {
-        ThemeDialog.message.error(failText || result.msg || '操作失败');
+        ThemeDialog.message.error(failText || (result === null || result === void 0 ? void 0 : result.msg) || '操作失败');
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.1.9",
+  "version": "1.1.11",
   "description": "A react pro components",
   "license": "MIT",
   "module": "es/index.js",