@zgfe/modules-page 1.0.1-alpha.14 → 1.0.1-alpha.16

package/dist/esm/components/searchPanel/index.js

@@ -53,7 +53,6 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
    */
   var onChange = function onChange(_changedValues, allValues) {
     setFormData(allValues);
-    console.log(formatValue(allValues), 'onChange allValues');
     props.onChange && props.onChange(formatValue(allValues));
   };
   var onAdd = function onAdd() {

package/dist/esm/components/searchPanel/util.js

@@ -43,7 +43,8 @@ export var formatValue = function formatValue(source) {
         childGroup.push(name);
       });
       group.push(childGroup);
-    } else if (item !== null && item !== void 0 && item.id) {
+    } else {
+      if (!item) return;
       group.push(item.id);
     }
   });

package/dist/esm/modules/home/demo/index.js

@@ -2,6 +2,9 @@ import React from 'react';
 import { ModulesPage } from '@zgfe/modules-page';
 import { DemoWrapper } from '@zgfe/business-lib';
 export default (function () {
+  var onClickWarn = function onClickWarn() {
+    console.log('onClickWarn');
+  };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
     defaultApp: 266
@@ -10,5 +13,7 @@ export default (function () {
       height: 750,
       overflow: 'auto'
     }
-  }, /*#__PURE__*/React.createElement(ModulesPage, null)));
+  }, /*#__PURE__*/React.createElement(ModulesPage, {
+    onClickWarn: onClickWarn
+  })));
 });

package/dist/esm/modules/home/index.js

@@ -129,10 +129,7 @@ var ModulesPage = function ModulesPage(props) {
     }
     if (type === 'pageGroup' && !(searchValue !== null && searchValue !== void 0 && searchValue.pageGroup)) return;
     if (type === 'page' || pageType === 'detail') {
-      if (!_.isEqual(originSearchValue, searchValue)) {
-        setOriginSearchValue(_.cloneDeep(searchValue));
-        fetch();
-      }
+      fetch();
     }
   }, [searchValue]);
   // 查询结果
@@ -142,6 +139,10 @@ var ModulesPage = function ModulesPage(props) {
     }
     setLoading(true);
     setTimer(setTimeout(function () {
+      if (_.isEqual(originSearchValue, searchValue)) {
+        return;
+      }
+      setOriginSearchValue(_.cloneDeep(searchValue));
       var param = _objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: 3,
@@ -191,6 +192,7 @@ var ModulesPage = function ModulesPage(props) {
     className: "".concat(classPrefix, "-top-render")
   }, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
+    disabled: loading || !result || !result.length,
     onClick: props.onClickWarn
   }, "\u8BBE\u7F6E\u6D41\u5931\u9884\u8B66"));
   if (isEmpty) return /*#__PURE__*/React.createElement(EmptyPanel, null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-page",
-  "version": "1.0.1-alpha.14",
+  "version": "1.0.1-alpha.16",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -50,5 +50,5 @@
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "a74833c61c01b230f1144fc3c745289f5a02a8ad"
+  "gitHead": "b791fde5be516ddc341c5e516c251e19ab3a6bdd"
 }