tntd 1.4.30 → 1.4.32

package/es/Handle/index.js

@@ -23,7 +23,7 @@ import Icon from '../Icon';
 import './index.less';
 var clsPrefix = 'tnt-more-menus';
 export default (function (props) {
-  var _lastChildPart2;
+  var _newChildren, _lastChildPart2;
 
   var _ref = props || {},
       _ref$children = _ref.children,
@@ -35,7 +35,8 @@ export default (function (props) {
       divider = _ref$divider === void 0 ? true : _ref$divider,
       lessOneMoreFit = _ref.lessOneMoreFit,
       popConfirmHandle = _ref.popConfirmHandle,
-      rest = _objectWithoutProperties(_ref, ["children", "type", "num", "divider", "lessOneMoreFit", "popConfirmHandle"]);
+      isIconBtn = _ref.isIconBtn,
+      rest = _objectWithoutProperties(_ref, ["children", "type", "num", "divider", "lessOneMoreFit", "popConfirmHandle", "isIconBtn"]);
 
   var _ref2 = props || {},
       propsLang = _ref2.lang;
@@ -50,12 +51,15 @@ export default (function (props) {
     })) || [];
   } else if (children) {
     newChildren.push(children);
-  }
+  } // 子元素大于1个，且不是 icon元素
+
+
+  var specialSceneDefaultShow = ((_newChildren = newChildren) == null ? void 0 : _newChildren.length) > 1 && !isIconBtn;
 
-  if (lang === 'en' || popConfirmHandle) {
-    var _newChildren;
+  if (specialSceneDefaultShow && (lang === 'en' || popConfirmHandle)) {
+    var _newChildren2;
 
-    (_newChildren = newChildren) == null ? void 0 : _newChildren.forEach(function (v, i) {
+    (_newChildren2 = newChildren) == null ? void 0 : _newChildren2.forEach(function (v, i) {
       var type = v.type,
           props = v.props;
 
@@ -122,7 +126,7 @@ export default (function (props) {
     }));
   };
 
-  if (lang === 'en') {
+  if (lang === 'en' && specialSceneDefaultShow) {
     return React.createElement(_Dropdown, {
       overlay: menu(newChildren || []),
       arrow: true

package/es/QueryForm/Field/SelectInput.js

@@ -30,7 +30,9 @@ export default (function (props) {
   var _props$options = props.options,
       options = _props$options === void 0 ? [] : _props$options,
       addonBeforeStyle = props.addonBeforeStyle,
-      inputProps = _objectWithoutProperties(props, ["options", "addonBeforeStyle"]);
+      _props$addonProps = props.addonProps,
+      addonProps = _props$addonProps === void 0 ? {} : _props$addonProps,
+      inputProps = _objectWithoutProperties(props, ["options", "addonBeforeStyle", "addonProps"]);
 
   var _useState = useState(options),
       _useState2 = _slicedToArray(_useState, 2),
@@ -61,14 +63,14 @@ export default (function (props) {
     props.onChange(_defineProperty({}, key, evt.target.value));
   };
 
-  var addonBefore = React.createElement(_Select, {
+  var addonBefore = React.createElement(_Select, _extends({
     value: key,
     onChange: onKeyChange,
     style: _objectSpread({
       width: '120px'
     }, addonBeforeStyle),
     dropdownMatchSelectWidth: false
-  }, items.map(function (_ref) {
+  }, addonProps || {}), items.map(function (_ref) {
     var label = _ref.label,
         value = _ref.value;
     return React.createElement(Option, {

package/es/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/lib/Handle/index.js

@@ -48,7 +48,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 var clsPrefix = 'tnt-more-menus';
 
 var _default = function _default(props) {
-  var _lastChildPart2;
+  var _newChildren, _lastChildPart2;
 
   var _ref = props || {},
       _ref$children = _ref.children,
@@ -60,7 +60,8 @@ var _default = function _default(props) {
       divider = _ref$divider === void 0 ? true : _ref$divider,
       lessOneMoreFit = _ref.lessOneMoreFit,
       popConfirmHandle = _ref.popConfirmHandle,
-      rest = _objectWithoutProperties(_ref, ["children", "type", "num", "divider", "lessOneMoreFit", "popConfirmHandle"]);
+      isIconBtn = _ref.isIconBtn,
+      rest = _objectWithoutProperties(_ref, ["children", "type", "num", "divider", "lessOneMoreFit", "popConfirmHandle", "isIconBtn"]);
 
   var _ref2 = props || {},
       propsLang = _ref2.lang;
@@ -75,12 +76,15 @@ var _default = function _default(props) {
     })) || [];
   } else if (children) {
     newChildren.push(children);
-  }
+  } // 子元素大于1个，且不是 icon元素
+
+
+  var specialSceneDefaultShow = ((_newChildren = newChildren) == null ? void 0 : _newChildren.length) > 1 && !isIconBtn;
 
-  if (lang === 'en' || popConfirmHandle) {
-    var _newChildren;
+  if (specialSceneDefaultShow && (lang === 'en' || popConfirmHandle)) {
+    var _newChildren2;
 
-    (_newChildren = newChildren) == null ? void 0 : _newChildren.forEach(function (v, i) {
+    (_newChildren2 = newChildren) == null ? void 0 : _newChildren2.forEach(function (v, i) {
       var type = v.type,
           props = v.props;
 
@@ -147,7 +151,7 @@ var _default = function _default(props) {
     }));
   };
 
-  if (lang === 'en') {
+  if (lang === 'en' && specialSceneDefaultShow) {
     return _react["default"].createElement(_dropdown["default"], {
       overlay: menu(newChildren || []),
       arrow: true

package/lib/QueryForm/Field/SelectInput.js

@@ -51,7 +51,9 @@ var _default = function _default(props) {
   var _props$options = props.options,
       options = _props$options === void 0 ? [] : _props$options,
       addonBeforeStyle = props.addonBeforeStyle,
-      inputProps = _objectWithoutProperties(props, ["options", "addonBeforeStyle"]);
+      _props$addonProps = props.addonProps,
+      addonProps = _props$addonProps === void 0 ? {} : _props$addonProps,
+      inputProps = _objectWithoutProperties(props, ["options", "addonBeforeStyle", "addonProps"]);
 
   var _useState = (0, _react.useState)(options),
       _useState2 = _slicedToArray(_useState, 2),
@@ -82,14 +84,14 @@ var _default = function _default(props) {
     props.onChange(_defineProperty({}, key, evt.target.value));
   };
 
-  var addonBefore = _react["default"].createElement(_select["default"], {
+  var addonBefore = _react["default"].createElement(_select["default"], _extends({
     value: key,
     onChange: onKeyChange,
     style: _objectSpread({
       width: '120px'
     }, addonBeforeStyle),
     dropdownMatchSelectWidth: false
-  }, items.map(function (_ref) {
+  }, addonProps || {}), items.map(function (_ref) {
     var label = _ref.label,
         value = _ref.value;
     return _react["default"].createElement(Option, {

package/lib/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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tntd",
-    "version": "1.4.30",
+    "version": "1.4.32",
     "description": "ued tnt design",
     "main": "lib/index.js",
     "module": "es/index.js",

package/common/temp/publish-home/.npm/_logs/2023-02-24T09_28_35_585Z-debug-0.log

@@ -1,39 +0,0 @@
-0 verbose cli /usr/local/bin/node /usr/local/bin/npm
-1 info using npm@8.19.3
-2 info using node@v16.19.0
-3 timing npm:load:whichnode Completed in 1ms
-4 timing config:load:defaults Completed in 3ms
-5 timing config:load:file:/usr/local/lib/node_modules/npm/npmrc Completed in 2ms
-6 timing config:load:builtin Completed in 2ms
-7 timing config:load:cli Completed in 2ms
-8 timing config:load:env Completed in 1ms
-9 timing config:load:file:/Users/zhouzefei/projects/tntd/packages/tntd/.npmrc Completed in 1ms
-10 timing config:load:project Completed in 16ms
-11 timing config:load:file:/Users/zhouzefei/projects/tntd/common/temp/publish-home/.npmrc Completed in 6ms
-12 timing config:load:user Completed in 6ms
-13 timing config:load:file:/usr/local/etc/npmrc Completed in 1ms
-14 timing config:load:global Completed in 1ms
-15 timing config:load:validate Completed in 1ms
-16 timing config:load:credentials Completed in 1ms
-17 timing config:load:setEnvs Completed in 0ms
-18 timing config:load Completed in 36ms
-19 timing npm:load:configload Completed in 36ms
-20 timing npm:load:mkdirpcache Completed in 2ms
-21 timing npm:load:mkdirplogs Completed in 2ms
-22 verbose title npm view tntd time
-23 verbose argv "view" "tntd" "time" "--json" "--//registry.npmjs.org/:_authToken" "npm_***"
-24 timing npm:load:setTitle Completed in 10ms
-25 timing config:load:flatten Completed in 8ms
-26 timing npm:load:display Completed in 10ms
-27 verbose logfile logs-max:10 dir:/Users/zhouzefei/projects/tntd/common/temp/publish-home/.npm/_logs
-28 verbose logfile /Users/zhouzefei/projects/tntd/common/temp/publish-home/.npm/_logs/2023-02-24T09_28_35_585Z-debug-0.log
-29 timing npm:load:logFile Completed in 12ms
-30 timing npm:load:timers Completed in 0ms
-31 timing npm:load:configScope Completed in 1ms
-32 timing npm:load Completed in 77ms
-33 silly logfile done cleaning log files
-34 http fetch GET 200 https://registry.npmjs.org/tntd 36402ms (cache miss)
-35 timing command:view Completed in 36433ms
-36 verbose exit 0
-37 timing npm Completed in 36531ms
-38 info ok