fmui-base 2.3.18 → 2.3.20

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.20：移动端流程表单选人字段默认值支持选择当前用户，当前用户组织，与宏值逻辑一致
+- 2.3.19：移动端流程表单支持在线编辑
 - 2.3.18：流程抢占加签支持加签多人，流程表单支持在线编辑
 - 2.3.17：流程提交保存时增加表单的乐观锁校验功能，用来校验该表单数据在办理时有无被其他人修改过
 - 2.3.16：选人组件：常用类型增加用户全选功能

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: [], //态度列表
@@ -1267,10 +1271,6 @@ var PageHome = function (_React$Component) {
             popCode = form.popuserMap.popCode;
             chooseWay = form.popuserMap.chooseWay;
             itemParam.chooseObj = form.popuserMap.chooseObj;
-            //表单默认值
-            if (form.popuserMap.defaultUserScopeJson) {
-              itemParam.defaultValue = JSON.parse(form.popuserMap.defaultUserScopeJson);
-            }
           } else {
             popCode = form.popuserMap.chooseObj;
             //兼容老数据
@@ -1290,6 +1290,25 @@ var PageHome = function (_React$Component) {
             }
             chooseWay = form.popuserMap.chooseWay;
           }
+          //表单默认值（当前用户/组织）：与宏值一致，赋值字段清空已保存值，走 defaultValue 回填
+          if (form.popuserMap.defaultUserScopeJson) {
+            try {
+              itemParam.defaultValue = JSON.parse(form.popuserMap.defaultUserScopeJson);
+            } catch (e) {
+              itemParam.defaultValue = form.popuserMap.defaultUserScopeJson;
+            }
+            if (fuzhiFields && fuzhiFields.split(",").indexOf(itemParam.uniqueName) != -1 && itemParam.defaultValue) {
+              value = "";
+              if (mainTblData && mainTblData.length) {
+                for (var _pu = 0; _pu < mainTblData.length; _pu++) {
+                  if (mainTblData[_pu].key == key) {
+                    mainTblData[_pu].value = "";
+                    break;
+                  }
+                }
+              }
+            }
+          }
           if (form.popuserMap.chooseScope) {
             if (form.popuserMap.chooseScope == 5) {
               itemParam.queryLimit = form.popuserMap.chooseScope;
@@ -1388,12 +1407,18 @@ var PageHome = function (_React$Component) {
             }
             t.setState({
               itemParam: itemParam,
-              loaded: true
+              loaded: true,
+              mobileOfficeAllowEdit: false,
+              mobileOfficeResolved: false
             }, function () {
-              var uploadRef = t.refs["upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key];
-              if (uploadRef && typeof uploadRef.initData === 'function') {
-                uploadRef.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 = "";
@@ -1444,12 +1469,17 @@ var PageHome = function (_React$Component) {
           }
           t.setState({
             itemParam: itemParam,
-            loaded: true
+            loaded: true,
+            mobileOfficeAllowEdit: false,
+            mobileOfficeResolved: false
           }, function () {
-            var uploadRef = t.refs["upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key];
-            if (uploadRef && typeof uploadRef.initData === 'function') {
-              uploadRef.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 = "";
@@ -1570,12 +1600,22 @@ var PageHome = function (_React$Component) {
               this.refs['selectMember_' + key].initSelectData();
             }
           }
-          if (itemType == 'upload' || itemType == 'image' && itemParam.imagetype != '1' || itemType == 'weboffice') {
+          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) {
               this.refs["note_file_" + t.state.itemParam.fieldId].initData();
@@ -3617,7 +3657,11 @@ var PageHome = function (_React$Component) {
       }
       itemParam.value = recordId;
       t.setState({
-        itemParam: itemParam
+        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') {
@@ -3651,6 +3695,56 @@ var PageHome = function (_React$Component) {
         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) {
@@ -3659,8 +3753,22 @@ var PageHome = function (_React$Component) {
         _Toast2.default.show({ content: 'Office SDK 未加载' });
         return;
       }
-      var ctx = this.buildOfficeCtx();
+      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);
     }
   }, {
@@ -3691,8 +3799,14 @@ var PageHome = function (_React$Component) {
     key: 'clickPop',
     value: function clickPop() {
       if (!this.state.itemParam.readOnly) {
-        // weboffice 走云编辑；其它类型（如 html）仍提示不支持
+        // 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;
         }
@@ -4756,7 +4870,24 @@ var PageHome = function (_React$Component) {
               _react2.default.createElement(
                 'div',
                 { className: 't-W100' },
-                t.state.itemParam.readOnly ? _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,

package/package.json

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