@zgfe/modules-settings 1.2.10-lmy-role21 → 1.2.10-lmy-role23

package/es/components/settingTabs/index.less

@@ -3,11 +3,14 @@
 .settings-container {
   padding: 24px;
   background: #f0f2f5;
+
   .tab-header {
     font-size: 18px;
+
     .tab-header-title {
       margin-left: 8px;
     }
+
     .app-name {
       font-weight: normal;
       font-size: 14px;

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

@@ -250,7 +250,8 @@ var DepartmentList = function DepartmentList(props) {
     className: "department-list"
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     style: {
-      marginTop: '8px'
+      marginTop: '8px',
+      marginLeft: '2px'
     }
   }, /*#__PURE__*/React.createElement(Input, {
     prefix: /*#__PURE__*/React.createElement(IconFont, {
@@ -267,7 +268,7 @@ var DepartmentList = function DepartmentList(props) {
     placeholder: '请输入部门名称'
   }))), /*#__PURE__*/React.createElement("div", {
     className: "app-list-head"
-  }, /*#__PURE__*/React.createElement("div", null, "\u90E8\u95E8\u5217\u8868", name), /*#__PURE__*/React.createElement(Button, {
+  }, /*#__PURE__*/React.createElement("div", null, "\u90E8\u95E8\u5217\u8868"), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     disabled: !authority[10096],
     onClick: function onClick() {

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

@@ -92,13 +92,17 @@
 
 .department-dialog-content {
   .ant-input {
-    border: 1px solid #fafafb;
+    border-color: @background-color-base !important;
 
     &:focus {
       border-color: @primary-color !important;
     }
   }
 
+  .ant-select-selector {
+    border-color: @background-color-base !important;
+  }
+
   .biz-select-handle-input {
     .ant-input {
       border-color: @background-color-base !important;
@@ -107,14 +111,41 @@
         border-color: @background-color-base !important;
       }
     }
+
+    &:focus {
+      border-color: @primary-color !important;
+    }
   }
 
-  .ant-form-item:last-of-type {
-    margin-bottom: 0;
+  .ant-input-status-error {
+    border: 1px solid #fb5547 !important;
+
+    &:focus {
+      border-color: #fb5547 !important;
+    }
   }
 
-  .ant-select-selector {
-    padding: 0 6px 0 8px !important;
+  .ant-select-status-error {
+    border: none !important;
+
+    &:focus {
+      box-shadow: 0 0 0 2px rgba(251, 85, 71, 0.2) !important;
+    }
+  }
+
+  .biz-select-handle-status-error.active:not(.disable) {
+    box-shadow: 0 0 0 2px rgba(251, 85, 71, 0.2) !important;
+  }
+
+  .biz-select-handle-status-error {
+    .ant-input.ant-input-status-error:focus:not(.ant-input-disable):not(.ant-input-borderless),
+    .ant-input.ant-input-status-error-focused:not(.ant-input-disable):not(.ant-input-borderless) {
+      box-shadow: none !important;
+    }
+  }
+
+  .ant-form-item:last-of-type {
+    margin-bottom: 0;
   }
 
   color: #5f6085;

package/es/modules/companySetting/index.less

@@ -20,6 +20,8 @@
   }
 
   .company-setting-tabs {
+    height: calc(100% - 78px);
+    min-height: 800px;
     margin: 16px;
     background: #fff !important;
     border-radius: 8px;
@@ -38,7 +40,7 @@
   }
 
   .ant-tabs-content {
-    padding: 0 24px;
+    padding: 0 24px 24px;
   }
 
   .setting-tab {

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

@@ -350,6 +350,11 @@ var RoleList = function RoleList(props) {
         label: '通用版本',
         id: 1
       }, roleId);
+      form.setFieldsValue({
+        systemVersion: {
+          id: 1
+        }
+      });
       setMenuCodeMap({
         map1: codeMap['1'] || codeMap.map1,
         map2: codeMap['2'] || codeMap.map2,
@@ -362,6 +367,11 @@ var RoleList = function RoleList(props) {
           label: '通用版本',
           id: 1
         }, roleId);
+        form.setFieldsValue({
+          systemVersion: {
+            id: 1
+          }
+        });
         setMenuCodeMap({
           map1: codeMap['1'] || codeMap.map1,
           map2: [],
@@ -374,6 +384,11 @@ var RoleList = function RoleList(props) {
           label: '城商行',
           id: 2
         }, roleId);
+        form.setFieldsValue({
+          systemVersion: {
+            id: 2
+          }
+        });
         setMenuCodeMap({
           map1: [],
           map2: codeMap['2'] || codeMap.map2,
@@ -450,7 +465,8 @@ var RoleList = function RoleList(props) {
     className: "role-list"
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     style: {
-      marginTop: '8px'
+      marginTop: '8px',
+      marginLeft: '2px'
     }
   }, /*#__PURE__*/React.createElement(Input, {
     prefix: /*#__PURE__*/React.createElement(IconFont, {
@@ -487,6 +503,15 @@ var RoleList = function RoleList(props) {
     width: 1220,
     className: "add-drawer",
     closable: true,
+    closeIcon: /*#__PURE__*/React.createElement("i", {
+      style: {
+        fontSize: 24,
+        marginRight: 0,
+        color: '#021429',
+        fontWeight: 'normal'
+      },
+      className: "bsicon qingchu"
+    }),
     footerStyle: {
       border: 'none',
       padding: '24px',

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

@@ -95,6 +95,10 @@
   .ant-drawer-header-title {
     flex-direction: row-reverse;
   }
+
+  .ant-drawer-close {
+    margin-right: 0 !important;
+  }
 }
 
 .role-dialog-content {
@@ -106,13 +110,17 @@
   }
 
   .ant-input {
-    border: 1px solid @background-color-base;
+    border-color: @background-color-base !important;
 
     &:focus {
       border-color: @primary-color !important;
     }
   }
 
+  .ant-select-selector {
+    border-color: @background-color-base !important;
+  }
+
   .biz-select-handle-input {
     .ant-input {
       border-color: @background-color-base !important;
@@ -121,6 +129,37 @@
         border-color: @background-color-base !important;
       }
     }
+
+    &:focus {
+      border-color: @primary-color !important;
+    }
+  }
+
+  .ant-input-status-error {
+    border: 1px solid #fb5547 !important;
+
+    &:focus {
+      border-color: #fb5547 !important;
+    }
+  }
+
+  .ant-select-status-error {
+    border: none !important;
+
+    &:focus {
+      box-shadow: 0 0 0 2px rgba(251, 85, 71, 0.2) !important;
+    }
+  }
+
+  .biz-select-handle-status-error.active:not(.disable) {
+    box-shadow: 0 0 0 2px rgba(251, 85, 71, 0.2) !important;
+  }
+
+  .biz-select-handle-status-error {
+    .ant-input.ant-input-status-error:focus:not(.ant-input-disable):not(.ant-input-borderless),
+    .ant-input.ant-input-status-error-focused:not(.ant-input-disable):not(.ant-input-borderless) {
+      box-shadow: none !important;
+    }
   }
 
   .ant-form-item:last-of-type {

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

@@ -393,6 +393,7 @@ var User = function User(props) {
   }, {
     title: '操作',
     with: 334,
+    fixed: 'right',
     render: function render(data) {
       return /*#__PURE__*/React.createElement("div", {
         className: "operate"

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

@@ -55,10 +55,13 @@
 
       &:focus {
         border-color: @primary-color !important;
-        box-shadow: #f55858 !important;
       }
     }
 
+    .ant-select-selector {
+      border-color: @background-color-base !important;
+    }
+
     > div {
       display: flex;
       gap: 12px;
@@ -273,13 +276,17 @@
 
 .user-dialog-content {
   .ant-input {
-    border: 1px solid #fafafb;
+    border-color: @background-color-base !important;
 
     &:focus {
       border-color: @primary-color !important;
     }
   }
 
+  .ant-select-selector {
+    border-color: @background-color-base !important;
+  }
+
   .biz-select-handle-input {
     .ant-input {
       border-color: @background-color-base !important;
@@ -288,6 +295,43 @@
         border-color: @background-color-base !important;
       }
     }
+
+    &:focus {
+      border-color: @primary-color !important;
+    }
+  }
+
+  .ant-input-status-error {
+    border: 1px solid #fb5547 !important;
+
+    &:focus {
+      border-color: #fb5547 !important;
+    }
+  }
+
+  .account-status {
+    .ant-form-item-row {
+      height: 24px;
+    }
+  }
+
+  .ant-select-status-error {
+    border: none !important;
+
+    &:focus {
+      box-shadow: 0 0 0 2px rgba(251, 85, 71, 0.2) !important;
+    }
+  }
+
+  .biz-select-handle-status-error.active:not(.disable) {
+    box-shadow: 0 0 0 2px rgba(251, 85, 71, 0.2) !important;
+  }
+
+  .biz-select-handle-status-error {
+    .ant-input.ant-input-status-error:focus:not(.ant-input-disable):not(.ant-input-borderless),
+    .ant-input.ant-input-status-error-focused:not(.ant-input-disable):not(.ant-input-borderless) {
+      box-shadow: none !important;
+    }
   }
 
   .ant-form-item:last-of-type {
@@ -295,6 +339,8 @@
   }
 
   .no-rules-label {
+    margin-bottom: 20px;
+
     .ant-form-item-label {
       width: 50px !important;
     }

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

@@ -12,7 +12,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState, useContext } from 'react';
 import './index.less';
-import { Button, Form, Input, notification, Radio, TreeSelect } from 'antd';
+import { Button, Form, Input, notification, Radio, Select, TreeSelect } from 'antd';
 import request from './../../../utils/ajax';
 import apis from './../../../constants/api';
 import { BizDialog, BizSelect, BizGlobalDataContext } from '@zgfe/business-lib';
@@ -231,16 +231,29 @@ var UserGroup = function UserGroup(props) {
       }));
     },
     placeholder: '请输入姓名'
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u89D2\u8272"), /*#__PURE__*/React.createElement(BizSelect, {
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u89D2\u8272"), /*#__PURE__*/React.createElement(Select, {
     options: userList,
     placeholder: '请选择角色',
-    labelField: "roleName",
-    keyField: "id",
+    fieldNames: {
+      label: 'roleName',
+      value: 'id'
+    },
+    style: {
+      width: '248px'
+    },
+    allowClear: true,
     onChange: function onChange(e) {
       setQueryParams(_objectSpread(_objectSpread({}, queryParams), {}, {
-        roleId: e === null || e === void 0 ? void 0 : e.id
+        roleId: e
       }));
-    }
+    },
+    suffixIcon: /*#__PURE__*/React.createElement("i", {
+      style: {
+        fontSize: 14,
+        color: '#5f6085'
+      },
+      className: "bsicon xiangxia"
+    })
   }))), /*#__PURE__*/React.createElement("div", {
     className: "invite-list"
   }, /*#__PURE__*/React.createElement("div", null, "\u6210\u5458\u5217\u8868"), /*#__PURE__*/React.createElement(Button, {
@@ -335,6 +348,7 @@ var UserGroup = function UserGroup(props) {
   })), !isAdmin && /*#__PURE__*/React.createElement(Form.Item, {
     name: 'accountStatus',
     label: "\u72B6\u6001",
+    className: "account-status",
     rules: [{
       required: true,
       message: '请选择状态'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.10-lmy-role21",
+  "version": "1.2.10-lmy-role23",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [