tntd 1.4.30 → 1.4.31

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -23,7 +23,7 @@ import Icon from '../Icon';
23
23
  import './index.less';
24
24
  var clsPrefix = 'tnt-more-menus';
25
25
  export default (function (props) {
26
- var _lastChildPart2;
26
+ var _newChildren, _lastChildPart2;
27
27
 
28
28
  var _ref = props || {},
29
29
  _ref$children = _ref.children,
@@ -35,7 +35,8 @@ export default (function (props) {
35
35
  divider = _ref$divider === void 0 ? true : _ref$divider,
36
36
  lessOneMoreFit = _ref.lessOneMoreFit,
37
37
  popConfirmHandle = _ref.popConfirmHandle,
38
- rest = _objectWithoutProperties(_ref, ["children", "type", "num", "divider", "lessOneMoreFit", "popConfirmHandle"]);
38
+ isIconBtn = _ref.isIconBtn,
39
+ rest = _objectWithoutProperties(_ref, ["children", "type", "num", "divider", "lessOneMoreFit", "popConfirmHandle", "isIconBtn"]);
39
40
 
40
41
  var _ref2 = props || {},
41
42
  propsLang = _ref2.lang;
@@ -50,12 +51,15 @@ export default (function (props) {
50
51
  })) || [];
51
52
  } else if (children) {
52
53
  newChildren.push(children);
53
- }
54
+ } // 子元素大于1个,且不是 icon元素
55
+
56
+
57
+ var specialSceneDefaultShow = ((_newChildren = newChildren) == null ? void 0 : _newChildren.length) > 1 && !isIconBtn;
54
58
 
55
- if (lang === 'en' || popConfirmHandle) {
56
- var _newChildren;
59
+ if (specialSceneDefaultShow && (lang === 'en' || popConfirmHandle)) {
60
+ var _newChildren2;
57
61
 
58
- (_newChildren = newChildren) == null ? void 0 : _newChildren.forEach(function (v, i) {
62
+ (_newChildren2 = newChildren) == null ? void 0 : _newChildren2.forEach(function (v, i) {
59
63
  var type = v.type,
60
64
  props = v.props;
61
65
 
@@ -122,7 +126,7 @@ export default (function (props) {
122
126
  }));
123
127
  };
124
128
 
125
- if (lang === 'en') {
129
+ if (lang === 'en' && specialSceneDefaultShow) {
126
130
  return React.createElement(_Dropdown, {
127
131
  overlay: menu(newChildren || []),
128
132
  arrow: true
@@ -48,7 +48,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
48
48
  var clsPrefix = 'tnt-more-menus';
49
49
 
50
50
  var _default = function _default(props) {
51
- var _lastChildPart2;
51
+ var _newChildren, _lastChildPart2;
52
52
 
53
53
  var _ref = props || {},
54
54
  _ref$children = _ref.children,
@@ -60,7 +60,8 @@ var _default = function _default(props) {
60
60
  divider = _ref$divider === void 0 ? true : _ref$divider,
61
61
  lessOneMoreFit = _ref.lessOneMoreFit,
62
62
  popConfirmHandle = _ref.popConfirmHandle,
63
- rest = _objectWithoutProperties(_ref, ["children", "type", "num", "divider", "lessOneMoreFit", "popConfirmHandle"]);
63
+ isIconBtn = _ref.isIconBtn,
64
+ rest = _objectWithoutProperties(_ref, ["children", "type", "num", "divider", "lessOneMoreFit", "popConfirmHandle", "isIconBtn"]);
64
65
 
65
66
  var _ref2 = props || {},
66
67
  propsLang = _ref2.lang;
@@ -75,12 +76,15 @@ var _default = function _default(props) {
75
76
  })) || [];
76
77
  } else if (children) {
77
78
  newChildren.push(children);
78
- }
79
+ } // 子元素大于1个,且不是 icon元素
80
+
81
+
82
+ var specialSceneDefaultShow = ((_newChildren = newChildren) == null ? void 0 : _newChildren.length) > 1 && !isIconBtn;
79
83
 
80
- if (lang === 'en' || popConfirmHandle) {
81
- var _newChildren;
84
+ if (specialSceneDefaultShow && (lang === 'en' || popConfirmHandle)) {
85
+ var _newChildren2;
82
86
 
83
- (_newChildren = newChildren) == null ? void 0 : _newChildren.forEach(function (v, i) {
87
+ (_newChildren2 = newChildren) == null ? void 0 : _newChildren2.forEach(function (v, i) {
84
88
  var type = v.type,
85
89
  props = v.props;
86
90
 
@@ -147,7 +151,7 @@ var _default = function _default(props) {
147
151
  }));
148
152
  };
149
153
 
150
- if (lang === 'en') {
154
+ if (lang === 'en' && specialSceneDefaultShow) {
151
155
  return _react["default"].createElement(_dropdown["default"], {
152
156
  overlay: menu(newChildren || []),
153
157
  arrow: true
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tntd",
3
- "version": "1.4.30",
3
+ "version": "1.4.31",
4
4
  "description": "ued tnt design",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",