tntd 1.4.20 → 1.4.22

package/components/Handle/README.md

@@ -54,26 +54,6 @@ const Demo = props => {
                         <a>查看</a>
                         <a>编辑</a>
                         <a>测试</a>
-                        {
-                            false && 
-                            <a>导入</a>
-                        }
-                        <a>导出</a>
-                        <Popconfirm
-                            title="Are you sure delete this task?"
-                            onConfirm={void 0}
-                            onCancel={void 0}
-                            okText="Yes"
-                            cancelText="No"
-                            onClick={e => e.stopPropagation()}
-                            getPopupContainer={trigger => trigger.parentNode}
-                            trigger="hover"
-                            overlayStyle={{
-                                width: 300
-                            }}
-                        >
-                            <a>Delete</a>
-                        </Popconfirm>
                     </Handle>
                 )
             }

package/components/Handle/index.js

@@ -1,12 +1,17 @@
-import { Fragment } from 'react';
+import React, { Fragment } from 'react';
 import { Dropdown, Menu, Divider } from 'antd';
+import { getText, getLanguage } from '../locale';
 import Icon from '../Icon';
 import './index.less';
 
 const clsPrefix = 'tnt-more-menus';
 
 export default props => {
-    const { children = [], type, num = 3, lang, divider = true, lessOneMoreFit, ...rest } = props || {};
+    const { children = [], type, num = 3,  divider = true, lessOneMoreFit, popConfirmHandle, ...rest } = props || {};
+    let { lang } = props||{};
+    if(!lang){
+        lang = getLanguage();
+    }
     let newChildren = [];
     if(Array.isArray(children)){
         newChildren = children?.filter(item => !!item) || [];
@@ -14,6 +19,22 @@ export default props => {
         newChildren.push(children);
     }
 
+    if(lang === 'en' || popConfirmHandle){
+        newChildren?.forEach((v,i)=>{
+            const { type, props } = v;
+            if(type?.name === 'Popconfirm'){
+                newChildren[i]= React.cloneElement(v, {
+                    overlayStyle: { width: 180 },
+                    ...(v?.props || {}),
+                    onClick:(e) => e.stopPropagation(),
+                    trigger:'hover',
+                    getPopupContainer:(trigger) => trigger.parentNode,
+                });
+            }
+        });
+    }
+
+
     let [preChildPart, lastChildPart] = [newChildren, null];
 
     // 只有1个时不适配
@@ -39,16 +60,32 @@ export default props => {
             </Fragment>
         ));
     }
-    const menu = (
+    const menu = (childArr)=>(
         <Menu className="org-pop-opera-btn">
             {
-                lastChildPart?.map(
+                childArr?.map(
                     (child,i) => <Menu.Item key={i}>{child}</Menu.Item>
                 )
             }
         </Menu>
     );
 
+    if(lang === 'en'){
+        return (
+            <Dropdown overlay={menu(newChildren||[])} arrow>
+                {
+                    type === 'icon' ?
+                        <Icon type="more" /> :
+                        <a className="ant-dropdown-more">
+                            {getText('handleMore',lang)}
+                            <i className={`${clsPrefix}-dropdown-icon`}>
+                                <Icon type="down" />
+                            </i>
+                        </a>
+                }
+            </Dropdown>
+        );
+    }
     return (
         <div
             onClick={(e) => { e.stopPropagation(); }}
@@ -56,13 +93,13 @@ export default props => {
         >
             {preChildPart}
             {
-                lastChildPart?.length > 0 &&
-                <Dropdown overlay={menu} arrow>
+                !!lastChildPart?.length &&
+                <Dropdown overlay={menu(lastChildPart||[])} arrow>
                     {
                         type === 'icon' ?
                             <Icon type="more" /> :
                             <a className="ant-dropdown-more">
-                                {lang === 'en' ? 'More' : '更多'}
+                                {getText('handleMore',lang)}
                                 <i className={`${clsPrefix}-dropdown-icon`}>
                                     <Icon type="down" />
                                 </i>

package/components/locale.js

@@ -20,7 +20,10 @@ export const zh_CN = {
     nameNull: '暂无昵称',
     personalSettings: '个人设置',
     changePwd: '修改密码',
-    signOut: '退出'
+    signOut: '退出',
+
+    // Handle
+    handleMore:'更多'
 };
 
 export const en_US = {
@@ -42,7 +45,10 @@ export const en_US = {
     nameNull: 'No nickname yet',
     personalSettings: 'Setting',
     changePwd: 'Change password',
-    signOut: 'Sign out'
+    signOut: 'Sign out',
+
+    // Handle
+    handleMore:'More'
 };
 
 export const getText = (key, language = 'cn', ...params) => {

package/dist/1.tntd.js

@@ -1 +1 @@
-(window.webpackJsonptntd=window.webpackJsonptntd||[]).push([[1],{51:function(t,e,r){"use strict";r.r(e);var f=r(0),s=r(1);function n(t){return(n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function o(e,t){var r,n=Object.keys(e);return Object.getOwnPropertySymbols&&(r=Object.getOwnPropertySymbols(e),t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)),n}function p(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?o(Object(r),!0).forEach(function(t){b(e,t,r[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):o(Object(r)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))})}return e}function b(t,e,r){return(e=function(t){t=function(t,e){if("object"!==n(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0===r)return("string"===e?String:Number)(t);r=r.call(t,e||"default");if("object"!==n(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}(t,"string");return"symbol"===n(t)?t:String(t)}(e))in t?Object.defineProperty(t,e,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[e]=r,t}function y(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){var r=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null!=r){var n,o,a,c,i=[],u=!0,l=!1;try{if(a=(r=r.call(t)).next,0===e){if(Object(r)!==r)return;u=!1}else for(;!(u=(n=a.call(r)).done)&&(i.push(n.value),i.length!==e);u=!0);}catch(t){l=!0,o=t}finally{try{if(!u&&null!=r.return&&(c=r.return(),Object(c)!==c))return}finally{if(l)throw o}}return i}}(t,e)||function(t,e){var r;if(t)return"string"==typeof t?a(t,e):"Map"===(r="Object"===(r=Object.prototype.toString.call(t).slice(8,-1))&&t.constructor?t.constructor.name:r)||"Set"===r?Array.from(t):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?a(t,e):void 0}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function a(t,e){(null==e||e>t.length)&&(e=t.length);for(var r=0,n=new Array(e);r<e;r++)n[r]=t[r];return n}var m=new(r(10).a),d={account:void 0,password:void 0};e.default=function(t){var e=t.visible,n=t.close,r=t.signIn,t=y(Object(f.useState)(!1),2),o=t[0],a=t[1],t=localStorage.getItem("accountInfo");if(t)try{d=JSON.parse(t)}catch(t){}function c(t,e){u(p(p({},i),{},b({},t,e.target.value)))}var t=y(Object(f.useState)(d),2),i=t[0],u=t[1],t=i.account,l=i.password;return React.createElement(s.Modal,{title:"开发者模拟登陆",visible:e,maskClosable:!1,onOk:function(){a(!0);var t=r&&r(i);t&&t.then&&t.then(function(r){s.message.success("模拟登陆成功"),localStorage.setItem("accountInfo",JSON.stringify(i)),a(!1),setTimeout(function(){var t=r||{},e=t.tdToken,t=t.userId;m.set("_td_token_",e,{path:"/"}),m.set("_uid_",t,{path:"/"}),n()},500)}).catch(function(t){throw a(!1),t})},onCancel:n,confirmLoading:o},React.createElement(s.Form,{labelCol:{span:5},wrapperCol:{span:18}},React.createElement(s.Form.Item,{label:"用户名："},React.createElement(s.Input,{type:"text",placeholder:"请输入用户名",value:t||void 0,onChange:function(t){return c("account",t)}})),React.createElement(s.Form.Item,{label:"密码："},React.createElement(s.Input,{type:"text",placeholder:"请输入用户名",value:l||void 0,onChange:function(t){return c("password",t)}}))))}}}]);
+(window.webpackJsonptntd=window.webpackJsonptntd||[]).push([[1],{76:function(e,t,n){"use strict";n.r(t);var s=n(0),p=n(1);function f(t,e){var n,r=Object.keys(t);return Object.getOwnPropertySymbols&&(n=Object.getOwnPropertySymbols(t),e&&(n=n.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),r.push.apply(r,n)),r}function b(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function d(e,t){return function(e){if(Array.isArray(e))return e}(e)||function(e,t){if(Symbol.iterator in Object(e)||"[object Arguments]"===Object.prototype.toString.call(e)){var n=[],r=!0,o=!1,a=void 0;try{for(var c,i=e[Symbol.iterator]();!(r=(c=i.next()).done)&&(n.push(c.value),!t||n.length!==t);r=!0);}catch(e){o=!0,a=e}finally{try{r||null==i.return||i.return()}finally{if(o)throw a}}return n}}(e,t)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}()}var y=new(n(10).a),m={account:void 0,password:void 0};t.default=function(e){var t=e.visible,r=e.close,n=e.signIn,o=d(Object(s.useState)(!1),2),a=o[0],c=o[1],e=localStorage.getItem("accountInfo");if(e)try{m=JSON.parse(e)}catch(e){}function i(e,t){l(function(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?f(Object(n),!0).forEach(function(e){b(t,e,n[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):f(Object(n)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))})}return t}({},u,b({},e,t.target.value)))}var o=d(Object(s.useState)(m),2),u=o[0],l=o[1],e=u.account,o=u.password;return React.createElement(p.Modal,{title:"开发者模拟登陆",visible:t,maskClosable:!1,onOk:function(){c(!0);var e=n&&n(u);e&&e.then&&e.then(function(n){p.message.success("模拟登陆成功"),localStorage.setItem("accountInfo",JSON.stringify(u)),c(!1),setTimeout(function(){var e=n||{},t=e.tdToken,e=e.userId;y.set("_td_token_",t,{path:"/"}),y.set("_uid_",e,{path:"/"}),r()},500)}).catch(function(e){throw c(!1),e})},onCancel:r,confirmLoading:a},React.createElement(p.Form,{labelCol:{span:5},wrapperCol:{span:18}},React.createElement(p.Form.Item,{label:"用户名："},React.createElement(p.Input,{type:"text",placeholder:"请输入用户名",value:e||void 0,onChange:function(e){return i("account",e)}})),React.createElement(p.Form.Item,{label:"密码："},React.createElement(p.Input,{type:"text",placeholder:"请输入用户名",value:o||void 0,onChange:function(e){return i("password",e)}}))))}}}]);