@zgfe/modules-settings 1.2.16-role.8 → 1.2.16

package/es/modules/companySetting/demo.js

@@ -6,7 +6,7 @@ import util from '../../utils/util';
 import { CompanySetting } from '../..';
 export default (function () {
   return /*#__PURE__*/React.createElement(DemoWrapper, {
-    defaultApp: 99677
+    defaultApp: 348
   }, /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
     value: {
       funPermissions: funPermissions,

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

@@ -15,7 +15,6 @@ 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 React, { useEffect, useState, useContext } from 'react';
-import { BizUserCondition } from '@zgfe/business-lib';
 import './index.less';
 import util from './../../../utils/util';
 import { Button, Drawer, Form, Input, Radio, Spin, Table, Tooltip, Tree, notification } from 'antd';
@@ -110,14 +109,6 @@ var RoleList = function RoleList(props) {
     _useState34 = _slicedToArray(_useState33, 2),
     usList = _useState34[0],
     setUsList = _useState34[1];
-  var _useState35 = useState(false),
-    _useState36 = _slicedToArray(_useState35, 2),
-    isRoleAuthStatus = _useState36[0],
-    setIsRoleAuthStatus = _useState36[1];
-  var _useState37 = useState([]),
-    _useState38 = _slicedToArray(_useState37, 2),
-    condition = _useState38[0],
-    setCondition = _useState38[1];
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -249,7 +240,7 @@ var RoleList = function RoleList(props) {
   var queryRoleDetailsList = function queryRoleDetailsList(params) {
     queryRoleDetails(params).then(function (res) {
       if (res === null || res === void 0 ? void 0 : res.data) {
-        var _res$data5, _res$data7, _res$data8;
+        var _res$data5, _res$data6;
         var usListArr = usList === null || usList === void 0 ? void 0 : usList.filter(function (item1) {
           var _res$data3;
           return res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.appIds.some(function (item2) {
@@ -262,14 +253,7 @@ var RoleList = function RoleList(props) {
             return item2 === (item1 === null || item1 === void 0 ? void 0 : item1.id);
           });
         });
-        if (res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.roleAuthStatus) {
-          var _res$data6, _arr$, _arr$2;
-          setIsRoleAuthStatus(true);
-          var arr = [res === null || res === void 0 ? void 0 : (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.authGroupList];
-          console.log('detail == arr', arr);
-          setCondition(util.isString((_arr$ = arr[0]) === null || _arr$ === void 0 ? void 0 : _arr$.json) ? JSON.parse((_arr$2 = arr[0]) === null || _arr$2 === void 0 ? void 0 : _arr$2.json) : []);
-        }
-        onChangeAppIds(usListArr, params === null || params === void 0 ? void 0 : params.id, res === null || res === void 0 ? void 0 : (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.menuCodeMap, res === null || res === void 0 ? void 0 : (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : _res$data8.settingMenuList);
+        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) {
             return {
@@ -298,9 +282,9 @@ var RoleList = function RoleList(props) {
       systemVersion: systemVersion
     }).then(function (res) {
       if (res === null || res === void 0 ? void 0 : res.data) {
-        var _arr$3;
+        var _arr$;
         var arr = util.menuTreeData([res === null || res === void 0 ? void 0 : res.data]);
-        setFunctionList(((_arr$3 = arr[0]) === null || _arr$3 === void 0 ? void 0 : _arr$3.children) ? arr : []);
+        setFunctionList(((_arr$ = arr[0]) === null || _arr$ === void 0 ? void 0 : _arr$.children) ? arr : []);
       }
     }).catch(function (err) {
       setFunctionList([]);
@@ -448,15 +432,6 @@ 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: JSON.stringify({
-          color: '#8db3e2',
-          name: 0,
-          groupType: 0,
-          json: 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;
       })
@@ -490,9 +465,6 @@ var RoleList = function RoleList(props) {
       });
     });
   };
-  function onChangeCondition(condition) {
-    setCondition(condition);
-  }
   return /*#__PURE__*/React.createElement(Spin, {
     spinning: loading
   }, /*#__PURE__*/React.createElement("div", {
@@ -524,8 +496,7 @@ var RoleList = function RoleList(props) {
       setRoleId(null);
       form.resetFields();
       form.setFieldsValue({
-        isEncryption: 0,
-        roleAuthStatus: 0
+        isEncryption: 0
       });
       queryRoleDataConfigList(null);
       queryRoleUserList(null);
@@ -675,58 +646,6 @@ var RoleList = function RoleList(props) {
     autoExpandParent: true,
     treeData: functionList
   }))), /*#__PURE__*/React.createElement(Form.Item, {
-    name: 'roleAuthStatus',
-    className: "is-encryption",
-    label: /*#__PURE__*/React.createElement(React.Fragment, null, "\u6570\u636E\u8303\u56F4", /*#__PURE__*/React.createElement(Tooltip, {
-      overlayStyle: {
-        maxWidth: 396
-      },
-      overlayInnerStyle: {
-        color: '#FFF',
-        fontSize: 14,
-        fontWeight: 400,
-        letterSpacing: 0.56
-      },
-      placement: "top",
-      title: '数据范围'
-    }, /*#__PURE__*/React.createElement("i", {
-      style: {
-        fontSize: 16,
-        margin: '0 24px 0 8px'
-      },
-      className: "bsicon tishi"
-    }))),
-    rules: [{
-      required: true,
-      message: '请选择'
-    }]
-  }, /*#__PURE__*/React.createElement(Radio.Group, {
-    buttonStyle: "outline",
-    onChange: function onChange(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"))), 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, {
-    openCdpCondition: true,
-    openBusinessDataCondition: true,
-    openOrderDataCondition: true,
-    openTagCondition: true,
-    defaultValue: condition,
-    onChange: onChangeCondition,
-    orConditionNum: 3,
-    andConditionNum: 8,
-    eventAttrNum: 3,
-    isRealTime: true
-  })) : null, /*#__PURE__*/React.createElement(Form.Item, {
     name: 'isEncryption',
     className: "is-encryption",
     label: /*#__PURE__*/React.createElement(React.Fragment, null, "\u6570\u636E\u52A0\u5BC6", /*#__PURE__*/React.createElement(Tooltip, {

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

@@ -102,24 +102,6 @@
 }
 
 .role-dialog-content {
-  .group-config {
-    display: flex;
-    margin-bottom: 24px;
-    padding-left: 120px;
-
-    .config-name {
-      margin-right: 12px;
-      color: #5f6085;
-      font-size: 14px;
-      line-height: 30px;
-      white-space: nowrap;
-    }
-
-    .biz-user-condition-type-label {
-      margin-left: -7px;
-    }
-  }
-
   .ant-form-item {
     .ant-form-item-control-input {
       width: 484px;

package/es/modules/companySetting/user/invite.js

@@ -26,8 +26,7 @@ var UserGroup = function UserGroup(props) {
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var _useContext = useContext(BizGlobalDataContext),
-    authority = _useContext.authority,
-    isDemo = _useContext.isDemo;
+    authority = _useContext.authority;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     queryParams = _useState2[0],
@@ -295,8 +294,8 @@ var UserGroup = function UserGroup(props) {
       required: true,
       message: '请输入账号'
     }, {
-      pattern: isDemo ? /^[a-z0-9._@]{5,30}$/ : /^1[3-9]\d{8,9}$/,
-      message: isDemo ? '请输入5～30个字符，可包含小写字母和数字、特殊字符(_.@)' : '手机号格式错误'
+      pattern: window.location.hostname === 'demo.zhugeio.com' || window.location.hostname === 'ucb-demo.zhugeio.com' ? /^[a-z0-9._@]{5,30}$/ : /^1[3-9]\d{8,9}$/,
+      message: window.location.hostname === 'demo.zhugeio.com' || window.location.hostname === 'ucb-demo.zhugeio.com' ? '请输入5～30个字符，可包含小写字母和数字、特殊字符(_.@)' : '手机号格式错误'
     }]
   }, /*#__PURE__*/React.createElement(Input, {
     disabled: (userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id) !== undefined,

package/es/requests/role.d.ts

@@ -9,8 +9,6 @@ export declare const queryRolePage: (data: {
     userIds: number[];
     menuCodeMap: {};
     settingMenuList: [];
-    authGroupList: [];
-    roleAuthStatus: number;
 }> | null>, queryRoleDataConfig: (data: {
     id: number | null;
 }) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, queryRoleMenuTree: (data: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.16-role.8",
+  "version": "1.2.16",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -51,7 +51,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "86a68f47109652de6c364096441ebb2229a1f8aa",
+  "gitHead": "2e06635975cd56d952aba66b69cfc1e060d5a988",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }