@zgfe/modules-settings 1.2.16-role.0 → 1.2.16-role.1

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

@@ -112,8 +112,8 @@ var RoleList = function RoleList(props) {
     setUsList = _useState34[1];
   var _useState35 = useState(false),
     _useState36 = _slicedToArray(_useState35, 2),
-    isDataRange = _useState36[0],
-    setIsDataRange = _useState36[1];
+    isRoleAuthStatus = _useState36[0],
+    setIsRoleAuthStatus = _useState36[1];
   var _useState37 = useState([]),
     _useState38 = _slicedToArray(_useState37, 2),
     condition = _useState38[0],
@@ -262,6 +262,9 @@ var RoleList = function RoleList(props) {
             return item2 === (item1 === null || item1 === void 0 ? void 0 : item1.id);
           });
         });
+        // if (res && res.data && res.data.json) {
+        //   setCondition(res?.data?.json);
+        // }
         onChangeAppIds(usListArr, params === null || params === void 0 ? void 0 : params.id, res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.menuCodeMap, res === null || res === void 0 ? void 0 : (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.settingMenuList);
         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) {
@@ -441,6 +444,10 @@ var RoleList = function RoleList(props) {
       menuCodeMap: (_menuCodeMap = {}, _defineProperty(_menuCodeMap, 1, _toConsumableArray(new Set([].concat(_toConsumableArray(menuCodeMap.map1), _toConsumableArray(unionArray))))), _defineProperty(_menuCodeMap, 2, _toConsumableArray(new Set([].concat(_toConsumableArray(menuCodeMap.map2), _toConsumableArray(unionArray))))), _menuCodeMap),
       appIds: (usList === null || usList === void 0 ? void 0 : usList.length) === (value === null || value === void 0 ? void 0 : (_value$appIds2 = value.appIds) === null || _value$appIds2 === void 0 ? void 0 : _value$appIds2.length) ? [0].concat(_toConsumableArray(appIdsList)) : appIdsList,
       systemVersion: appVersionFl ? 0 : 1,
+      authInfoParam: {
+        platform: 0,
+        data: condition
+      },
       userIds: value === null || value === void 0 ? void 0 : (_value$userIds = value.userIds) === null || _value$userIds === void 0 ? void 0 : _value$userIds.map(function (item) {
         return item === null || item === void 0 ? void 0 : item.id;
       })
@@ -475,7 +482,6 @@ var RoleList = function RoleList(props) {
     });
   };
   function onChangeCondition(condition) {
-    console.log('condition', condition);
     setCondition(condition);
   }
   return /*#__PURE__*/React.createElement(Spin, {
@@ -510,7 +516,7 @@ var RoleList = function RoleList(props) {
       form.resetFields();
       form.setFieldsValue({
         isEncryption: 0,
-        dataRange: 0
+        roleAuthStatus: 0
       });
       queryRoleDataConfigList(null);
       queryRoleUserList(null);
@@ -660,7 +666,7 @@ var RoleList = function RoleList(props) {
     autoExpandParent: true,
     treeData: functionList
   }))), /*#__PURE__*/React.createElement(Form.Item, {
-    name: 'dataRange',
+    name: 'roleAuthStatus',
     className: "is-encryption",
     label: /*#__PURE__*/React.createElement(React.Fragment, null, "\u6570\u636E\u8303\u56F4", /*#__PURE__*/React.createElement(Tooltip, {
       overlayStyle: {
@@ -688,20 +694,19 @@ var RoleList = function RoleList(props) {
   }, /*#__PURE__*/React.createElement(Radio.Group, {
     buttonStyle: "outline",
     onChange: function onChange(value) {
-      setIsDataRange(!!value.target.value);
+      setIsRoleAuthStatus(!!value.target.value);
     }
   }, /*#__PURE__*/React.createElement(Radio, {
     value: 0
   }, "\u6240\u6709\u7528\u6237"), /*#__PURE__*/React.createElement(Radio, {
     value: 1
-  }, "\u7B5B\u9009\u7528\u6237"))), isDataRange ? /*#__PURE__*/React.createElement("li", {
+  }, "\u7B5B\u9009\u7528\u6237"))), isRoleAuthStatus ? /*#__PURE__*/React.createElement("li", {
     className: "group-config condition"
   }, /*#__PURE__*/React.createElement("div", {
     className: "config-name"
   }, "\u5B9A\u4E49"), /*#__PURE__*/React.createElement("div", {
     className: "config-value"
   }), /*#__PURE__*/React.createElement(BizUserCondition, {
-    key: -1,
     openCdpCondition: true,
     openBusinessDataCondition: true,
     openOrderDataCondition: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.16-role.0",
+  "version": "1.2.16-role.1",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -38,7 +38,7 @@
     "@types/lodash": "^4.14.182",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.95",
+    "@zgfe/business-lib": "1.2.9-heyh.1",
     "@zgfe/modules-demo-manage": "^1.0.1",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
@@ -51,7 +51,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "bd4bc467d64f258aa110bf98a40f7644582bf1e9",
+  "gitHead": "8bf9dd198a6be9384eb769f6cacf55046c1c236c",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }