easy3wmui 0.0.22 → 0.0.25

package/assets/index.css

@@ -10,6 +10,7 @@
 }
 :root:root .adm-card-header-title {
   font-size: var(--adm-font-size-6);
+  font-weight: normal;
 }
 :root:root .adm-input {
   --font-size: var(--adm-font-size-4);
@@ -66,6 +67,9 @@
   padding: 12px;
 }
 :root:root .adm-list-card {
+  margin: 0;
+}
+:root:root .adm-list .adm-list-card {
   margin: 0 12px;
 }
 :root:root .adm-list-item {
@@ -198,6 +202,15 @@
   -ms-flex: auto;
       flex: auto;
   max-width: none;
+  text-align: right;
+}
+#Easy3wMGridPage .e3wmLongText .adm-list-item-content-main {
+  max-width: none;
+  -ms-flex: auto;
+      flex: auto;
+}
+#Easy3wMGridPage .adm-list-item-description {
+  border-top: var(--border-top);
 }
 #Easy3wMLogin .errorMsgReal {
   background: #fff1f0;

package/assets/mGridPage.css

@@ -18,4 +18,13 @@
   -ms-flex: auto;
       flex: auto;
   max-width: none;
+  text-align: right;
+}
+#Easy3wMGridPage .e3wmLongText .adm-list-item-content-main {
+  max-width: none;
+  -ms-flex: auto;
+      flex: auto;
+}
+#Easy3wMGridPage .adm-list-item-description {
+  border-top: var(--border-top);
 }

package/lib/Easy3wMGridPage/index.js

@@ -26,34 +26,19 @@ var _numeral = require('numeral');
 
 var _numeral2 = _interopRequireDefault(_numeral);
 
-var _Easy3wMCollapse = require('../Easy3wMCollapse');
-
-var _Easy3wMCollapse2 = _interopRequireDefault(_Easy3wMCollapse);
-
-var _Easy3wMEmpty = require('../Easy3wMEmpty');
-
-var _Easy3wMEmpty2 = _interopRequireDefault(_Easy3wMEmpty);
-
-var _Easy3wMStepper = require('../Easy3wMStepper');
-
-var _Easy3wMStepper2 = _interopRequireDefault(_Easy3wMStepper);
-
-var _Easy3wMList = require('../Easy3wMList');
-
-var _Easy3wMList2 = _interopRequireDefault(_Easy3wMList);
-
-var _Easy3wMCard = require('../Easy3wMCard');
-
-var _Easy3wMCard2 = _interopRequireDefault(_Easy3wMCard);
-
-var _Easy3wMSpace = require('../Easy3wMSpace');
-
-var _Easy3wMSpace2 = _interopRequireDefault(_Easy3wMSpace);
+var _easy3wmui = require('easy3wmui');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-var Panel = _Easy3wMCollapse2['default'].Panel;
-var Item = _Easy3wMList2['default'].Item;
+// import Easy3wMCollapse from '../Easy3wMCollapse';
+// import Easy3wMEmpty from '../Easy3wMEmpty';
+// import Easy3wMStepper from '../Easy3wMStepper';
+// import Easy3wMList from '../Easy3wMList';
+// import Easy3wMCard from '../Easy3wMCard';
+// import Easy3wMSpace from '../Easy3wMSpace';
+
+var Panel = _easy3wmui.Easy3wMCollapse.Panel;
+var Item = _easy3wmui.Easy3wMList.Item;
 
 var Easy3wMGridPage = function (_Component) {
 	(0, _inherits3['default'])(Easy3wMGridPage, _Component);
@@ -163,35 +148,38 @@ var Easy3wMGridPage = function (_Component) {
 
 			return (// 单项数据
 				_react2['default'].createElement(
-					_Easy3wMList2['default'],
+					_easy3wmui.Easy3wMList,
 					listProps,
 					columns.map(function (column) {
-						var title = column.title,
-						    key = column.key,
-						    dataIndex = column.dataIndex;
-
-						var fieldId = dataIndex || key;
-						var extra = column.render ? column.render(dataItem[fieldId], dataItem) : _this.touchFormatData(dataItem, column);
 						if (column.children) {
 							return _react2['default'].createElement(
-								_Easy3wMList2['default'],
-								(0, _extends3['default'])({ mode: 'card' }, listProps, { header: title }),
+								_easy3wmui.Easy3wMList,
+								(0, _extends3['default'])({ mode: 'card' }, listProps, { header: column.title }),
 								column.children.map(function (childrenColumn) {
+									var type = childrenColumn.type;
+
 									var childrenFieldId = childrenColumn.dataIndex || childrenColumn.key;
 									var childrenExtra = childrenColumn.render ? childrenColumn.render(dataItem[childrenFieldId], dataItem) : _this.touchFormatData(dataItem, childrenColumn);
-									return _react2['default'].createElement(
-										Item,
-										(0, _extends3['default'])({}, itemProps, { extra: childrenExtra }),
-										childrenColumn.title
-									);
+									if (type === 'longText') {
+										return _react2['default'].createElement(Item, (0, _extends3['default'])({ className: 'e3wmLongText' }, itemProps, { title: childrenColumn.title, description: childrenExtra }));
+									} else {
+										return _react2['default'].createElement(Item, (0, _extends3['default'])({}, itemProps, { title: childrenColumn.title, extra: childrenExtra }));
+									}
 								})
 							);
 						} else {
-							return _react2['default'].createElement(
-								Item,
-								(0, _extends3['default'])({}, itemProps, { extra: extra }),
-								title
-							);
+							var title = column.title,
+							    key = column.key,
+							    dataIndex = column.dataIndex,
+							    type = column.type;
+
+							var fieldId = dataIndex || key;
+							var extra = column.render ? column.render(dataItem[fieldId], dataItem) : _this.touchFormatData(dataItem, column);
+							if (type === 'longText') {
+								return _react2['default'].createElement(Item, (0, _extends3['default'])({ className: 'e3wmLongText' }, itemProps, { title: title, description: extra }));
+							} else {
+								return _react2['default'].createElement(Item, (0, _extends3['default'])({}, itemProps, { title: title, extra: extra }));
+							}
 						}
 					}),
 					children ? _this.renderEasy3wMGridPage(children) : '',
@@ -252,7 +240,7 @@ var Easy3wMGridPage = function (_Component) {
 				'div',
 				null,
 				collapseFlag ? _react2['default'].createElement(
-					_Easy3wMCollapse2['default'],
+					_easy3wmui.Easy3wMCollapse,
 					collapseProps,
 					this.renderEasy3wMGridPage(dataList)
 				) : _react2['default'].createElement(
@@ -262,18 +250,18 @@ var Easy3wMGridPage = function (_Component) {
 				)
 			) : // 空状态
 			_react2['default'].createElement(
-				_Easy3wMCard2['default'],
+				_easy3wmui.Easy3wMCard,
 				null,
-				_react2['default'].createElement(_Easy3wMEmpty2['default'], (0, _extends3['default'])({}, emptyProps, { description: emptyProps.description || '暂无数据' }))
+				_react2['default'].createElement(_easy3wmui.Easy3wMEmpty, (0, _extends3['default'])({}, emptyProps, { description: emptyProps.description || '暂无数据' }))
 			),
 			dataList && dataList.length && !collapseFlag ? _react2['default'].createElement(
-				_Easy3wMCard2['default'],
+				_easy3wmui.Easy3wMCard,
 				null,
 				_react2['default'].createElement(
 					'div',
 					{ className: 'easy3wMGridPageStepper' },
 					_react2['default'].createElement(
-						_Easy3wMSpace2['default'],
+						_easy3wmui.Easy3wMSpace,
 						null,
 						_react2['default'].createElement(
 							'span',
@@ -282,7 +270,7 @@ var Easy3wMGridPage = function (_Component) {
 							dataList.length,
 							'\u6761'
 						),
-						_react2['default'].createElement(_Easy3wMStepper2['default'], (0, _extends3['default'])({}, stepperProps, {
+						_react2['default'].createElement(_easy3wmui.Easy3wMStepper, (0, _extends3['default'])({}, stepperProps, {
 							step: 1 // 每次改变步数，可以为小数
 							, digits: 0 // 格式化到小数点后固定位数，设置为 0 表示格式化到整数
 							, min: 1 // 最小值

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wmui",
-  "version": "0.0.22",
+  "version": "0.0.25",
   "description": "easy3wmui components for react",
   "keywords": [
     "react",