@ccs-ui/rc-pro 1.0.7-rc.9 → 1.1.0

package/es/pro-table/search.js

@@ -12,9 +12,12 @@ import { MoreOutlined, RedoOutlined, SettingOutlined, UpOutlined } from '@ant-de
 import { Button, Checkbox, Col, Dropdown, Form, Row, Tooltip } from 'antd';
 import _debounce from 'lodash/debounce';
 import ResizeObserver from 'rc-resize-observer';
-import React, { cloneElement, useMemo, useRef, useState } from 'react';
+import { cloneElement, useMemo, useRef, useState } from 'react';
 import { classPrefix } from '.';
 import { CcsFullScreenButton } from '..';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 /** 查找所有父级依赖 */
 var getShowDpends = function getShowDpends(items, item, depends) {
   var showDepends = item.showDepends;
@@ -40,15 +43,16 @@ var getShowDpends = function getShowDpends(items, item, depends) {
 /** 操作按钮、查询，重置、列筛选、 */
 function SearchComponent(_ref) {
   var form = _ref.form,
+    event$ = _ref.event$,
     toolbar = _ref.toolbar,
     columns = _ref.columns,
-    hasMore = _ref.hasMore,
+    children = _ref.children,
     expandForm = _ref.expandForm,
     _ref$formItems = _ref.formItems,
     formItems = _ref$formItems === void 0 ? [] : _ref$formItems,
     formInitValues = _ref.formInitValues,
     isInModalOrDrawer = _ref.isInModalOrDrawer,
-    event$ = _ref.event$,
+    disableCollapseForm = _ref.disableCollapseForm,
     onReset = _ref.onReset,
     onSearch = _ref.onSearch;
   var _useState = useState(false),
@@ -68,6 +72,19 @@ function SearchComponent(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     colSpan = _useState8[0],
     setColSpan = _useState8[1];
+  var _useState9 = useState(function () {
+      var hasMain = formItems.filter(function (f) {
+        return f.isMain;
+      });
+
+      // 所有都是主条件
+      if (hasMain.length === formItems.length) return false;
+
+      // 条件数大于1,有更多
+      return formItems.length > 1;
+    }),
+    _useState10 = _slicedToArray(_useState9, 1),
+    hasMore = _useState10[0];
 
   // 处理form item 依赖
   var allFormItems = useMemo(function () {
@@ -92,14 +109,14 @@ function SearchComponent(_ref) {
       return c.hidden;
     }));
   };
-  var _useState9 = useState(true),
-    _useState10 = _slicedToArray(_useState9, 2),
-    isCheckAll = _useState10[0],
-    setIsCheckAll = _useState10[1];
-  var _useState11 = useState(getHalfCheckState),
+  var _useState11 = useState(true),
     _useState12 = _slicedToArray(_useState11, 2),
-    isHalfCheck = _useState12[0],
-    setIsHalfCheck = _useState12[1];
+    isCheckAll = _useState12[0],
+    setIsCheckAll = _useState12[1];
+  var _useState13 = useState(getHalfCheckState),
+    _useState14 = _slicedToArray(_useState13, 2),
+    isHalfCheck = _useState14[0],
+    setIsHalfCheck = _useState14[1];
 
   // 列选中事件
   var onCheckChange = function onCheckChange(checked, index) {
@@ -150,11 +167,12 @@ function SearchComponent(_ref) {
   var renderCheck = function renderCheck() {
     var fc = [{
       key: '1',
-      label: /*#__PURE__*/React.createElement(Checkbox, {
+      label: /*#__PURE__*/_jsx(Checkbox, {
         indeterminate: !isHalfCheck,
         onChange: onCheckAllChange,
-        checked: isCheckAll
-      }, "\u5168\u9009")
+        checked: isCheckAll,
+        children: "\u5168\u9009"
+      })
     }, {
       key: '2',
       type: 'divider'
@@ -163,12 +181,13 @@ function SearchComponent(_ref) {
       if (c.dataIndex) {
         fc.push({
           key: c.dataIndex,
-          label: /*#__PURE__*/React.createElement(Checkbox, {
+          label: /*#__PURE__*/_jsx(Checkbox, {
             checked: !c.hidden,
             onChange: function onChange(e) {
               return onCheckChange(e.target.checked, index);
-            }
-          }, c.title)
+            },
+            children: c.title
+          })
         });
       }
     });
@@ -182,62 +201,68 @@ function SearchComponent(_ref) {
   };
 
   // 操作按钮
-  var renderOperation = /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-header-buttons")
-  }, hasMore && /*#__PURE__*/React.createElement(Button, {
-    onClick: function onClick() {
-      return setIsShowMore(!isShowMore);
-    },
-    icon: isShowMore ? /*#__PURE__*/React.createElement(UpOutlined, {
-      className: "".concat(classPrefix, "-icon")
-    }) : /*#__PURE__*/React.createElement(MoreOutlined, {
-      className: "".concat(classPrefix, "-icon")
-    }),
-    type: "text",
-    style: {
-      width: 24
-    }
-  }), /*#__PURE__*/React.createElement(Tooltip, {
-    title: "\u91CD\u7F6E"
-  }, /*#__PURE__*/React.createElement(Button, {
-    onClick: onReset,
-    icon: /*#__PURE__*/React.createElement(RedoOutlined, {
-      className: "".concat(classPrefix, "-icon")
-    }),
-    type: "text",
-    style: {
-      width: 24
-    }
-  })), filterColumns && /*#__PURE__*/React.createElement(Dropdown, {
-    menu: {
-      items: renderCheck()
-    },
-    trigger: ['click'],
-    open: dropdownVisible,
-    onOpenChange: function onOpenChange(flag) {
-      return setDropdownVisible(flag);
-    }
-  }, /*#__PURE__*/React.createElement(Tooltip, {
-    title: "\u5217\u8BBE\u7F6E"
-  }, /*#__PURE__*/React.createElement(Button, {
-    icon: /*#__PURE__*/React.createElement(SettingOutlined, {
-      className: "".concat(classPrefix, "-icon")
-    }),
-    type: "text",
-    style: {
-      width: 24
-    }
-  }))), !isInModalOrDrawer && /*#__PURE__*/React.createElement(CcsFullScreenButton, {
-    onFullScreen: onFullScreen
-  }));
+  var renderOperation = /*#__PURE__*/_jsxs("div", {
+    className: "".concat(classPrefix, "-header-buttons"),
+    children: [hasMore && !disableCollapseForm && /*#__PURE__*/_jsx(Button, {
+      className: "ccs-pl-expbtn",
+      onClick: function onClick() {
+        return setIsShowMore(!isShowMore);
+      },
+      icon: isShowMore ? /*#__PURE__*/_jsx(UpOutlined, {
+        className: "".concat(classPrefix, "-icon")
+      }) : /*#__PURE__*/_jsx(MoreOutlined, {
+        className: "".concat(classPrefix, "-icon")
+      }),
+      type: "text",
+      style: {
+        width: 24
+      }
+    }), /*#__PURE__*/_jsx(Tooltip, {
+      title: "\u91CD\u7F6E",
+      children: /*#__PURE__*/_jsx(Button, {
+        className: "ccs-pl-rstbtn",
+        onClick: onReset,
+        icon: /*#__PURE__*/_jsx(RedoOutlined, {
+          className: "".concat(classPrefix, "-icon")
+        }),
+        type: "text",
+        style: {
+          width: 24
+        }
+      })
+    }), filterColumns && /*#__PURE__*/_jsx(Dropdown, {
+      menu: {
+        items: renderCheck()
+      },
+      trigger: ['click'],
+      open: dropdownVisible,
+      onOpenChange: function onOpenChange(flag) {
+        return setDropdownVisible(flag);
+      },
+      className: "ccs-pl-setbtn",
+      children: /*#__PURE__*/_jsx(Tooltip, {
+        title: "\u5217\u8BBE\u7F6E",
+        children: /*#__PURE__*/_jsx(Button, {
+          icon: /*#__PURE__*/_jsx(SettingOutlined, {
+            className: "".concat(classPrefix, "-icon")
+          }),
+          type: "text",
+          style: {
+            width: 24
+          }
+        })
+      })
+    }), !isInModalOrDrawer && /*#__PURE__*/_jsx(CcsFullScreenButton, {
+      onFullScreen: onFullScreen
+    })]
+  });
 
   // render item 判断是否有依赖
   var renderFormItem = function renderFormItem(items) {
     if (!items) return [];
     return items.map(function (item) {
-      return item.depends || item.showDepends ? /*#__PURE__*/React.createElement(Form.Item, {
+      return item.depends || item.showDepends ? /*#__PURE__*/_jsx(Form.Item, {
         noStyle: true,
-        key: item.name,
         shouldUpdate: function shouldUpdate(l, n) {
           var _item$depends, _item$showDepends;
           return ((_item$depends = item.depends) === null || _item$depends === void 0 ? void 0 : _item$depends.some(function (i) {
@@ -245,50 +270,54 @@ function SearchComponent(_ref) {
           })) || ((_item$showDepends = item.showDepends) === null || _item$showDepends === void 0 ? void 0 : _item$showDepends.some(function (i) {
             return l[i.name] !== n[i.name];
           })) || false;
-        }
-      }, function (_ref2) {
-        var _item$depends2;
-        var getFieldValue = _ref2.getFieldValue;
-        var dependParam = {};
-        (_item$depends2 = item.depends) === null || _item$depends2 === void 0 ? void 0 : _item$depends2.forEach(function (i) {
-          var value = getFieldValue(i);
-          dependParam[i] = value;
-        });
-        var isShow = true;
-        if (item.showDepends && item.showDepends.length > 0) {
-          var _item$showDepends2;
-          isShow = (_item$showDepends2 = item.showDepends) === null || _item$showDepends2 === void 0 ? void 0 : _item$showDepends2.every(function (i) {
-            return getFieldValue(i.name) === i.value;
+        },
+        children: function children(_ref2) {
+          var _item$depends2;
+          var getFieldValue = _ref2.getFieldValue;
+          var dependParam = {};
+          (_item$depends2 = item.depends) === null || _item$depends2 === void 0 ? void 0 : _item$depends2.forEach(function (i) {
+            var value = getFieldValue(i);
+            dependParam[i] = value;
           });
+          var isShow = true;
+          if (item.showDepends && item.showDepends.length > 0) {
+            var _item$showDepends2;
+            isShow = (_item$showDepends2 = item.showDepends) === null || _item$showDepends2 === void 0 ? void 0 : _item$showDepends2.every(function (i) {
+              return getFieldValue(i.name) === i.value;
+            });
+          }
+          return isShow ? /*#__PURE__*/_jsx(Form.Item, {
+            name: "".concat(item.name),
+            label: item.label,
+            rules: item.rules,
+            children: /*#__PURE__*/cloneElement(item.value, dependParam)
+          }, item.name) : null;
         }
-        return isShow ? /*#__PURE__*/React.createElement(Form.Item, {
-          name: "".concat(item.name),
-          label: item.label,
-          key: item.name,
-          rules: item.rules
-        }, /*#__PURE__*/cloneElement(item.value, dependParam)) : null;
-      }) : /*#__PURE__*/React.createElement(Form.Item, {
+      }, item.name) : /*#__PURE__*/_jsx(Form.Item, {
         name: item.name,
         label: item.label,
-        key: item.name,
-        rules: item.rules
-      }, item.value);
+        rules: item.rules,
+        children: item.value
+      }, item.name);
     });
   };
 
   // 查询部分
   var renderSearch = function renderSearch() {
-    if (!formItems.length) return /*#__PURE__*/React.createElement(Form.Item, null);
+    if (!formItems.length) return /*#__PURE__*/_jsx(Form.Item, {});
     // 主条件
     var mainItems = allFormItems.filter(function (f) {
       return f.isMain;
     });
     var initFormItems = mainItems.length > 0 ? mainItems : [allFormItems[0]];
-    return /*#__PURE__*/React.createElement(React.Fragment, null, !isShowMore && renderFormItem(initFormItems), /*#__PURE__*/React.createElement(Button, {
-      type: "primary",
-      onClick: function onClick() {},
-      htmlType: "submit"
-    }, "\u67E5\u8BE2"));
+    return /*#__PURE__*/_jsxs(_Fragment, {
+      children: [!isShowMore && renderFormItem(initFormItems), /*#__PURE__*/_jsx(Button, {
+        type: "primary",
+        onClick: function onClick() {},
+        htmlType: "submit",
+        children: "\u67E5\u8BE2"
+      })]
+    });
   };
 
   // 重设尺寸,当组件位于弹框中，根据容器宽度决定显示尺寸
@@ -316,85 +345,102 @@ function SearchComponent(_ref) {
     resizeFn(size.width);
   };
   var renderMoreForm = function renderMoreForm() {
-    return /*#__PURE__*/React.createElement(ResizeObserver, {
-      onResize: onResize
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "".concat(classPrefix, "-high-form"),
-      ref: ref,
-      style: {
-        maxHeight: isShowMore ? 500 : 0,
-        overflow: 'hidden'
-      }
-    }, /*#__PURE__*/React.createElement(Form, {
-      initialValues: formInitValues,
-      form: form,
-      onFinish: onSearch,
-      layout: "horizontal"
-    }, /*#__PURE__*/React.createElement(Row, {
-      gutter: 16
-    }, allFormItems.map(function (item) {
-      return item.depends || item.showDepends ? /*#__PURE__*/React.createElement(Form.Item, {
-        noStyle: true,
-        key: item.name,
-        shouldUpdate: function shouldUpdate(l, n) {
-          var _item$depends3, _item$showDepends3;
-          return ((_item$depends3 = item.depends) === null || _item$depends3 === void 0 ? void 0 : _item$depends3.some(function (i) {
-            return l[i] !== n[i];
-          })) || ((_item$showDepends3 = item.showDepends) === null || _item$showDepends3 === void 0 ? void 0 : _item$showDepends3.some(function (i) {
-            return l[i.name] !== n[i.name];
-          })) || false;
-        }
-      }, function (_ref3) {
-        var _item$depends4;
-        var getFieldValue = _ref3.getFieldValue;
-        var dependParam = {};
-        (_item$depends4 = item.depends) === null || _item$depends4 === void 0 ? void 0 : _item$depends4.forEach(function (i) {
-          var value = getFieldValue(i);
-          dependParam[i] = value;
-        });
-        var isShow = true;
-        if (item.showDepends && item.showDepends.length > 0) {
-          var _item$showDepends4;
-          isShow = (_item$showDepends4 = item.showDepends) === null || _item$showDepends4 === void 0 ? void 0 : _item$showDepends4.every(function (i) {
-            return getFieldValue(i.name) === i.value;
-          });
-        }
-        return isShow ? /*#__PURE__*/React.createElement(Col, {
-          span: colSpan
-        }, /*#__PURE__*/React.createElement(Form.Item, {
-          className: "".concat(classPrefix, "-form-label"),
-          label: item.label,
-          name: item.name,
-          rules: item.rules
-        }, /*#__PURE__*/cloneElement(item.value, dependParam))) : null;
-      }) : /*#__PURE__*/React.createElement(Col, {
-        span: colSpan,
-        key: item.name
-      }, /*#__PURE__*/React.createElement(Form.Item, {
-        className: "".concat(classPrefix, "-form-label"),
-        rules: item.rules,
-        label: item.label,
-        name: item.name
-      }, item.value));
-    })))));
+    return /*#__PURE__*/_jsx(ResizeObserver, {
+      onResize: onResize,
+      children: /*#__PURE__*/_jsx("div", {
+        className: "".concat(classPrefix, "-high-form"),
+        ref: ref,
+        style: {
+          maxHeight: isShowMore ? 500 : 0,
+          overflow: 'hidden'
+        },
+        children: /*#__PURE__*/_jsx(Form, {
+          initialValues: formInitValues,
+          form: form,
+          onFinish: onSearch,
+          layout: "horizontal",
+          children: /*#__PURE__*/_jsx(Row, {
+            gutter: 16,
+            style: {
+              justifyContent: 23 / colSpan > allFormItems.length ? 'flex-end' : 'flex-start'
+            },
+            children: allFormItems.map(function (item) {
+              return item.depends || item.showDepends ? /*#__PURE__*/_jsx(Form.Item, {
+                noStyle: true,
+                shouldUpdate: function shouldUpdate(l, n) {
+                  var _item$depends3, _item$showDepends3;
+                  return ((_item$depends3 = item.depends) === null || _item$depends3 === void 0 ? void 0 : _item$depends3.some(function (i) {
+                    return l[i] !== n[i];
+                  })) || ((_item$showDepends3 = item.showDepends) === null || _item$showDepends3 === void 0 ? void 0 : _item$showDepends3.some(function (i) {
+                    return l[i.name] !== n[i.name];
+                  })) || false;
+                },
+                children: function children(_ref3) {
+                  var _item$depends4;
+                  var getFieldValue = _ref3.getFieldValue;
+                  var dependParam = {};
+                  (_item$depends4 = item.depends) === null || _item$depends4 === void 0 ? void 0 : _item$depends4.forEach(function (i) {
+                    var value = getFieldValue(i);
+                    dependParam[i] = value;
+                  });
+                  var isShow = true;
+                  if (item.showDepends && item.showDepends.length > 0) {
+                    var _item$showDepends4;
+                    isShow = (_item$showDepends4 = item.showDepends) === null || _item$showDepends4 === void 0 ? void 0 : _item$showDepends4.every(function (i) {
+                      return getFieldValue(i.name) === i.value;
+                    });
+                  }
+                  return isShow ? /*#__PURE__*/_jsx(Col, {
+                    span: colSpan,
+                    children: /*#__PURE__*/_jsx(Form.Item, {
+                      className: "".concat(classPrefix, "-form-label"),
+                      label: item.label,
+                      name: item.name,
+                      rules: item.rules,
+                      children: /*#__PURE__*/cloneElement(item.value, dependParam)
+                    })
+                  }) : null;
+                }
+              }, item.name) : /*#__PURE__*/_jsx(Col, {
+                span: colSpan,
+                children: /*#__PURE__*/_jsx(Form.Item, {
+                  className: "".concat(classPrefix, "-form-label"),
+                  rules: item.rules,
+                  label: item.label,
+                  name: item.name,
+                  children: item.value
+                })
+              }, item.name);
+            })
+          })
+        })
+      })
+    });
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    style: {
-      padding: 16,
-      background: '#fff'
-    }
-  }, hasMore && renderMoreForm(), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-header")
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-toolbar")
-  }, toolbar), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-form")
-  }, /*#__PURE__*/React.createElement(Form, {
-    initialValues: formInitValues,
-    form: form,
-    onFinish: onSearch,
-    layout: "inline",
-    labelWrap: false
-  }, renderSearch()), renderOperation))));
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: /*#__PURE__*/_jsxs("div", {
+      style: {
+        padding: 16,
+        background: '#fff'
+      },
+      children: [(hasMore || expandForm) && renderMoreForm(), /*#__PURE__*/_jsxs("div", {
+        className: "".concat(classPrefix, "-header"),
+        children: [/*#__PURE__*/_jsx("div", {
+          className: "".concat(classPrefix, "-toolbar"),
+          children: toolbar
+        }), /*#__PURE__*/_jsxs("div", {
+          className: "".concat(classPrefix, "-form"),
+          children: [/*#__PURE__*/_jsx(Form, {
+            initialValues: formInitValues,
+            form: form,
+            onFinish: onSearch,
+            layout: "inline",
+            labelWrap: false,
+            children: renderSearch()
+          }), renderOperation]
+        })]
+      }), children]
+    })
+  });
 }
 export default SearchComponent;

package/es/pro-tabs/index.d.ts

@@ -1,8 +1,7 @@
 import { TabsProps } from 'antd';
-import React from 'react';
 import './index.less';
 interface PropsType {
     children: TabsProps;
 }
-declare const _default: ({ children }: PropsType) => React.JSX.Element;
+declare const _default: ({ children }: PropsType) => import("react/jsx-runtime").JSX.Element;
 export default _default;