@tddc/assign-modal 3.0.2 → 3.0.4

package/es/AssignModal/AssignApp/Edit.js

@@ -965,6 +965,50 @@ var AssignModal = function AssignModal(props) {
     },
     [userList, userKeys, filterUser],
   );
+  var renderOrgItem = function renderOrgItem(item, lang) {
+    var mapResult = {
+      1: {
+        cn: '职能部门',
+        en: 'Func. Dept.',
+        icon: 'crowd',
+      },
+      2: {
+        icon: 'corporation',
+      },
+    };
+    var result = mapResult[item === null || item === void 0 ? void 0 : item.orgAttribute] || {};
+    return /*#__PURE__*/ React.createElement(
+      'div',
+      {
+        className: 'org-item-wrapper',
+        style: {
+          width: 'calc(100% - 32px)',
+        },
+      },
+      /*#__PURE__*/ React.createElement(_Ellipsis, {
+        title: item.title,
+        widthLimit: String(item.orgAttribute) === '1' ? 'calc(100% - 90px}' : '100%',
+      }),
+      String(item.orgAttribute) === '1' &&
+        /*#__PURE__*/ React.createElement(
+          'span',
+          {
+            className: 'org-functional-departemt-marker',
+          },
+          result[lang] || '职能部门',
+        ),
+    );
+  };
+  var defaultRenderItem = function defaultRenderItem(item) {
+    var isOrg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+    if (isOrg) {
+      return renderOrgItem(item, props === null || props === void 0 ? void 0 : props.lang);
+    }
+    return /*#__PURE__*/ React.createElement(_Ellipsis, {
+      title: item.title,
+      widthLimit: '100%',
+    });
+  };
   return /*#__PURE__*/ React.createElement(
     React.Fragment,
     null,
@@ -1044,6 +1088,9 @@ var AssignModal = function AssignModal(props) {
               'div',
               {
                 className: 'panel-left',
+                style: {
+                  width: '60%',
+                },
               },
               /*#__PURE__*/ React.createElement(_Input, {
                 size: 'small',
@@ -1063,6 +1110,9 @@ var AssignModal = function AssignModal(props) {
                 },
               }),
               /*#__PURE__*/ React.createElement(_TntdVirtualTree, {
+                style: {
+                  overflowX: 'auto',
+                },
                 isOrg: true,
                 treeData: treeData,
                 filterKey: filterOrg,
@@ -1073,12 +1123,16 @@ var AssignModal = function AssignModal(props) {
                 defaultExpandAll: true,
                 onCheck: onCheck,
                 height: windowHeight,
+                titleRender: defaultRenderItem,
               }),
             ),
             /*#__PURE__*/ React.createElement(
               'div',
               {
                 className: 'panel-right',
+                style: {
+                  width: '40%',
+                },
               },
               /*#__PURE__*/ React.createElement(
                 'div',
@@ -1088,9 +1142,17 @@ var AssignModal = function AssignModal(props) {
                 /*#__PURE__*/ React.createElement(
                   'span',
                   null,
-                  '\u5DF2\u9009: ',
-                  areadySelectOrg.length || 0,
-                  ' \u4E2A\u673A\u6784',
+                  getText(
+                    'hasBeenSelected',
+                    props === null || props === void 0 ? void 0 : props.lang,
+                  ),
+                  ':',
+                  ' ',
+                  getText(
+                    'numOfOrg',
+                    props === null || props === void 0 ? void 0 : props.lang,
+                    areadySelectOrg.length || 0,
+                  ),
                 ),
                 /*#__PURE__*/ React.createElement(
                   'a',
@@ -1099,7 +1161,7 @@ var AssignModal = function AssignModal(props) {
                       return onRemoveAllOrg();
                     },
                   },
-                  '\u6E05\u7A7A',
+                  getText('clear', props === null || props === void 0 ? void 0 : props.lang),
                 ),
               ),
               /*#__PURE__*/ React.createElement(
@@ -1206,7 +1268,10 @@ var AssignModal = function AssignModal(props) {
                 onChange: function onChange(e) {
                   debouncedAppSearch(e.target.value);
                 },
-                placehoalder: '\u8BF7\u8F93\u5165\u6E20\u9053\u540D\u79F0',
+                placeholder: getText(
+                  'enterAppName',
+                  props === null || props === void 0 ? void 0 : props.lang,
+                ),
                 size: 'small',
                 suffix: /*#__PURE__*/ React.createElement(_Icon, {
                   type: 'zoom',
@@ -1231,9 +1296,17 @@ var AssignModal = function AssignModal(props) {
                 /*#__PURE__*/ React.createElement(
                   'span',
                   null,
-                  '\u5DF2\u9009: ',
-                  areadySelectApp.length || 0,
-                  ' \u4E2A\u6E20\u9053',
+                  getText(
+                    'hasBeenSelected',
+                    props === null || props === void 0 ? void 0 : props.lang,
+                  ),
+                  ':',
+                  ' ',
+                  getText(
+                    'numOfApp',
+                    props === null || props === void 0 ? void 0 : props.lang,
+                    areadySelectApp.length || 0,
+                  ),
                 ),
                 /*#__PURE__*/ React.createElement(
                   'a',
@@ -1242,7 +1315,7 @@ var AssignModal = function AssignModal(props) {
                       return onRemoveAllApp();
                     },
                   },
-                  '\u6E05\u7A7A',
+                  getText('clear', props === null || props === void 0 ? void 0 : props.lang),
                 ),
               ),
               /*#__PURE__*/ React.createElement(
@@ -1340,7 +1413,7 @@ var AssignModal = function AssignModal(props) {
                 /*#__PURE__*/ React.createElement(_Input, {
                   size: 'small',
                   placeholder: getText(
-                    'search',
+                    'enterUserName',
                     props === null || props === void 0 ? void 0 : props.lang,
                   ),
                   onChange: function onChange(e) {
@@ -1369,18 +1442,26 @@ var AssignModal = function AssignModal(props) {
                   /*#__PURE__*/ React.createElement(
                     'span',
                     null,
-                    '\u5DF2\u9009: ',
-                    areadySelectUser.length || 0,
-                    ' \u4E2A\u7528\u6237',
+                    getText(
+                      'hasBeenSelected',
+                      props === null || props === void 0 ? void 0 : props.lang,
+                    ),
+                    ':',
+                    ' ',
+                    getText(
+                      'numOfUser',
+                      props === null || props === void 0 ? void 0 : props.lang,
+                      areadySelectUser.length || 0,
+                    ),
                   ),
                   /*#__PURE__*/ React.createElement(
                     'a',
                     {
                       onClick: function onClick() {
-                        return onRemoveAllUser();
+                        return onRemoveAllOrg();
                       },
                     },
-                    '\u6E05\u7A7A',
+                    getText('clear', props === null || props === void 0 ? void 0 : props.lang),
                   ),
                 ),
                 /*#__PURE__*/ React.createElement(

package/es/AssignModal/AssignApp/View.js

@@ -528,6 +528,10 @@ var AssignModal = function AssignModal(props) {
             onChange: function onChange(e) {
               debouncedAppSearch(e.target.value);
             },
+            placeholder: getText(
+              'enterAppName',
+              props === null || props === void 0 ? void 0 : props.lang,
+            ),
             size: 'small',
             suffix: /*#__PURE__*/ React.createElement(_Icon, {
               type: 'zoom',
@@ -576,7 +580,7 @@ var AssignModal = function AssignModal(props) {
             /*#__PURE__*/ React.createElement(_Input, {
               size: 'small',
               placeholder: getText(
-                'search',
+                'enterUserName',
                 props === null || props === void 0 ? void 0 : props.lang,
               ),
               onChange: function onChange(e) {

package/es/AssignModal/AssignApp/index.less

@@ -34,23 +34,27 @@
       > div {
         width: 50%;
       }
+
       .panel-left {
         height: 100%;
-        // overflow: auto;
+        overflow: auto;
 
         > .ant-input-affix-wrapper {
           position: sticky;
           top: 0px;
           z-index: 1;
-          background: #f8f9fb;
+          // background: #f8f9fb;
         }
       }
+
       .panel-right {
         overflow: hidden;
+
         & {
           padding: 0 0px 16px 16px;
           border-left: 1px solid @border-color-secondary;
         }
+
         .select-menu-header {
           display: flex;
           align-items: flex-start;
@@ -89,6 +93,7 @@
               font-family: 'PingFang SC';
               line-height: 22px;
             }
+
             .path-name {
               display: inline-block;
               color: tint(@bg-color-spotilight, 50%);
@@ -97,6 +102,7 @@
               font-family: 'PingFang SC';
               line-height: 20px;
             }
+
             .close-icon {
               position: absolute;
               top: calc(50% - 6px);
@@ -105,6 +111,7 @@
               cursor: pointer;
             }
           }
+
           .select-menu-list-item:hover {
             background-color: #fff;
           }
@@ -130,6 +137,7 @@
           > label {
             margin-bottom: 8px;
           }
+
           > label:last-child {
             margin-bottom: 0px;
           }
@@ -150,11 +158,13 @@
   .slider.panel-0 {
     transform: translateX(0);
   }
+
   .slider.panel-1 {
-    transform: translateX(-652px);
+    transform: translateX(-852px);
   }
+
   .slider.panel-2 {
-    transform: translateX(-1304px);
+    transform: translateX(-1504px);
   }
 
   .menu-header {
@@ -164,26 +174,30 @@
       width: 100%;
       margin-bottom: 16px;
     }
+
     .title {
       position: relative;
-      margin-left: 16px;
+      margin-left: 12px;
       color: @text-color;
       font-weight: 600;
       font-style: normal;
       line-height: 22px;
+
       .sum {
         display: inline-block;
         margin: 0 4px;
         color: @blue-6;
       }
+
       .text-grey {
         color: tint(@text-color, 50%);
       }
     }
+
     .title::after {
       position: absolute;
       top: 5px;
-      left: -14px;
+      left: -12px;
       display: inline-block;
       width: 4px;
       height: 12px;
@@ -200,6 +214,7 @@
     gap: 16px;
     height: 100%;
   }
+
   .panel.org-panel,
   .panel.app-panel,
   .panel.user-panel {
@@ -239,10 +254,12 @@
           z-index: 1;
           background: #f8f9fb;
         }
+
         .select-menu-list-item {
           &:last-child {
             margin-bottom: 0px;
           }
+
           margin-bottom: 8px;
         }
       }
@@ -282,6 +299,7 @@
           padding: 0px;
           border-radius: @border-radius-base;
         }
+
         &:last-child {
           margin-bottom: 0px;
         }
@@ -295,6 +313,7 @@
           font-family: 'PingFang SC';
           line-height: 22px;
         }
+
         .path-name {
           display: inline-block;
           height: 22px;

package/es/AssignModal/index.js

@@ -126,7 +126,7 @@ var AssignModal = function AssignModal(props) {
       className: 'modal-assign',
       title: title,
       visible: visible,
-      width: 700,
+      width: 900,
       onCancel: close,
       onOk: submit,
       maskClosable: disabled,

package/es/locale.js

@@ -7,15 +7,17 @@ export var zh_CN = {
   allAppAvailable: '全部渠道',
   authorizesUserList: '用户列表',
   allUserAvailable: '全部用户',
-  search: '查询',
+  search: '请输入机构名称',
   availableOrgs: '可用机构',
   availableApps: '可用渠道',
   availableUsers: '可用用户',
   clear: '清空',
   hasBeenSelected: '已选',
-  numOfOrg: '%s 机构',
-  numOfApp: '%s 渠道',
-  numOfUser: '%s 用户',
+  numOfOrg: '%s 个机构',
+  numOfApp: '%s 个渠道',
+  numOfUser: '%s 个用户',
+  enterAppName: '请输入渠道名称',
+  enterUserName: '请输入用户名称',
 };
 export var en_US = {
   authorizesOrgList: 'Organization List',
@@ -24,7 +26,7 @@ export var en_US = {
   allAppAvailable: 'All Channels',
   authorizesUserList: 'Account List',
   allUserAvailable: 'All Accounts',
-  search: 'Search',
+  search: 'Organization name',
   availableOrgs: 'Available Organizations',
   availableApps: 'Available Channels',
   availableUsers: 'Available Users',
@@ -33,6 +35,8 @@ export var en_US = {
   numOfOrg: '%s Organizations',
   numOfApp: '%s Channels',
   numOfUser: '%s Accounts',
+  enterAppName: 'Enter Channel name',
+  enterUserName: 'Enter Account name',
 };
 export var getText = function getText(key, language) {
   var _ref;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tddc/assign-modal",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "assign-modal",
   "author": "zj <jun.zhang002383@tongdun.net>",
   "license": "ISC",