fmui-base 2.3.19 → 2.3.21

package/README.md

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

package/lib/form/form.js

@@ -1271,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;
             //兼容老数据
@@ -1294,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;
@@ -3741,16 +3756,20 @@ var PageHome = function (_React$Component) {
       var t = this;
       var ctx = t.buildOfficeCtx();
       ctx.mode = mode || 'edit';
-      // 可编辑入口二次校验：仅 wpsWebOffice
+      // 可编辑入口：进页已解析为 wps 时不再二次 resolveType（企微 location.href 卸页易导致请求 abort → 误弹「无法识别正文类型」）
       if (mode !== 'preview' && ctx.mode !== 'preview' && !ctx.readOnly) {
+        if (t.state.mobileOfficeResolved && t.state.mobileOfficeAllowEdit) {
+          MobileOffice.open(ctx);
+          return;
+        }
         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: '无法识别正文类型' });
+        }).catch(function (err) {
+          console.error('[openWeboffice] resolveType failed', err);
         });
         return;
       }

package/lib/process_info/processInfo.js

@@ -7822,6 +7822,23 @@ var PageHome = function (_React$Component) {
                 if (!fieldMap || Object.keys(fieldMap).length == 0) {
                     return;
                 }
+                var isPopuserVal = function isPopuserVal(v) {
+                    return v && (typeof v === 'undefined' ? 'undefined' : _typeof(v)) == 'object' && !Array.isArray(v) && (v.type == 'popuser' || v.defaultUserScopeJson);
+                };
+                var parsePopDefault = function parsePopDefault(popVal) {
+                    if (!popVal) {
+                        return null;
+                    }
+                    var json = popVal.defaultUserScopeJson;
+                    if (typeof json == 'string') {
+                        try {
+                            return JSON.parse(json);
+                        } catch (e) {
+                            return null;
+                        }
+                    }
+                    return json || null;
+                };
                 var editFormData = t.state.editFormData || {};
                 var mainTblData = editFormData.mainTblData || [];
                 var mainTblName = editFormData.mainTblName || t.state.form && t.state.form.formTblName || '';
@@ -7849,9 +7866,10 @@ var PageHome = function (_React$Component) {
                     } else if (mainTblName && mapKey.indexOf(mainTblName + '$') === 0) {
                         itemCode = mapKey.substring(mainTblName.length + 1);
                     }
+                    var storeVal = isPopuserVal(newVal) ? '' : newVal;
                     for (var i = 0; i < mainTblData.length; i++) {
                         if (mainTblData[i].key == itemCode || mainTblData[i].key == mapKey) {
-                            mainTblData[i].value = newVal;
+                            mainTblData[i].value = storeVal;
                         }
                     }
                     // 可编辑 / 只读字段均通过 Form.reloadItemParam 刷新展示
@@ -7874,7 +7892,12 @@ var PageHome = function (_React$Component) {
                                 continue;
                             }
                             try {
-                                formRef.reloadItemParam([{ key: 'value', value: newVal }]);
+                                if (isPopuserVal(newVal)) {
+                                    var popDefault = parsePopDefault(newVal);
+                                    formRef.reloadItemParam([{ key: 'value', value: '' }, { key: 'defaultValue', value: popDefault }]);
+                                } else {
+                                    formRef.reloadItemParam([{ key: 'value', value: newVal }]);
+                                }
                                 // 只读 TextField 偶发不跟 props，强制再刷一次
                                 if (typeof formRef.forceUpdate === 'function') {
                                     formRef.forceUpdate();
@@ -7898,8 +7921,23 @@ var PageHome = function (_React$Component) {
                         }
                         var mv = resolveMacroVal(it);
                         if (typeof mv != 'undefined') {
-                            it.defaultValue = mv;
-                            it.value = mv;
+                            if (isPopuserVal(mv)) {
+                                var popDefault = parsePopDefault(mv);
+                                it.value = '';
+                                it.defaultValue = popDefault;
+                                if (!it.popuserMap) {
+                                    it.popuserMap = {};
+                                }
+                                it.popuserMap.defaultUserScopeJson = mv.defaultUserScopeJson;
+                                it.popuserMap.defaultScopeName = mv.scopeName;
+                                it.popuserMap.defaultScopeValue = mv.scopeValue;
+                                if (mv.defaultType) {
+                                    it.popuserMap.defaultType = mv.defaultType;
+                                }
+                            } else {
+                                it.defaultValue = mv;
+                                it.value = mv;
+                            }
                         }
                         if (it.children && it.children.length) {
                             syncDefault(it.children);

package/package.json

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