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

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, {

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

@@ -99,6 +99,12 @@
     }
   }
 
+  .ant-input-status-error {
+    &:focus {
+      border-color: #fb5547 !important;
+    }
+  }
+
   .biz-select-handle-input {
     .ant-input {
       border-color: @background-color-base !important;

package/es/modules/companySetting/index.less

@@ -20,6 +20,7 @@
   }
 
   .company-setting-tabs {
+    height: calc(100% - 78px);
     margin: 16px;
     background: #fff !important;
     border-radius: 8px;
@@ -38,7 +39,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 {
@@ -113,6 +117,12 @@
     }
   }
 
+  .ant-input-status-error {
+    &:focus {
+      border-color: #fb5547 !important;
+    }
+  }
+
   .biz-select-handle-input {
     .ant-input {
       border-color: @background-color-base !important;

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,7 +55,6 @@
 
       &:focus {
         border-color: @primary-color !important;
-        box-shadow: #f55858 !important;
       }
     }
 
@@ -273,8 +272,6 @@
 
 .user-dialog-content {
   .ant-input {
-    border: 1px solid #fafafb;
-
     &:focus {
       border-color: @primary-color !important;
     }
@@ -282,14 +279,20 @@
 
   .biz-select-handle-input {
     .ant-input {
-      border-color: @background-color-base !important;
+      border-color: none !important;
 
       &:focus {
-        border-color: @background-color-base !important;
+        border-color: none !important;
       }
     }
   }
 
+  .ant-input-status-error {
+    &:focus {
+      border-color: #fb5547 !important;
+    }
+  }
+
   .ant-form-item:last-of-type {
     margin-bottom: 0;
   }

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

@@ -335,6 +335,11 @@ var UserGroup = function UserGroup(props) {
   })), !isAdmin && /*#__PURE__*/React.createElement(Form.Item, {
     name: 'accountStatus',
     label: "\u72B6\u6001",
+    style: {
+      height: '24px',
+      display: 'flex',
+      alignItems: 'flex-end'
+    },
     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-role22",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [