@zgfe/modules-page 1.0.1-alpha.15 → 1.0.1-alpha.17

package/dist/esm/components/searchPanel/util.d.ts

@@ -1,4 +1,4 @@
-import { BizSelectTypes } from '@zgfe/business-lib';
+import { AttrConditionTypes, BizSelectTypes } from '@zgfe/business-lib';
 import { FormValue, SearchValue } from './types';
 export declare const formValue: (source?: SearchValue, userGroupList?: BizSelectTypes.Option[]) => FormValue;
 export declare const formatValue: (source: FormValue) => {
@@ -6,5 +6,5 @@ export declare const formatValue: (source: FormValue) => {
     pageTitle: string | undefined;
     pageUrl: string | undefined;
     pageGroup: number | undefined;
-    filters: import("@zgfe/business-lib").AttrConditionTypes.GroupValue | undefined;
+    filters: AttrConditionTypes.GroupValue | undefined;
 };

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

@@ -1,5 +1,6 @@
 import { util } from '@zgfe/business-lib';
 import _ from 'lodash';
+import { OperateTypes } from '@zgfe/business-lib/es/attrConditions/types';
 export var formValue = function formValue(source, userGroupList) {
   var data = _.cloneDeep(source) || {};
   // 用户群变形
@@ -39,19 +40,51 @@ export var formatValue = function formatValue(source) {
       item.forEach(function (cItem) {
         var name = '';
         if (!cItem || !cItem.length) return;
-        name = "".concat(cItem[1].id, ":").concat(cItem[2].layerLabelName || cItem[2].layerLabelId);
+        name = "".concat(cItem[1].id, ":").concat(cItem[2].layerLabelId);
         childGroup.push(name);
       });
       group.push(childGroup);
     } else {
-      group.push((item === null || item === void 0 ? void 0 : item.id) || 0);
+      if (!item) return;
+      group.push(item.id);
     }
   });
+  var filters = undefined;
+  if (data.filters) {
+    var conditions = getConditionList(data.filters.conditions);
+    if (conditions) {
+      filters = {
+        conditions: conditions,
+        relation: 'and'
+      };
+    }
+  }
   return {
     userGroup: group.length ? group : [0],
     pageTitle: (_data$page = data.page) === null || _data$page === void 0 ? void 0 : _data$page.pageTitle,
     pageUrl: (_data$page2 = data.page) === null || _data$page2 === void 0 ? void 0 : _data$page2.pageUrl,
     pageGroup: (_data$page3 = data.page) === null || _data$page3 === void 0 ? void 0 : _data$page3.pageGroup,
-    filters: data.filters
+    filters: filters
   };
-};
+};
+
+/**
+ * 筛选条件当未选择值时，不查询
+ * @param condition 筛选条件数组
+ * @returns
+ */
+function getConditionList(condition) {
+  if (!condition) return;
+  var conditionList = [];
+  condition.forEach(function (item) {
+    if (!item.attrId && !item.attrName) return;
+    if (!item.values || !item.values.length) {
+      if (item.operator === OperateTypes.IsNotNull || item.operator === OperateTypes.IsNull) {
+        conditionList.push(item);
+      }
+    } else {
+      conditionList.push(item);
+    }
+  });
+  return conditionList.length ? conditionList : undefined;
+}

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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-page",
-  "version": "1.0.1-alpha.15",
+  "version": "1.0.1-alpha.17",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -39,7 +39,7 @@
     "@types/lodash": "^4.14.197",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.81-page.0",
+    "@zgfe/business-lib": "1.1.81-page.3",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "father": "^4.0.0-rc.2",
@@ -50,5 +50,5 @@
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "ef09fb9da4dd17243d667d1a5bc0950bcc55619a"
+  "gitHead": "ec25eecbfc957817643b49e2df5d8f03e14463e4"
 }