@ccs-ui/rc-pro 2.3.2 → 2.3.3-beta-2

package/es/dialog/form.js

@@ -24,8 +24,14 @@ var DialogForm = function DialogForm(_ref) {
   var formRef = _ref.formRef,
     children = _ref.children,
     _ref$formProps = _ref.formProps,
-    labelCol = _ref$formProps.labelCol,
-    wrapperCol = _ref$formProps.wrapperCol,
+    _ref$formProps$labelC = _ref$formProps.labelCol,
+    labelCol = _ref$formProps$labelC === void 0 ? {
+      span: 7
+    } : _ref$formProps$labelC,
+    _ref$formProps$wrappe = _ref$formProps.wrapperCol,
+    wrapperCol = _ref$formProps$wrappe === void 0 ? {
+      span: 16
+    } : _ref$formProps$wrappe,
     restProps = _objectWithoutProperties(_ref$formProps, _excluded);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -37,12 +43,8 @@ var DialogForm = function DialogForm(_ref) {
   });
   return /*#__PURE__*/_jsx(Form, _objectSpread(_objectSpread({
     form: form,
-    labelCol: labelCol || {
-      span: 7
-    },
-    wrapperCol: wrapperCol || {
-      span: 14
-    },
+    labelCol: labelCol,
+    wrapperCol: wrapperCol,
     preserve: false
   }, restProps), {}, {
     children: children

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

@@ -71,8 +71,10 @@ export type CcsProTableProps<RecordType> = Pick<PropsWithCss, 'className'> & Pro
         root?: CSSProperties;
         table?: CSSProperties;
     };
-    /** 父级值字段 */
+    /** 异步树父级值字段 */
     parentFieldName?: string;
+    /** 异步树叶子节点标识字段或函数判断 */
+    leafNode?: string | ((record: RecordType) => boolean);
     /** ref 回调方法 */
     proRef?: CCS.TableInstanceRef<RecordType>;
     /** 显示序号 */

package/es/pro-table/table.js

@@ -58,6 +58,7 @@ var InternalProTable = function InternalProTable(props) {
     toolbarExtra = props.toolbarExtra,
     _props$formItems = props.formItems,
     formItems = _props$formItems === void 0 ? [] : _props$formItems,
+    leafNode = props.leafNode,
     parentFieldName = props.parentFieldName,
     _props$formInitValues = props.formInitValues,
     formInitValues = _props$formInitValues === void 0 ? {} : _props$formInitValues;
@@ -476,6 +477,7 @@ var InternalProTable = function InternalProTable(props) {
             return tableTitle;
           } : undefined
         }),
+        leafNode: leafNode,
         treeRef: treeRef,
         tableRef: tableRef,
         tableContentRef: tableContentRef,

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

@@ -9,7 +9,7 @@ export type TreeInstance<T> = {
     onRequestTree: (query: any, record: T | any) => void;
     onExpandKeys: (ids: string[]) => void;
 };
-type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'onSearchBefore' | 'parentFieldName' | 'onSearchAfter'> & {
+type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'onSearchBefore' | 'parentFieldName' | 'onSearchAfter' | 'leafNode'> & {
     data: CCS.TableData<T>;
     sticky: boolean | TableSticky;
     tableRowSize: TableProps['size'];

package/es/pro-table/tree.js

@@ -29,6 +29,7 @@ var TableTree = function TableTree(props) {
     sticky = props.sticky,
     treeRef = props.treeRef,
     tableRef = props.tableRef,
+    leafNode = props.leafNode,
     tableRowSize = props.tableRowSize,
     tableContentRef = props.tableContentRef,
     parentFieldName = props.parentFieldName,
@@ -96,7 +97,18 @@ var TableTree = function TableTree(props) {
             if (requestResult) {
               // onSearchAfter 处理请求结果
               newReqResult = onSearchAfter(requestResult); // 获取table数据
-              dataSource = getDataFromFields(newReqResult, fieldNames.dataSource);
+              dataSource = getDataFromFields(newReqResult, fieldNames.dataSource); // 判断非叶子节点，添加children
+              if (leafNode && dataSource && Array.isArray(dataSource)) {
+                dataSource.forEach(function (d) {
+                  if (typeof leafNode === 'string' && !d[leafNode]) {
+                    d.children = [];
+                    return;
+                  }
+                  if (typeof leafNode === 'function' && !leafNode(d)) {
+                    d.children = [];
+                  }
+                });
+              }
               if (record) {
                 // 异步树
                 record[childrenColumnName] = dataSource;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.3.2",
+  "version": "2.3.3-beta-2",
   "description": "",
   "license": "MIT",
   "author": {