@zgfe/modules-settings 1.2.20-role.25 → 1.2.20-role.26

package/es/modules/companySetting/role/index.js

@@ -367,9 +367,7 @@ var RoleList = function RoleList(props) {
             groupType: item.groupType || 0,
             json: JSON.parse(item.json)
           });
-          item.isAllUser = JSON.parse(item.json) ? 0 : 1;
         });
-        console.log('authGroupList', authGroupList);
         if (authGroupList === null || authGroupList === void 0 ? void 0 : authGroupList.length) setAPPCondition(authGroupList);
         form.setFieldsValue(_objectSpread(_objectSpread({}, res === null || res === void 0 ? void 0 : res.data), {}, {
           appIds: usListArr === null || usListArr === void 0 ? void 0 : usListArr.map(function (item) {
@@ -473,6 +471,12 @@ var RoleList = function RoleList(props) {
       return item.app_id;
     }) || []);
     setSelectArr(arr);
+    // let authInfoParam = {
+    //   appId: appId,
+    //   platform: 0,
+    //   allUser: isAllUser,
+    //   data: JSON.stringify({ color: '#8db3e2', name: 0, groupType: 0, json: [] }),
+    // };
     if (arr.includes(1) && arr.includes(2) && arr.includes(3)) {
       // 三种应用都存在
       setAppVersionFl(arr.includes(1) && arr.includes(2) && arr.includes(3));
@@ -777,11 +781,9 @@ var RoleList = function RoleList(props) {
         var currentJson = appCondition.filter(function (item) {
           return item.appId === option.app_id;
         });
-        console.log('currentJson', currentJson);
         if (currentJson && currentJson.length) {
           var _currentJson$;
-          console.log('currentJson[0].allUser', currentJson[0].isAllUser);
-          setIsAllUser(currentJson[0].isAllUser);
+          setIsAllUser(currentJson[0].allUser);
           setCurrentJson(currentJson[0].data ? JSON.parse((_currentJson$ = currentJson[0]) === null || _currentJson$ === void 0 ? void 0 : _currentJson$.data).json : JSON.parse(currentJson[0].json));
         } else {
           setIsAllUser(1);
@@ -831,7 +833,6 @@ var RoleList = function RoleList(props) {
     } else {
       newAppCondition.push(authInfoParam);
     }
-    console.log('newAppCondition', newAppCondition);
     setAPPCondition(newAppCondition);
   }
   return /*#__PURE__*/React.createElement(Spin, {

package/es/modules/companySetting/role/setDataRangeDialog/index.js

@@ -18,12 +18,12 @@ var SetDataRangeDialog = function SetDataRangeDialog(props) {
     setCurrentJson(data);
   }
   function onConfirm() {
-    console.log('currentJson', currentJson);
-    console.log('isAllUser', isAllUser);
-    if (currentJson.length || !isAllUser) {
-      var res = util.validateUserCondition(currentJson);
-      if (res) return message.error(res);
+    if (!currentJson.length || isAllUser) {
+      setIsModalOpen(false);
+      return;
     }
+    var res = util.validateUserCondition(currentJson);
+    if (res) return message.error(res);
     setConditionFn(currentSelectAppInfo.app_id, currentJson, isAllUser);
     setIsModalOpen(false);
     setCurrentJson([]);
@@ -51,7 +51,7 @@ var SetDataRangeDialog = function SetDataRangeDialog(props) {
     }
   }, /*#__PURE__*/React.createElement(Radio, {
     value: 1
-  }, "\u5168\u90E8\u6570\u636E"), /*#__PURE__*/React.createElement(Radio, {
+  }, "\u5168\u90E8\u6570\u636E", isAllUser), /*#__PURE__*/React.createElement(Radio, {
     value: 0
   }, "\u7B5B\u9009\u7528\u6237")), !isAllUser ? /*#__PURE__*/React.createElement("li", {
     className: "group-config condition"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.20-role.25",
+  "version": "1.2.20-role.26",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -51,7 +51,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "b8999505f1bb6c9445fca6cc42cf6e9777a26862",
+  "gitHead": "045cfa054f72123a3b36d7914ab9c99d8efd6183",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }