fmui-base 1.0.49 → 2.0.0

package/lib/selectMember/select.less

@@ -1,29 +1,40 @@
-.t-crumb-scroll{
-  width:100% !important;
+.t-crumb-scroll {
+  width: 100% !important;
 
 }
-.t-crumb{
+
+.t-crumb {
   height: 34px;
-  padding:5px 16px;
+  padding: 5px 16px;
 }
-.t-disable-mask{
+
+.t-disable-mask {
   position: absolute;
   left: 0;
   right: 0;
   top: 0;
   bottom: 0;
-  background-color: rgba(255,255,255,.4);
+  background-color: rgba(255, 255, 255, .4);
 }
+
 .t-checkbox-field-icon-list.disabled {
-  background-color: rgba(31,56,88,.1);
+  background-color: rgba(31, 56, 88, .1);
 }
-.dd-app-avatar{
+
+.dd-app-avatar {
   height: 101px !important;
 }
+
 .t-checkbox-field-icon-list {
-    background: #38adff;
+  background: #38adff;
 }
-.select-member-div-top{
+
+.select-member-div-top {
   left: 0;
   background: #f7f7f7;
+}
+
+//4.0规范修改样式
+.t-search-bar-input[type=search] {
+  border-radius: 83px !important;
 }

package/lib/signature/sign.js

@@ -334,13 +334,13 @@ var Page = function (_React$Component) {
                     { style: { background: '#f2f3f5', height: '35px', padding: '10px 5px' } },
                     _react2.default.createElement(
                         'span',
-                        { className: 't-FCddblue' },
+                        { className: 't-FCblue' },
                         _react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14' }),
                         t.props.title
                     ),
                     _react2.default.createElement(
                         'span',
-                        { onClick: t.popDraw.bind(t), className: 't-FCddblue t-FR' },
+                        { onClick: t.popDraw.bind(t), className: 't-FCblue t-FR' },
                         t.state.fileId == "" ? "去手写签名" : "重写签名"
                     )
                 ),

package/lib/upload/upload.js

@@ -155,7 +155,6 @@ var PageHome = function (_React$Component) {
             limitNo: limitNo,
             context: context,
             uploadUrl: context + '/api/m/plugin/attachment/mobile/createFile?token=' + token,
-            // uploadUrl: context + '/api/m/plugin/attachment/mobile/createFile?token=eyJhbGciOiJIUzUxMiIsInppcCI6IkRFRiJ9.eNqMzz1OAzEQhuG7uI4l79rr2OkokRAVF_DMzoSFZL3anyQI0cBBEA0dx4rEMRijVFSUfv3os_ysHuZObVTNtsY1gA5gkna8bnRErnRkqCvi0NomqpWaFigYo03iggUg9GCqYNFAZI_gEqPAbpoE8o5OkCbSc36kXk80Hmgst2lWm8pHG4w3oV4pOg2XYF0oAfM4XLcyYYRjf5v2JIfvt4_z1_v581XiLm-7_u5pKH04tlIW2b9CzEsv6-p-X17KzB3STbHS5nGhC_wd_8dH8rj9Q71rk-VCfagttpRcaCr18gMAAP__.H79vBsL4T7TyEKIa1TciTI8VgGQFSXT82nQdlW7_v3gT4NO2txshOwruwudd6UjcrueiO3MTDYlFQA7R6Ha8qg',
             urlPrev: context + '/api/m/plugin/attachment/mobile/viewImage?token=' + token + '&fid=',
             queryUrl: context + '/api/m/plugin/attachment/mobile/getAttachmentByIds?token=' + token + '&ids=',
             //queryUrl: context + '/client/approve/getCanBackActivity?ids=',
@@ -234,17 +233,15 @@ var PageHome = function (_React$Component) {
                         return false;
                     }
                 }
-                console.info('queuefileadded', file);
+                // console.info('queuefileadded', file);
                 file.session().progress(function (e) {
-                    console.info('progress', e);
+                    // console.info('progress', e);
                 }).fail(function (error) {
                     console.info(error);
                 }).done(function (response) {
                     console.info(response.getJson());
                 });
-            })
-            // 进度条
-            .on(_uploadcore.Events.FILE_UPLOAD_PROGRESS, function (file, progress) {
+            }).on(_uploadcore.Events.FILE_UPLOAD_PROGRESS, function (file, progress) {
                 _this2.setState({
                     percent1: progress.percentage
                 });
@@ -326,7 +323,7 @@ var PageHome = function (_React$Component) {
                 }
             }).on(_uploadcore.Events.FILE_UPLOAD_COMPLETED, function (file) {
                 if (file.getStatus() === _uploadcore.Status.SUCCESS) {
-                    //alert('上传成功');
+                    // alert('上传成功');
                     var result = file.response.getJson();
                     if (result.code == -1) {
                         alert(result.message);
@@ -575,7 +572,7 @@ var PageHome = function (_React$Component) {
                 ),
                 _react2.default.createElement(
                     'div',
-                    { className: t.state.uploadType == 'image' ? "t-FBH t-PL16 t-fw" : "t-PL16 t-PR16" },
+                    { className: t.state.uploadType == 'image' ? "t-FBH t-fw" : "upload" },
                     t.state.initList.map(function (item, i) {
                         function calculate(no) {
                             var a = no / 1024;
@@ -590,23 +587,43 @@ var PageHome = function (_React$Component) {
                         }
                         return t.state.uploadType == 'image' ? _react2.default.createElement(
                             'div',
-                            { className: 'dd-uploaded', key: i },
-                            _react2.default.createElement('img', { width: '60', height: '60', src: t.state.urlPrev + item.id + '&token=' + t.state.token }),
+                            { className: 'upload-image-item', key: i },
+                            _react2.default.createElement('img', { width: '100', height: '98', src: t.state.urlPrev + item.id + '&token=' + t.state.token }),
                             _react2.default.createElement('i', { className: t.state.canDel ? 'iconfont icon-minus' : 't-DN', onClick: _this3.del.bind(_this3, i) })
-                        ) : _react2.default.createElement(
+                        ) :
+                        // <div className="t-FBH" key={i}  >
+                        //     <div className="dd-t-border t-P6 t-MB10 t-FB1" onClick={this.view.bind(this, item)}>
+                        //         <i className="iconfont icon-file t-FC9 t-FL t-MR6" ></i>
+                        //         <div className="dd-t-list-text-content" >
+                        //             <div className="t-list-title t-omit t-LH1_4" >
+                        //                 {typeof(item.fileDisplayName)=='undefined'?item.name:item.fileDisplayName}
+                        //             </div>
+                        //             <div className="dd-t-list-time t-FBAC" >{calculate(typeof(item.fileSize)=='undefined'?item.size:item.fileSize)}</div>
+                        //         </div>
+                        //     </div>
+                        //     <i  className={t.state.canDel?'iconfont icon-minus t-BC04 t-WH25 t-R50 t-ML10 t-FCf t-LH1 t-MT10':'t-DN'}  onClick={this.del.bind(this,i)}></i>
+                        // </div>
+
+                        /* 4.0修改 */
+                        _react2.default.createElement(
                             'div',
-                            { className: 't-FBH', key: i },
+                            { className: 'upload-list', key: i },
                             _react2.default.createElement(
                                 'div',
-                                { className: 'dd-t-border t-P6 t-MB10 t-FB1', onClick: _this3.view.bind(_this3, item) },
-                                _react2.default.createElement('i', { className: 'iconfont icon-file t-FC9 t-FL t-MR6' }),
+                                { className: 'upload-content' },
                                 _react2.default.createElement(
                                     'div',
-                                    { className: 'dd-t-list-text-content' },
+                                    { className: 'dd-t-border upload-list-item', onClick: _this3.view.bind(_this3, item) },
                                     _react2.default.createElement(
                                         'div',
-                                        { className: 't-list-title t-omit t-LH1_4' },
-                                        typeof item.fileDisplayName == 'undefined' ? item.name : item.fileDisplayName
+                                        { className: 'upload-list-item-content' },
+                                        _react2.default.createElement('i', { className: 'iconfont icon-PDF' }),
+                                        _react2.default.createElement(
+                                            'div',
+                                            { className: 't-list-title t-omit t-LH1_4' },
+                                            typeof item.fileDisplayName == 'undefined' ? item.name : item.fileDisplayName
+                                        ),
+                                        _react2.default.createElement('i', { className: t.state.canDel ? 'iconfont icon-delete' : 't-DN', onClick: _this3.del.bind(_this3, i) })
                                     ),
                                     _react2.default.createElement(
                                         'div',
@@ -614,9 +631,7 @@ var PageHome = function (_React$Component) {
                                         calculate(typeof item.fileSize == 'undefined' ? item.size : item.fileSize)
                                     )
                                 )
-                            ),
-                            _react2.default.createElement('i', { className: t.props.canDownload ? 'iconfont icon-download1 t-BC04 t-WH25 t-R50 t-ML10 t-FCf t-LH1 t-MT10' : 't-DN', style: { "paddingTop": "4px", "paddingLeft": "4px" }, onClick: _this3.downloadFile.bind(_this3, item) }),
-                            _react2.default.createElement('i', { className: t.state.canDel ? 'iconfont icon-minus t-BC04 t-WH25 t-R50 t-ML10 t-FCf t-LH1 t-MT10' : 't-DN', style: { "paddingTop": "4px", "paddingLeft": "4px" }, onClick: _this3.del.bind(_this3, i) })
+                            )
                         );
                     }),
                     _react2.default.createElement(
@@ -624,7 +639,7 @@ var PageHome = function (_React$Component) {
                         { className: t.state.canAdd && (t.state.limitNo > t.state.initList.length || t.state.limitNo == -1) && t.state.percent1 > 0 && t.state.showProgress ? t.state.uploadType == 'image' ? 'upload-image-p' : 'upload-file-p' : 't-DN' },
                         _react2.default.createElement(
                             'div',
-                            { style: { width: '100%', textAlign: 'center' } },
+                            { style: { width: '100%' } },
                             _react2.default.createElement(
                                 'span',
                                 { className: 'upload-progress-tip' },
@@ -635,8 +650,8 @@ var PageHome = function (_React$Component) {
                     ),
                     _react2.default.createElement(
                         'div',
-                        { flex: 1, className: 't-PB10' },
-                        _react2.default.createElement('i', { id: 'ddUploadPic' + t.state.keyNum, className: t.state.canAdd && (t.state.limitNo > t.props.initList.length || t.state.limitNo == -1) ? 'dd-add-btn iconfont icon-plus' : 't-DN' })
+                        { flex: 1, className: t.state.canAdd && (t.state.limitNo > t.state.initList.length || t.state.limitNo == -1) ? t.state.uploadType == 'image' ? 'upload-image' : 'upload-file' : 't-DN' },
+                        _react2.default.createElement('i', { id: 'ddUploadPic' + t.state.keyNum, className: 'iconfont icon-plus' })
                     )
                 )
             );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "1.0.49",
+  "version": "2.0.0",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",
@@ -67,6 +67,7 @@
   },
   "dependencies": {
     "copy-webpack-plugin": "^3.0.1",
-    "saltui": "^4.13.1"
+    "saltui": "^4.13.1",
+    "h5-imageviewer": "^0.7.8"
   }
 }