@tddc/assign-modal 3.0.9 → 3.1.0

package/es/AssignModal/AssignApp/Edit.js

@@ -265,37 +265,37 @@ var AssignModal = function AssignModal(props) {
     checkedKeys = _useState8[0],
     setCheckedKeys = _useState8[1];
   var _useState9 = useState(appCodes || []),
-    _useState10 = _slicedToArray(_useState9, 2),
-    appKeys = _useState10[0],
-    setAppKeys = _useState10[1];
-  var _useState11 = useState(accounts || []),
+    _useState0 = _slicedToArray(_useState9, 2),
+    appKeys = _useState0[0],
+    setAppKeys = _useState0[1];
+  var _useState1 = useState(accounts || []),
+    _useState10 = _slicedToArray(_useState1, 2),
+    userKeys = _useState10[0],
+    setUserKeys = _useState10[1];
+  var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    userKeys = _useState12[0],
-    setUserKeys = _useState12[1];
+    allOrgChecked = _useState12[0],
+    setAllOrgChecked = _useState12[1];
   var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    allOrgChecked = _useState14[0],
-    setAllOrgChecked = _useState14[1];
+    allAppChecked = _useState14[0],
+    setAllAppChecked = _useState14[1];
   var _useState15 = useState(false),
     _useState16 = _slicedToArray(_useState15, 2),
-    allAppChecked = _useState16[0],
-    setAllAppChecked = _useState16[1];
-  var _useState17 = useState(false),
+    allUserChecked = _useState16[0],
+    setAllUserChecked = _useState16[1];
+  var _useState17 = useState(),
     _useState18 = _slicedToArray(_useState17, 2),
-    allUserChecked = _useState18[0],
-    setAllUserChecked = _useState18[1];
+    filterOrg = _useState18[0],
+    setFilterOrg = _useState18[1];
   var _useState19 = useState(),
     _useState20 = _slicedToArray(_useState19, 2),
-    filterOrg = _useState20[0],
-    setFilterOrg = _useState20[1];
+    filterUser = _useState20[0],
+    setFilterUser = _useState20[1];
   var _useState21 = useState(),
     _useState22 = _slicedToArray(_useState21, 2),
-    filterUser = _useState22[0],
-    setFilterUser = _useState22[1];
-  var _useState23 = useState(),
-    _useState24 = _slicedToArray(_useState23, 2),
-    filterApp = _useState24[0],
-    setFilterApp = _useState24[1];
+    filterApp = _useState22[0],
+    setFilterApp = _useState22[1];
   var gap = 335;
   var windowHeight = useWindowHeight(gap);
   useEffect(
@@ -1048,6 +1048,10 @@ var AssignModal = function AssignModal(props) {
     [appKeys],
   );
   console.log(canNotRemoveOrg, 'canNotRemove');
+
+  // 计算面板数量和平移距离
+  var panelCount = showUser ? 3 : 2;
+  var translateX = curIndex === 0 ? 0 : ''.concat(-(100 / panelCount) * curIndex, '%');
   return /*#__PURE__*/ React.createElement(
     React.Fragment,
     null,
@@ -1072,9 +1076,11 @@ var AssignModal = function AssignModal(props) {
       /*#__PURE__*/ React.createElement(
         'div',
         {
-          className: 'slider panel-'.concat(curIndex),
+          className: 'slider',
           style: {
-            width: !!showUser ? '300%' : '200%',
+            width: showUser ? '300%' : '200%',
+            transform: 'translateX('.concat(translateX, ')'),
+            transition: 'transform 0.2s ease',
           },
         },
         /*#__PURE__*/ React.createElement(
@@ -1446,7 +1452,7 @@ var AssignModal = function AssignModal(props) {
                     'a',
                     {
                       onClick: function onClick() {
-                        return onRemoveAllOrg();
+                        return onRemoveAllUser();
                       },
                     },
                     t('clear'),
@@ -1460,7 +1466,7 @@ var AssignModal = function AssignModal(props) {
                   userKeys.map(function (item, index) {
                     var node = userMapRef.current[item] || {};
                     var userName = node.userName;
-                    var isOwnAppCode = accounts === node.account;
+                    var isOwnUserCode = account === node.account;
                     if (!userName && !node.account) return null; // 不显示多余数据
                     return /*#__PURE__*/ React.createElement(
                       'li',
@@ -1477,7 +1483,7 @@ var AssignModal = function AssignModal(props) {
                           title: userName,
                         }),
                       ),
-                      !isOwnAppCode &&
+                      !isOwnUserCode &&
                         /*#__PURE__*/ React.createElement(_Icon, {
                           type: 'close',
                           className: 'close-icon',

package/es/AssignModal/AssignApp/Edit_without_TntdVirtualTree.js

@@ -188,37 +188,37 @@ var AssignModal = function AssignModal(props) {
     checkedKeys = _useState8[0],
     setCheckedKeys = _useState8[1];
   var _useState9 = useState(appCodes || []),
-    _useState10 = _slicedToArray(_useState9, 2),
-    appKeys = _useState10[0],
-    setAppKeys = _useState10[1];
-  var _useState11 = useState(accounts || []),
+    _useState0 = _slicedToArray(_useState9, 2),
+    appKeys = _useState0[0],
+    setAppKeys = _useState0[1];
+  var _useState1 = useState(accounts || []),
+    _useState10 = _slicedToArray(_useState1, 2),
+    userKeys = _useState10[0],
+    setUserKeys = _useState10[1];
+  var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    userKeys = _useState12[0],
-    setUserKeys = _useState12[1];
+    allOrgChecked = _useState12[0],
+    setAllOrgChecked = _useState12[1];
   var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    allOrgChecked = _useState14[0],
-    setAllOrgChecked = _useState14[1];
+    allAppChecked = _useState14[0],
+    setAllAppChecked = _useState14[1];
   var _useState15 = useState(false),
     _useState16 = _slicedToArray(_useState15, 2),
-    allAppChecked = _useState16[0],
-    setAllAppChecked = _useState16[1];
-  var _useState17 = useState(false),
+    allUserChecked = _useState16[0],
+    setAllUserChecked = _useState16[1];
+  var _useState17 = useState(),
     _useState18 = _slicedToArray(_useState17, 2),
-    allUserChecked = _useState18[0],
-    setAllUserChecked = _useState18[1];
+    filterOrg = _useState18[0],
+    setFilterOrg = _useState18[1];
   var _useState19 = useState(),
     _useState20 = _slicedToArray(_useState19, 2),
-    filterOrg = _useState20[0],
-    setFilterOrg = _useState20[1];
+    filterUser = _useState20[0],
+    setFilterUser = _useState20[1];
   var _useState21 = useState(),
     _useState22 = _slicedToArray(_useState21, 2),
-    filterUser = _useState22[0],
-    setFilterUser = _useState22[1];
-  var _useState23 = useState(),
-    _useState24 = _slicedToArray(_useState23, 2),
-    filterApp = _useState24[0],
-    setFilterApp = _useState24[1];
+    filterApp = _useState22[0],
+    setFilterApp = _useState22[1];
   useEffect(
     function () {
       // path 和 allOrgList 赋值

package/es/AssignModal/AssignApp/View.js

@@ -179,13 +179,13 @@ var AssignModal = function AssignModal(props) {
     filterOrg = _useState8[0],
     setFilterOrg = _useState8[1];
   var _useState9 = useState(),
-    _useState10 = _slicedToArray(_useState9, 2),
-    filterUser = _useState10[0],
-    setFilterUser = _useState10[1];
-  var _useState11 = useState(),
-    _useState12 = _slicedToArray(_useState11, 2),
-    filterApp = _useState12[0],
-    setFilterApp = _useState12[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    filterUser = _useState0[0],
+    setFilterUser = _useState0[1];
+  var _useState1 = useState(),
+    _useState10 = _slicedToArray(_useState1, 2),
+    filterApp = _useState10[0],
+    setFilterApp = _useState10[1];
   useEffect(
     function () {
       // path 和 allOrgList 赋值

package/es/AssignModal/AssignApp/index.less

@@ -8,12 +8,11 @@
     display: flex;
     height: calc(100% - 24px);
     margin-top: 16px;
-    transition: transform 0.2s ease;
+    // transition 已移至 inline style，支持动态面板数量
 
     .panel {
-      // width: 650px;
-      flex: 1;
-      min-width: 652px;
+      flex: 1 0 0; // flex-grow: 1, flex-shrink: 0, flex-basis: 0
+      // 每个面板平分 slider 宽度，不压缩，从 0 基准开始计算
       height: 100%;
       padding: 16px;
       overflow: hidden;
@@ -161,18 +160,6 @@
     }
   }
 
-  .slider.panel-0 {
-    transform: translateX(0);
-  }
-
-  .slider.panel-1 {
-    transform: translateX(-852px);
-  }
-
-  .slider.panel-2 {
-    transform: translateX(-1504px);
-  }
-
   .menu-header {
     & {
       display: flex;

package/es/AssignModal/AssignApp/utils.js

@@ -153,7 +153,7 @@ export var preorder = function preorder(root, cb) {
       root.show = true;
     }
     res.push(root.code || root.key);
-    cb && cb(root.key, root);
+    cb && cb(root.code || root.key, root);
     for (
       var i = 0;
       i <

package/es/AssignModal/index.js

@@ -1,5 +1,14 @@
 import _Drawer from 'tntd/es/drawer';
-var _excluded = ['visible', 'close', 'disabled', 'title', 'onSubmit', 'locale'];
+var _excluded = [
+  'visible',
+  'close',
+  'disabled',
+  'title',
+  'onSubmit',
+  'locale',
+  'okText',
+  'cancelText',
+];
 function _extends() {
   return (
     (_extends = Object.assign
@@ -83,9 +92,9 @@ function _objectWithoutProperties(e, t) {
     r,
     i = _objectWithoutPropertiesLoose(e, t);
   if (Object.getOwnPropertySymbols) {
-    var s = Object.getOwnPropertySymbols(e);
-    for (r = 0; r < s.length; r++)
-      (o = s[r]), t.includes(o) || ({}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]));
+    var n = Object.getOwnPropertySymbols(e);
+    for (r = 0; r < n.length; r++)
+      (o = n[r]), -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
   }
   return i;
 }
@@ -94,7 +103,7 @@ function _objectWithoutPropertiesLoose(r, e) {
   var t = {};
   for (var n in r)
     if ({}.hasOwnProperty.call(r, n)) {
-      if (e.includes(n)) continue;
+      if (-1 !== e.indexOf(n)) continue;
       t[n] = r[n];
     }
   return t;
@@ -108,11 +117,16 @@ var cookies = new Cookies();
 var AssignModal = function AssignModal(props) {
   var visible = props.visible,
     close = props.close,
-    disabled = props.disabled,
+    _props$disabled = props.disabled,
+    disabled = _props$disabled === void 0 ? false : _props$disabled,
     _props$title = props.title,
     title = _props$title === void 0 ? '' : _props$title,
     onSubmit = props.onSubmit,
     locale = props.locale,
+    _props$okText = props.okText,
+    okText = _props$okText === void 0 ? '确定' : _props$okText,
+    _props$cancelText = props.cancelText,
+    cancelText = _props$cancelText === void 0 ? '取消' : _props$cancelText,
     restProps = _objectWithoutProperties(props, _excluded);
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
@@ -130,6 +144,8 @@ var AssignModal = function AssignModal(props) {
       width: 900,
       onCancel: close,
       onOk: submit,
+      // okText={okText}
+      // cancelText={cancelText}
       maskClosable: disabled,
       destroyOnClose: true,
       showFooter: !disabled,

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@tddc/assign-modal",
-  "version": "3.0.9",
+  "version": "3.1.0",
   "description": "assign-modal",
   "author": "zj <jun.zhang002383@tongdun.net>",
   "license": "ISC",
   "main": "es/index.js",
   "files": [
-    "es"
+    "es",
+    "src",
+    "README.md"
   ],
   "devDependencies": {
     "universal-cookie": ">=2.2.0",