fmui-base 2.3.17 → 2.3.19

package/README.md

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

package/lib/form/form.js

@@ -201,6 +201,10 @@ var PageHome = function (_React$Component) {
       dataType: dataType,
       prefixName: prefixName,
       loaded: false,
+      // 移动端 weboffice：解析完成前不挂 Upload，避免 initData 把 recordId 冲成附件 id
+      // resolved 后：仅 wpsWebOffice 显示「编辑正文」，其它走只读 Upload
+      mobileOfficeAllowEdit: false,
+      mobileOfficeResolved: false,
       commentList: [],
       phraseListNew: [],
       attitudeList: [], //态度列表
@@ -1388,9 +1392,18 @@ var PageHome = function (_React$Component) {
             }
             t.setState({
               itemParam: itemParam,
-              loaded: true
+              loaded: true,
+              mobileOfficeAllowEdit: false,
+              mobileOfficeResolved: false
             }, function () {
-              t.refs["upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key].initData();
+              // 只读可直接挂 Upload；可编辑须等 resolve，禁止在解析前 initData 回写 value
+              if (t.state.itemParam.readOnly) {
+                var uploadRef = t.refs["upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key];
+                if (uploadRef && typeof uploadRef.initData === 'function') {
+                  uploadRef.initData();
+                }
+              }
+              t.resolveMobileOfficeAllowEdit();
 
               //修改样式
               var styleStr = "";
@@ -1441,9 +1454,17 @@ var PageHome = function (_React$Component) {
           }
           t.setState({
             itemParam: itemParam,
-            loaded: true
+            loaded: true,
+            mobileOfficeAllowEdit: false,
+            mobileOfficeResolved: false
           }, function () {
-            t.refs["upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key].initData();
+            if (t.state.itemParam.readOnly) {
+              var uploadRef = t.refs["upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key];
+              if (uploadRef && typeof uploadRef.initData === 'function') {
+                uploadRef.initData();
+              }
+            }
+            t.resolveMobileOfficeAllowEdit();
 
             //修改样式
             var styleStr = "";
@@ -1564,8 +1585,21 @@ var PageHome = function (_React$Component) {
               this.refs['selectMember_' + key].initSelectData();
             }
           }
-          if (itemType == 'upload' || itemType == 'image' && itemParam.imagetype != '1' || itemType == 'weboffice') {
-            this.refs["upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key].initData();
+          if (itemType == 'upload' || itemType == 'image' && itemParam.imagetype != '1') {
+            var uploadRef = this.refs["upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key];
+            if (uploadRef && typeof uploadRef.initData === 'function') {
+              uploadRef.initData();
+            }
+          }
+          // 扩展把字段改成 weboffice 时：与专用分支一致，解析完成前不 initData
+          if (itemType == 'weboffice') {
+            if (t.state.itemParam.readOnly) {
+              var woUploadRef = this.refs["upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key];
+              if (woUploadRef && typeof woUploadRef.initData === 'function') {
+                woUploadRef.initData();
+              }
+            }
+            t.resolveMobileOfficeAllowEdit();
           }
           if (itemType == 'note') {
             if (itemParam.noteFileIds) {
@@ -3589,10 +3623,159 @@ 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,
+        mobileOfficeResolved: false,
+        mobileOfficeAllowEdit: false
+      }, function () {
+        t.resolveMobileOfficeAllowEdit();
+      });
+      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)
+      };
+    }
+
+    /** 移动端是否允许云编辑入口：当前仅放行 wpsWebOffice */
+
+  }, {
+    key: 'isMobileWpsWebOffice',
+    value: function isMobileWpsWebOffice(resolved) {
+      if (!resolved) {
+        return false;
+      }
+      return resolved.strategy === 'wpsWebOffice' || resolved.officeType === 'wpsWebOffice';
+    }
+
+    /**
+     * 解析正文类型，决定是否显示「编辑正文」。
+     * 可编辑且未解析完成：不挂 Upload（占位），避免 initData 把 recordId 冲成附件 id。
+     * 解析后：wps → 编辑正文；非 wps → Upload 只读样式。
+     */
+
+  }, {
+    key: 'resolveMobileOfficeAllowEdit',
+    value: function resolveMobileOfficeAllowEdit() {
+      var t = this;
+      if (!t.state.itemParam || t.state.itemParam.itemType !== 'weboffice') {
+        return;
+      }
+      var finish = function finish(allow) {
+        t.setState({
+          mobileOfficeAllowEdit: !!allow,
+          mobileOfficeResolved: true
+        }, function () {
+          // 仅 Upload 场景再 initData
+          if (t.state.itemParam.readOnly || !t.state.mobileOfficeAllowEdit) {
+            var uploadRef = t.refs["upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key];
+            if (uploadRef && typeof uploadRef.initData === 'function') {
+              uploadRef.initData();
+            }
+          }
+        });
+      };
+      if (typeof MobileOffice === 'undefined' || typeof MobileOffice.resolveType !== 'function') {
+        finish(false);
+        return;
+      }
+      var ctx = t.buildOfficeCtx();
+      MobileOffice.resolveType(ctx).then(function (resolved) {
+        finish(t.isMobileWpsWebOffice(resolved));
+      }).catch(function () {
+        finish(false);
+      });
+    }
+  }, {
+    key: 'openWeboffice',
+    value: function openWeboffice(mode) {
+      console.info('openWeboffice', mode);
+      if (typeof MobileOffice === 'undefined') {
+        _Toast2.default.show({ content: 'Office SDK 未加载' });
+        return;
+      }
+      var t = this;
+      var ctx = t.buildOfficeCtx();
+      ctx.mode = mode || 'edit';
+      // 可编辑入口二次校验：仅 wpsWebOffice
+      if (mode !== 'preview' && ctx.mode !== 'preview' && !ctx.readOnly) {
+        MobileOffice.resolveType(ctx).then(function (resolved) {
+          if (!t.isMobileWpsWebOffice(resolved)) {
+            _Toast2.default.show({ content: '移动端暂仅支持 WPS 中台在线编辑，请到 PC 端操作' });
+            return;
+          }
+          MobileOffice.open(ctx);
+        }).catch(function () {
+          _Toast2.default.show({ content: '无法识别正文类型' });
+        });
+        return;
+      }
+      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 +3784,17 @@ var PageHome = function (_React$Component) {
     key: 'clickPop',
     value: function clickPop() {
       if (!this.state.itemParam.readOnly) {
+        // weboffice：仅 wps 走云编辑；其它类型（如 html）仍提示不支持
+        if (this.state.itemParam.itemType === 'weboffice') {
+          if (!this.state.mobileOfficeResolved || !this.state.mobileOfficeAllowEdit) {
+            _Toast2.default.show({
+              content: '移动端暂仅支持 WPS 中台在线编辑，请到 PC 端操作'
+            });
+            return false;
+          }
+          this.openWeboffice('edit');
+          return false;
+        }
         _Toast2.default.show({
           content: "移动端暂不支持该类型编辑"
         });
@@ -4661,7 +4855,24 @@ var PageHome = function (_React$Component) {
               _react2.default.createElement(
                 'div',
                 { className: 't-W100' },
-                _react2.default.createElement(_upload2.default, {
+                !t.state.itemParam.readOnly && !t.state.mobileOfficeResolved ? _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 t-FCgray t-FS14' },
+                    '\u52A0\u8F7D\u4E2D...'
+                  )
+                ) : t.state.itemParam.readOnly || !t.state.mobileOfficeAllowEdit ? _react2.default.createElement(_upload2.default, {
                   ref: "upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key,
                   canAdd: false,
                   canDel: false,
@@ -4671,10 +4882,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.19",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",