fmui-base 2.2.10 → 2.2.12

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.12：表单UI修改
+- 2.2.11：关联字段编辑方式为编辑时互相冲突问题解决
 - 2.2.10：表单组件样式
 - 2.2.9：统一待办列表样式
 - 2.2.8：深圳CA加签

package/lib/form/form.js

@@ -3166,15 +3166,17 @@ var PageHome = function (_React$Component) {
             _react2.default.createElement(
               'div',
               { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
-              _react2.default.createElement(_TextField2.default, {
+              _react2.default.createElement(_TextareaField2.default, {
                 className: 't-W100',
                 required: t.state.itemParam.required,
                 readOnly: t.state.itemParam.readOnly,
                 label: t.state.itemParam.title,
+                minRows: 1,
+                maxRows: 1,
                 placeholder: t.state.itemParam.readOnly ? '' : t.state.itemParam.placeholder,
                 value: t.state.itemParam.value,
                 onChange: function onChange(value) {
-                  t.handleTextChange(t.state.itemParam, value);
+                  t.handleTextAreaChange(t.state.itemParam, value);
                 }
                 // onFocus={(value) => { t.handleTextFocus(t.state.itemParam, value); }}
                 // onBlur={(value) => { t.handleTextBlur(t.state.itemParam, value); }}

package/lib/form/table.js

@@ -862,13 +862,17 @@ var PageHome = function (_React$Component) {
 			var thisSubTblNo = thisItem.subTblNo;
 			var mustFields = [];
 			var hideFields = [];
+			var showFields = [];
 
 			var defaultmustFields = [];
 			var defaulthideFields = [];
+			var defaultshowFields = [];
 
 			var fieldControll = this.props.fieldControll;
 			var hiddenFields = fieldControll.hiddenFields;
 			var mustFieldsStr = fieldControll.mustFields;
+			var showFieldsStr = fieldControll.showFields;
+
 			if (hiddenFields && hiddenFields != '') {
 				for (var i = 0; i < hiddenFields.split(',').length; i++) {
 					if (hiddenFields.split(',')[i] && hiddenFields.split(',')[i] != '') {
@@ -883,6 +887,13 @@ var PageHome = function (_React$Component) {
 					}
 				}
 			}
+			if (showFieldsStr && showFieldsStr != '') {
+				for (var i = 0; i < showFieldsStr.split(',').length; i++) {
+					if (showFieldsStr.split(',')[i] && showFieldsStr.split(',')[i] != '') {
+						defaultshowFields.push(showFieldsStr.split(',')[i]);
+					}
+				}
+			}
 
 			console.log("dealwithRelaField===table===");
 			if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
@@ -992,10 +1003,10 @@ var PageHome = function (_React$Component) {
 								}
 							} else if (editType == 'edit') {
 								relaFieldMap["key"] = "readOnly";
-								if (triggerFieldVal == nowValue) {
+								if (triggerFieldVal == nowValue && defaultshowFields.indexOf(relaFieldTblNameArrayItem) != -1) {
 									relaFieldMap["value"] = false;
 									editFlag = true;
-								} else if (!editFlag) {
+								} else if (!editFlag && defaultshowFields.indexOf(relaFieldTblNameArrayItem) != -1) {
 									relaFieldMap["value"] = true;
 								} else {
 									relaFieldMap["value"] = false;

package/lib/react_grid/react_grid.js

@@ -621,7 +621,7 @@ var MyGrid = function (_React$Component) {
       var componentContent = _react2.default.createElement(
         'div',
         null,
-        _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
+        _react2.default.createElement('img', { className: 't-PL10 t-PR10', style: { height: '88px', margin: 'auto', display: 'block' }, src: '../../../fmui/images/home/nodata.png' })
       );
       var componentHead = '';
       if (item.portletCode === 'banner') {
@@ -773,7 +773,7 @@ var MyGrid = function (_React$Component) {
               ) : _react2.default.createElement(
                 'div',
                 null,
-                _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
+                _react2.default.createElement('img', { className: 't-PL10 t-PR10', style: { height: '88px', margin: 'auto', display: 'block' }, src: '../../../fmui/images/home/nodata.png' })
               )
             ),
             _react2.default.createElement(
@@ -823,7 +823,7 @@ var MyGrid = function (_React$Component) {
               ) : _react2.default.createElement(
                 'div',
                 null,
-                _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
+                _react2.default.createElement('img', { className: 't-PL10 t-PR10', style: { height: '88px', margin: 'auto', display: 'block' }, src: '../../../fmui/images/home/nodata.png' })
               )
             )
           )
@@ -855,7 +855,7 @@ var MyGrid = function (_React$Component) {
             commonList = _react2.default.createElement(
               'div',
               null,
-              _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
+              _react2.default.createElement('img', { className: 't-PL10 t-PR10', style: { height: '88px', margin: 'auto', display: 'block' }, src: '../../../fmui/images/home/nodata.png' })
             );
           }
         }
@@ -886,7 +886,7 @@ var MyGrid = function (_React$Component) {
             colectionList = _react2.default.createElement(
               'div',
               null,
-              _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
+              _react2.default.createElement('img', { className: 't-PL10 t-PR10', style: { height: '88px', margin: 'auto', display: 'block' }, src: '../../../fmui/images/home/nodata.png' })
             );
           }
         }
@@ -1118,7 +1118,7 @@ var MyGrid = function (_React$Component) {
                   { className: 'info-more-btn', onClick: t.jumpPage.bind(this, "/channelDetail/" + item.channelId + '/' + item.columnId + '/' + item.columnName) },
                   '\u67E5\u770B\u66F4\u591A'
                 )
-              ) : _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10 t-MT16', src: '../../../fmui/images/home/nodata.png' })
+              ) : _react2.default.createElement('img', { className: 't-PL10 t-PR10 t-MT16', style: { height: '88px', margin: 'auto', display: 'block' }, src: '../../../fmui/images/home/nodata.png' })
             );
           });
         }
@@ -1184,7 +1184,7 @@ var MyGrid = function (_React$Component) {
             gryjContent = _react2.default.createElement(
               'div',
               null,
-              _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
+              _react2.default.createElement('img', { className: 't-PL10 t-PR10', style: { height: '88px', margin: 'auto', display: 'block' }, src: '../../../fmui/images/home/nodata.png' })
             );
           }
         }
@@ -1239,7 +1239,7 @@ var MyGrid = function (_React$Component) {
             ggyjContent = _react2.default.createElement(
               'div',
               null,
-              _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
+              _react2.default.createElement('img', { className: 't-PL10 t-PR10', style: { height: '88px', margin: 'auto', display: 'block' }, src: '../../../fmui/images/home/nodata.png' })
             );
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "2.2.10",
+  "version": "2.2.12",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",

package/lib/ScrollList/BottomTip.jsx

@@ -1,25 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-class BottomTip extends React.Component {
-  static displayName = 'BottomTip';
-  static defaultProps = {
-    text: '',
-    icon: null,
-  };
-  static propTypes = {
-    icon: PropTypes.element,
-    text: PropTypes.string,
-  };
-
-  render() {
-    return (
-      <div className="bottom-tip">
-        {this.props.icon}
-        <div className="text">{this.props.text}</div>
-      </div>);
-  }
-}
-
-export default BottomTip;
-

package/lib/ScrollList/EmptyContent.jsx

@@ -1,19 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const EmptyContent = props => (
-  <div key="empty-content" className="empty-content">
-    {props.image ? <div className="icon" style={{ backgroundImage: `url(${props.image})` }} /> : null}
-    {props.text ? <div className="text">{props.text}</div> : null}
-  </div>
-);
-EmptyContent.defaultProps = {
-  image: undefined,
-  text: undefined,
-};
-EmptyContent.propTypes = {
-  image: PropTypes.string,
-  text: PropTypes.string,
-};
-
-export default EmptyContent;

package/lib/ScrollList/Item.jsx

@@ -1,132 +0,0 @@
-import React from 'react';
-import classnames from 'classnames';
-import PropTypes from 'prop-types';
-import Badge from 'saltui/lib/Badge';
-
-class Item extends React.Component {
-  static propTypes = {
-    prefixCls: PropTypes.string,
-    className: PropTypes.string,
-    img: PropTypes.string,
-    avatar: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
-    title: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
-    description: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
-    badge: PropTypes.oneOfType([PropTypes.string, PropTypes.element, PropTypes.number, PropTypes.bool]),
-    badgePosition: PropTypes.string,
-    desMaxLine: PropTypes.number,
-    extra: PropTypes.any,
-    borderType: PropTypes.string,
-    onClick: PropTypes.func,
-  };
-  static defaultProps = {
-    prefixCls: 't-scroll-list-item',
-    desMaxLine: 2,
-    className: undefined,
-    img: undefined,
-    avatar: undefined,
-    title: undefined,
-    description: undefined,
-    badge: undefined,
-    badgePosition: 'followTitle', // indicator/followTitle/titleRight
-    extra: undefined,
-    borderType: '',
-    onClick: () => {},
-  };
-
-  renderImg() {
-    const { img, prefixCls } = this.props;
-    if (typeof img === 'string') {
-      return (<img alt="" className={`${prefixCls}-img`} src={img} />);
-    }
-    return img;
-  }
-
-  renderAvatar() {
-    const { avatar, prefixCls } = this.props;
-    if (typeof avatar === 'string') {
-      return (<img alt="" className={`${prefixCls}-avatar`} src={avatar} />);
-    }
-    return avatar;
-  }
-
-  renderTitle() {
-    const { title, prefixCls, badgePosition } = this.props;
-    if (!title) return null;
-    return (
-      <div className={classnames(`${prefixCls}-title`, {
-        [badgePosition]: true,
-      })}
-      >{title}{badgePosition === 'indicator' ? null : this.renderBadge()}
-      </div>);
-  }
-
-  renderBadge() {
-    const { badge, prefixCls } = this.props;
-    const className = `${prefixCls}-badge`;
-    if (typeof badge === 'string') {
-      return (<Badge text={badge} className={className} />);
-    } else if (typeof badge === 'number') {
-      return (<Badge count={badge} className={className} />);
-    } else if (typeof badge === 'boolean') {
-      return (<Badge dot className={className} />);
-    }
-    return badge;
-  }
-
-  renderDes() {
-    const { description, prefixCls, desMaxLine } = this.props;
-    if (description) {
-      return (
-        <div className={`${prefixCls}-des`}>
-          <div
-            className={`${prefixCls}-des-inner`}
-            style={{
-              WebkitLineClamp: desMaxLine,
-            }}
-          >
-            {description}
-          </div>
-        </div>
-      );
-    }
-    return null;
-  }
-
-  renderExtra() {
-    const { extra, prefixCls } = this.props;
-    if (extra) {
-      return (
-        <div className={`${prefixCls}-extra`}>
-          <div className={`${prefixCls}-extra-inner`}>{extra}</div>
-        </div>
-      );
-    }
-    return null;
-  }
-  render() {
-    const {
-      prefixCls, className, borderType, badgePosition, onClick,
-    } = this.props;
-    return (
-      <div
-        className={classnames({
-          [prefixCls]: true,
-          [className]: !!className,
-          [borderType]: !!borderType,
-        })}
-        onClick={() => { onClick(this.props); }}
-      >
-        {this.renderImg()}
-        {this.renderAvatar()}
-        <div className={`${prefixCls}-content`}>
-          {this.renderTitle()}
-          {this.renderDes()}
-        </div>
-        {badgePosition === 'indicator' ? this.renderBadge() : null}
-        {this.renderExtra()}
-      </div>
-    );
-  }
-}
-
-export default Item;