tntd 1.4.31 → 1.4.33-beta.1

package/components/Ellipsis/index.js

@@ -4,7 +4,7 @@
  * @Describe: 省略号组件
  */
 
-import { useState, useEffect, useRef } from 'react';
+import { useState, useEffect, useRef, useCallback } from 'react';
 import { Popover, Tooltip } from 'antd';
 import copy from 'copy-to-clipboard';
 import CopySVG from './Svg/CopySVG';
@@ -48,23 +48,42 @@ export default props => {
     const [hasCopy, setHasCopy] = useState(false);
 
     const elementRef = useRef();
+    const timeRef = useRef();
 
     useEffect(() => {
-        elementRef.current && isEllipsisActive(elementRef.current)
-            ? setFlag(true)
-            : (
-                setFlag(false),
-                setTipVisible(false)
-            );
-    });
+        // 检查元素是否存在
+        if(elementRef.current){
+            const checkEllipsis = () => {
+                const isActive = isEllipsisActive(elementRef.current);
+                setFlag(isActive);
+                if (!isActive) {
+                    setTipVisible(false);
+                }
+            };
+
+            // 初始检查
+            checkEllipsis();
+
+            // 监听 resize 事件，因为窗口大小变化会影响文本截断
+            window.addEventListener('resize', checkEllipsis);
+
+            return () => {
+                window.removeEventListener('resize', checkEllipsis);
+                if (timeRef.current) {
+                    clearTimeout(timeRef.current);
+                    timeRef.current = null;
+                }
+                elementRef.current = null;
+            };
+        }
+    }, [children, content, title]); // 添加必要的依赖项
+
 
     // original Node
     const inner = typeof children === 'string' ? children : (_popover ? content : title);
 
     // for className
-    const getClassName = () => {
-        return `overflow ${_lines ? 'ellipsis-wrap' : 'ellipsis-nowrap'} ${className || ''}`;
-    };
+    const getClassName =  `overflow ${_lines ? 'ellipsis-wrap' : 'ellipsis-nowrap'} ${className || ''}`;
 
     // Tooltip.trigger(default 'hover') ==trigger==> onVisibleChange(visible)
     const handleVisibleChange = (visible) => {
@@ -76,12 +95,25 @@ export default props => {
     // onClick Copy Button
     const handleCopy = (innerText) => {
         copy(innerText);
-        setHasCopy(!hasCopy);
-        setTimeout(() => {
+
+        // 清除之前的定时器
+        if (timeRef.current) {
+            clearTimeout(timeRef.current);
+            timeRef.current = null;
+        }
+
+        setHasCopy(true); // 直接设置为 true
+        timeRef.current = setTimeout(() => {
             setHasCopy(false);
         }, 1000);
     };
 
+    const handleCopyClick = useCallback(() => {
+        if (elementRef.current) {
+            handleCopy(elementRef.current.innerText);
+        }
+    }, []); // 没有外部依赖
+
     const renderNode = () => {
         const popoverNode = (
             <Popover
@@ -133,7 +165,7 @@ export default props => {
             {prefix && prefix}
             {/* content */}
             <div
-                className={getClassName()}
+                className={getClassName}
             >
                 {inner ? renderNode() : emptyText}
             </div>
@@ -144,7 +176,7 @@ export default props => {
                 inner && _copyable &&
                 <div
                     className='svg-button'
-                    onClick={() => handleCopy(elementRef.current.innerText)}
+                    onClick={handleCopyClick}
                 >
                     {
                         !hasCopy

package/components/QueryForm/Field/SelectInput.js

@@ -8,6 +8,7 @@ export default props => {
     const {
         options = [],
         addonBeforeStyle,
+        addonProps={},
         ...inputProps
     } = props;
     const [items, setItems] = useState(options);
@@ -40,7 +41,8 @@ export default props => {
                 width: '120px',
                 ...addonBeforeStyle
             }}
-            dropdownMatchSelectWidth={false} 
+            dropdownMatchSelectWidth={false}
+            {...(addonProps||{})}
         >
             {
                 items.map(({ label, value }) => (

package/components/QueryForm/README.md

@@ -228,8 +228,11 @@ const QueryFormDemo = () => {
                 name="obj"
                 props={{
                     placeholder: "名称",
+                    addonProps:{
+                        // dropdownMatchSelectWidth:true
+                    },
                     options: [
-                        { label: '名称', value: 'name' },
+                        { label: '名称名称名称名称名称名称名称名称名称名称名称', value: 'name' },
                         { label: 'ID', value: 'id' }
                     ],
                     addonBeforeStyle: { width: '100px' }

package/components/QueryListScene/QueryForm.js

@@ -62,7 +62,7 @@ export default class QueryForm extends React.PureComponent {
 
         // memory 与 url解析setForm时 监听事件异步
         actions.setData('formData', values);
-        Promise.resolve().then(()=>{
+        Promise.resolve().then(() => {
             onSearch && onSearch(params);
             actions.emit('search', params);
         });
@@ -73,19 +73,19 @@ export default class QueryForm extends React.PureComponent {
 
         actions.setFormData(initialValues, false);
 
-        onReset && onReset(initialValues);
+        onReset?.(initialValues);
         this.onSearch();
     };
 
     onChange = (newValues, changedInfo, ...rest) => {
         const { onChange, actions } = this.props;
 
-        onChange && onChange(
+        actions.setFormData(newValues, false);
+        onChange?.(
             newValues,
             changedInfo,
             ...rest
         );
-        actions.setFormData(newValues, false);
     }
 
     setFormData = (data, needSearch) => {

package/components/QueryListScene/createActions.js

@@ -21,18 +21,18 @@ export default () => {
         getPagination: () => get(data, 'pagination'),
 
         setFormData: (formData, needSearch = true) => {
-            set('formData', formData);
+            set(data, 'formData', formData);
             eventEmitter.emit('setFormData', formData, needSearch);
         },
         resetFormData: (needSearch = false) => {
             eventEmitter.emit('resetFormData', needSearch);
         },
         setTableDataSource: dataSource => {
-            set('dataSource', dataSource);
+            set(data, 'dataSource', dataSource);
             eventEmitter.emit('setTableDataSource', dataSource);
         },
         setPagination: pagination => {
-            set('pagination', pagination);
+            set(data, 'pagination', pagination);
             eventEmitter.emit('setPagination', pagination);
         },
 
@@ -43,7 +43,7 @@ export default () => {
         },
 
         search: (params = {}, showLoading = true) => {
-            return new Promise((resolve, reject) => {
+            return new Promise((resolve) => {
                 eventEmitter.emit('search', params, {
                     callback: resolve,
                     showLoading

package/dist/1.tntd.js

@@ -1 +1 @@
-(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)}}))))}}}]);
+(window.webpackJsonptntd=window.webpackJsonptntd||[]).push([[1],{51:function(t,e,r){r.r(e);var u=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 f(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){p(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 p(t,e,r){return(e=(t=>(t=((t,e)=>{if("object"!=n(t)||!t)return t;var r=t[Symbol.toPrimitive];if(void 0===r)return("string"===e?String:Number)(t);if("object"!=n(r=r.call(t,e||"default")))return r;throw new TypeError("@@toPrimitive must return a primitive value.")})(t,"string"),"symbol"==n(t)?t:t+""))(e))in t?Object.defineProperty(t,e,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[e]=r,t}function b(t,e){return(t=>{if(Array.isArray(t))return t})(t)||((t,e)=>{var r=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null!=r){var n,o,a,c,i=[],l=!0,u=!1;try{if(a=(r=r.call(t)).next,0===e){if(Object(r)!==r)return;l=!1}else for(;!(l=(n=a.call(r)).done)&&(i.push(n.value),i.length!==e);l=!0);}catch(t){u=!0,o=t}finally{try{if(!l&&null!=r.return&&(c=r.return(),Object(c)!==c))return}finally{if(u)throw o}}return i}})(t,e)||((t,e)=>{var r;if(t)return"string"==typeof t?a(t,e):"Map"===(r="Object"===(r={}.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)||(()=>{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=Array(e);r<e;r++)n[r]=t[r];return n}var y=new(r(10).a),m={account:void 0,password:void 0};e.default=function(t){var e=t.visible,n=t.close,r=t.signIn,t=b(Object(u.useState)(!1),2),o=t[0],a=t[1],t=localStorage.getItem("accountInfo");if(t)try{m=JSON.parse(t)}catch(t){}function c(t,e){l(f(f({},i),{},p({},t,e.target.value)))}var t=b(Object(u.useState)(m),2),i=t[0],l=t[1],t=i.account;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;y.set("_td_token_",e,{path:"/"}),y.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:i.password||void 0,onChange:function(t){return c("password",t)}}))))}}}]);