@ccs-ui/rc-pro 1.0.7-rc.13 → 1.0.7-rc.15

package/es/pro-table/index.js

@@ -572,7 +572,6 @@ var ProTable = function ProTable(props) {
     columns: columns,
     formItems: formItems,
     expandForm: expandForm,
-    hasMore: formItems.length > 1,
     formInitValues: formInitValues,
     isInModalOrDrawer: isInModalOrDrawer,
     event$: event$,

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

@@ -14,5 +14,5 @@ interface PropsType<T> extends Pick<CcsProTableProps<T>, 'toolbar' | 'formItems'
     event$: EventEmitter<any>;
 }
 /** 操作按钮、查询，重置、列筛选、 */
-declare function SearchComponent<T>({ form, toolbar, columns, hasMore, expandForm, formItems, formInitValues, isInModalOrDrawer, event$, onReset, onSearch, }: PropsType<T>): React.JSX.Element;
+declare function SearchComponent<T>({ form, toolbar, columns, expandForm, formItems, formInitValues, isInModalOrDrawer, event$, onReset, onSearch, }: PropsType<T>): React.JSX.Element;
 export default SearchComponent;

package/es/pro-table/search.js

@@ -42,7 +42,6 @@ function SearchComponent(_ref) {
   var form = _ref.form,
     toolbar = _ref.toolbar,
     columns = _ref.columns,
-    hasMore = _ref.hasMore,
     expandForm = _ref.expandForm,
     _ref$formItems = _ref.formItems,
     formItems = _ref$formItems === void 0 ? [] : _ref$formItems,
@@ -68,6 +67,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 +104,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) {

package/es/pro-tabs/index.js

@@ -16,7 +16,8 @@ export default (function (_ref) {
     _ref2$items = _ref2.items,
     items = _ref2$items === void 0 ? [] : _ref2$items,
     activeKey = _ref2.activeKey,
-    defaultActiveKey = _ref2.defaultActiveKey;
+    defaultActiveKey = _ref2.defaultActiveKey,
+    onChange = _ref2.onChange;
   var _useState = useState(function () {
       return {
         activeKey: defaultActiveKey || (items[0] || {}).key,
@@ -52,6 +53,7 @@ export default (function (_ref) {
           $set: key
         }
       }));
+      if (onChange) onChange(key);
     };
   }
 
@@ -70,6 +72,7 @@ export default (function (_ref) {
       updateParams.activeKey = {
         $set: key
       };
+      if (onChange) onChange(key);
     }
 
     // 更新禁用或启用tab

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.0.7-rc.13",
+  "version": "1.0.7-rc.15",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "es/index.js",