@zgfe/modules-page 1.0.1-alpha.18 → 1.0.1-alpha.19

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

@@ -6,9 +6,9 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Form, Skeleton } from 'antd';
-import React, { useContext, useEffect, useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import "./index.less";
-import { BizAttrConditionGroup, BizGlobalDataContext, BizUserGroup, IconFont } from '@zgfe/business-lib';
+import { BizAttrConditionGroup, BizUserGroup, IconFont } from '@zgfe/business-lib';
 import PageSelect from "../pageSelect";
 import { formValue, formatValue } from "./util";
 var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
@@ -33,11 +33,9 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     count = _useState6[0],
     setCount = _useState6[1];
   var groupRef = useRef(null);
-  var _useContext = useContext(BizGlobalDataContext),
-    userGroupList = _useContext.userGroupList;
   useEffect(function () {
     var _data$filters;
-    var data = formValue(props.value, userGroupList);
+    var data = formValue(props.value);
     setCount(((_data$filters = data.filters) === null || _data$filters === void 0 ? void 0 : _data$filters.conditions.length) || 0);
     setFormData(data);
     setTimeout(function () {

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

@@ -1,4 +1,4 @@
-import { AttrConditionTypes, BizSelectTypes } from '@zgfe/business-lib';
+import { AttrConditionTypes } from '@zgfe/business-lib';
 export interface SearchPanelProps {
     value?: SearchValue;
     onChange?: (data: SearchValue) => void;
@@ -12,7 +12,7 @@ export interface SearchValue {
     type?: string;
 }
 export interface FormValue {
-    userGroup?: BizSelectTypes.Option;
+    userGroup?: (number | string[])[];
     page?: PageTypes;
     filters?: AttrConditionTypes.GroupValue;
 }

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

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

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

@@ -1,23 +1,7 @@
-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) {
+export var formValue = function formValue(source) {
   var data = _.cloneDeep(source) || {};
-  // 用户群变形
-  var result = [];
-  if (data.userGroup && data.userGroup.length) {
-    userGroupList === null || userGroupList === void 0 ? void 0 : userGroupList.forEach(function (user) {
-      var _data$userGroup;
-      if ((_data$userGroup = data.userGroup) !== null && _data$userGroup !== void 0 && _data$userGroup.includes(user.id)) {
-        result.push(user);
-      }
-    });
-  } else {
-    result = userGroupList ? [userGroupList[0]] : [{
-      id: 0,
-      name: '所有用户'
-    }];
-  }
   var page = {
     type: 'page',
     pageGroup: data === null || data === void 0 ? void 0 : data.pageGroup,
@@ -25,42 +9,17 @@ export var formValue = function formValue(source, userGroupList) {
     pageTitle: data === null || data === void 0 ? void 0 : data.pageTitle
   };
   return {
-    userGroup: result,
+    userGroup: data.userGroup || [0],
     page: page,
     filters: data.filters
   };
 };
 export var formatValue = function formatValue(source) {
-  var _data$userGroup2, _data$page, _data$page2, _data$page3;
+  var _data$page, _data$page2, _data$page3;
   var data = _.cloneDeep(source) || {};
-  var group = [];
-  (_data$userGroup2 = data.userGroup) === null || _data$userGroup2 === void 0 ? void 0 : _data$userGroup2.forEach(function (item) {
-    if (util.isArray(item)) {
-      var childGroup = [];
-      item.forEach(function (cItem) {
-        var name = '';
-        if (!cItem || !cItem.length) return;
-        name = "".concat(cItem[1].id, ":").concat(cItem[2].layerLabelId);
-        childGroup.push(name);
-      });
-      group.push(childGroup);
-    } else {
-      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'
-      };
-    }
-  }
+  var filters = getConditionList(data.filters);
   return {
-    userGroup: group.length ? group : [0],
+    userGroup: data.userGroup || [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,
@@ -70,13 +29,13 @@ export var formatValue = function formatValue(source) {
 
 /**
  * 筛选条件当未选择值时，不查询
- * @param condition 筛选条件数组
+ * @param filters 筛选条件数组
  * @returns
  */
-function getConditionList(condition) {
-  if (!condition) return;
+function getConditionList(filters) {
+  if (!filters || !filters.conditions) return;
   var conditionList = [];
-  condition.forEach(function (item) {
+  filters.conditions.forEach(function (item) {
     if (!item.attrId && !item.attrName) return;
     if (!item.values || !item.values.length) {
       if (item.operator === OperateTypes.IsNotNull || item.operator === OperateTypes.IsNull) {
@@ -86,5 +45,8 @@ function getConditionList(condition) {
       conditionList.push(item);
     }
   });
-  return conditionList.length ? conditionList : undefined;
+  return conditionList.length ? {
+    conditions: conditionList,
+    relation: 'and'
+  } : undefined;
 }

package/dist/esm/modules/home/types.d.ts

@@ -37,6 +37,6 @@ export declare namespace ModulesPageTypes {
 export declare const ModulesPageContext: import("react").Context<{
     pageList: ModulesPageTypes.Page[];
     pageGroupList: ModulesPageTypes.PageGroup[];
-    currentClickPage?: ModulesPageTypes.PageGroup | ModulesPageTypes.Page | undefined;
+    currentClickPage?: ModulesPageTypes.Page | ModulesPageTypes.PageGroup | undefined;
     setCurrentClickPage?: ((data: ModulesPageTypes.Page) => void) | undefined;
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-page",
-  "version": "1.0.1-alpha.18",
+  "version": "1.0.1-alpha.19",
   "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.3",
+    "@zgfe/business-lib": "1.1.81-page.7",
     "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": "059c54363fb2f5f09872aa64692c7dd892e9f624"
+  "gitHead": "9b3a155c02d5b57ae51663062fc6a6aa33a571c0"
 }