fmui-base 2.3.17 → 2.3.18

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.18：流程抢占加签支持加签多人，流程表单支持在线编辑
 - 2.3.17：流程提交保存时增加表单的乐观锁校验功能，用来校验该表单数据在办理时有无被其他人修改过
 - 2.3.16：选人组件：常用类型增加用户全选功能
 - 2.3.15：时分字段保存丢失值，子表删除时页面空白

package/lib/form/form.js

@@ -1390,7 +1390,10 @@ var PageHome = function (_React$Component) {
               itemParam: itemParam,
               loaded: true
             }, function () {
-              t.refs["upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key].initData();
+              var uploadRef = t.refs["upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key];
+              if (uploadRef && typeof uploadRef.initData === 'function') {
+                uploadRef.initData();
+              }
 
               //修改样式
               var styleStr = "";
@@ -1443,7 +1446,10 @@ var PageHome = function (_React$Component) {
             itemParam: itemParam,
             loaded: true
           }, function () {
-            t.refs["upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key].initData();
+            var uploadRef = t.refs["upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key];
+            if (uploadRef && typeof uploadRef.initData === 'function') {
+              uploadRef.initData();
+            }
 
             //修改样式
             var styleStr = "";
@@ -1565,7 +1571,10 @@ var PageHome = function (_React$Component) {
             }
           }
           if (itemType == 'upload' || itemType == 'image' && itemParam.imagetype != '1' || itemType == 'weboffice') {
-            this.refs["upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key].initData();
+            var uploadRef = this.refs["upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key];
+            if (uploadRef && typeof uploadRef.initData === 'function') {
+              uploadRef.initData();
+            }
           }
           if (itemType == 'note') {
             if (itemParam.noteFileIds) {
@@ -3589,10 +3598,91 @@ var PageHome = function (_React$Component) {
     }
 
     //预览附件
+    /** 新建正文生成 recordId 后回写字段，保证提交与再次编辑复用同一 id */
 
+  }, {
+    key: 'applyGeneratedRecordId',
+    value: function applyGeneratedRecordId(recordId) {
+      if (!recordId) {
+        return;
+      }
+      var t = this;
+      var itemParam = t.state.itemParam;
+      if (!itemParam || itemParam.itemType !== 'weboffice') {
+        return;
+      }
+      // 已有同一 recordId 则无需重复回写
+      if (itemParam.value === recordId || String(itemParam.value) === String(recordId)) {
+        return;
+      }
+      itemParam.value = recordId;
+      t.setState({
+        itemParam: itemParam
+      });
+      var data = t.editData(itemParam.key, recordId, t.props.data);
+      if (typeof t.props.onChange === 'function') {
+        t.props.onChange(data, itemParam);
+      }
+    }
+  }, {
+    key: 'buildOfficeCtx',
+    value: function buildOfficeCtx(file) {
+      var t = this;
+      var recordId = '';
+      var value = t.state.itemParam.value;
+      if (value) {
+        if (typeof value === 'string') {
+          recordId = value;
+        } else if (value instanceof Array && value.length > 0) {
+          // weboffice 字段存库为 recordId 字符串；列表态兜底取 id
+          recordId = value[0].recordId || value[0].id || '';
+        }
+      }
+      return {
+        recordId: recordId,
+        attachmentId: file ? file.id : t.state.itemParam.initIds,
+        moduleCode: t.state.module,
+        module: t.state.module,
+        readOnly: t.state.itemParam.readOnly,
+        formData: t.props.data,
+        dataId: t.props.dataId,
+        processInstanceId: t.props.processInstanceId,
+        fileExt: file ? file.fileExt : '.doc',
+        onRecordIdGenerated: t.applyGeneratedRecordId.bind(t)
+      };
+    }
+  }, {
+    key: 'openWeboffice',
+    value: function openWeboffice(mode) {
+      console.info('openWeboffice', mode);
+      if (typeof MobileOffice === 'undefined') {
+        _Toast2.default.show({ content: 'Office SDK 未加载' });
+        return;
+      }
+      var ctx = this.buildOfficeCtx();
+      ctx.mode = mode || 'edit';
+      MobileOffice.open(ctx);
+    }
+  }, {
+    key: 'previewWeboffice',
+    value: function previewWeboffice(file) {
+      console.info('previewWeboffice-->');
+      if (typeof MobileOffice === 'undefined') {
+        var id = file.id;
+        var fileExt = file.fileExt;
+        downloadFile(id, 'android', fileExt);
+        return;
+      }
+      var ctx = this.buildOfficeCtx(file);
+      MobileOffice.preview(ctx);
+    }
   }, {
     key: 'viewFile',
     value: function viewFile(file) {
+      if (this.state.itemParam && this.state.itemParam.itemType === 'weboffice') {
+        this.previewWeboffice(file);
+        return;
+      }
       var id = file.id;
       var fileExt = file.fileExt;
       downloadFile(id, 'android', fileExt);
@@ -3601,6 +3691,11 @@ var PageHome = function (_React$Component) {
     key: 'clickPop',
     value: function clickPop() {
       if (!this.state.itemParam.readOnly) {
+        // weboffice 走云编辑；其它类型（如 html）仍提示不支持
+        if (this.state.itemParam.itemType === 'weboffice') {
+          this.openWeboffice('edit');
+          return false;
+        }
         _Toast2.default.show({
           content: "移动端暂不支持该类型编辑"
         });
@@ -4661,7 +4756,7 @@ var PageHome = function (_React$Component) {
               _react2.default.createElement(
                 'div',
                 { className: 't-W100' },
-                _react2.default.createElement(_upload2.default, {
+                t.state.itemParam.readOnly ? _react2.default.createElement(_upload2.default, {
                   ref: "upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key,
                   canAdd: false,
                   canDel: false,
@@ -4671,10 +4766,37 @@ var PageHome = function (_React$Component) {
                   initIds: t.state.itemParam.initIds,
                   dir: t.state.module,
                   fileSizeLimit: 0,
+                  onView: t.previewWeboffice.bind(t),
                   onChange: function onChange(value, isInit) {
                     t.handleChangeOffice(t.state.itemParam.key, value, isInit);
                   }
-                })
+                }) : _react2.default.createElement(
+                  'div',
+                  { className: 't-field-box t-FBH t-FBAC t-FBJ' },
+                  _react2.default.createElement(
+                    'div',
+                    { className: t.state.itemParam.required ? 't-field-layout-h-label required' : 't-field-layout-h-label' },
+                    _react2.default.createElement(
+                      'span',
+                      { style: t.state.itemParam.formStyleObj.titleStyle == null ? {} : t.state.itemParam.formStyleObj.titleStyle },
+                      t.state.itemParam.title
+                    )
+                  ),
+                  _react2.default.createElement(
+                    'div',
+                    { className: 't-P16' },
+                    _react2.default.createElement(
+                      'span',
+                      {
+                        className: 't-FCblue t-FS14',
+                        onClick: function onClick() {
+                          t.openWeboffice('edit');
+                        }
+                      },
+                      '\u7F16\u8F91\u6B63\u6587'
+                    )
+                  )
+                )
               ),
               t.state.itemParam.isVerifySing == "1" ? _react2.default.createElement('i', { className: 'iconfont icon-checked t-PT10', style: { color: 'green' } }) : t.state.itemParam.isVerifySing == "2" ? _react2.default.createElement('i', { className: 'iconfont icon-close t-PT10', style: { color: 'red' } }) : ""
             )

package/lib/process_info/processInfo.js

@@ -8899,7 +8899,7 @@ var PageHome = function (_React$Component) {
                             placeholder: '\u8BF7\u9009\u62E9',
                             code: 'org,group',
                             chooseType: 'userNotOrg',
-                            checkType: this.state.participantMode == '3' ? 'radio' : 'checkbox',
+                            checkType: 'checkbox',
                             ref: "selectMember_addSign",
                             isDelete: true,
                             onChange: this.addSignCallback.bind(this)

package/package.json

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