@steedos/service-pages 2.2.52-beta.6 → 2.2.53-beta.2

package/LICENSE.txt

@@ -6,14 +6,11 @@ To determine under which license you may use a file from the Steedos source code
 please resort to the header of that file.
 
 If the file has no header, the following rules apply
-1. project templates are licensed under MIT, see License.MIT.txt
-2. enterprise features are licensed under Steedos Enterprise Terms, see License.enterprise.txt
-3. source code that is neither (1) nor (2) is licensed under AGPL, see License.AGPL.txt
+1. enterprise features are licensed under Steedos Enterprise Terms, see License.enterprise.txt
+2. source code that is neither (1) is licensed under MIT, see https://opensource.org/licenses/MIT
 
 On request, licenses under different terms are available.
 
-Project templates can be found in the folders steedos-projects/
-
 Source code of enterprise features are files that
 * are in folders named "ee" or start with "ee_", or in subfolders of such folders.
 * contain the strings "ee_" in its filename name.

package/main/default/client/page.render.client.js

@@ -370,10 +370,16 @@
             title: title,
             afterUpdate: function () {
                 setTimeout(function () {
+                    if(["/app/:app_id/:object_name/view/:record_id", "/app/:app_id/:object_name/:record_id/:related_object_name/grid"].indexOf(FlowRouter.current().route.pathDef) > -1){
+                        // 记录详细界面编辑子表记录，或相关子表列表界面编辑子表记录
+                        var params = FlowRouter.current().params;
+                        if(params.record_id !== recordId){
+                            // ObjectForm有缓存，修改子表记录可能会有主表记录的汇总字段变更，需要刷新主表记录
+                            SteedosUI.reloadRecord(params.object_name, params.record_id)
+                        }
+                    }
                     if (FlowRouter.current().route.path.endsWith("/:record_id")) {
                         FlowRouter.reload()
-                        // ObjectForm有缓存，修改子表记录可能会有主表记录的汇总字段变更，需要刷新表单数据
-                        SteedosUI.reloadRecord(objectApiName, recordId)
                     } else {
                         window.refreshDxSchedulerInstance()
                         window.refreshGrid(options.gridName);
@@ -424,13 +430,14 @@
                 let referenceTo = objectFields[fieldName].reference_to;
                 const refObject = Creator.getObject(referenceTo)
                 if(!refObject){
+                    window.lodash.remove(fieldsName, function(item) { return item === fieldName; });
                     console.error(`未找到对象“${referenceTo}”，请检查是否该对象依赖的软件包未安装。`);
-                    return;
-                }
-                if(_.includes(fieldsName, fieldName)){
-                    fieldsName[_.indexOf(fieldsName, fieldName)] = `${fieldName}:${fieldName}__expand{_id, _NAME_FIELD_VALUE:${refObject.NAME_FIELD_KEY}${spaceUsersCompanyIdsExpand}}`
                 }else{
-                    fieldsName.push(`${fieldName}:${fieldName}__expand{_id, _NAME_FIELD_VALUE:${refObject.NAME_FIELD_KEY}${spaceUsersCompanyIdsExpand}}`)
+                    if(_.includes(fieldsName, fieldName)){
+                        fieldsName[_.indexOf(fieldsName, fieldName)] = `${fieldName}:${fieldName}__expand{_id, _NAME_FIELD_VALUE:${refObject.NAME_FIELD_KEY}${spaceUsersCompanyIdsExpand}}`
+                    }else{
+                        fieldsName.push(`${fieldName}:${fieldName}__expand{_id, _NAME_FIELD_VALUE:${refObject.NAME_FIELD_KEY}${spaceUsersCompanyIdsExpand}}`)
+                    }
                 }
             }
         })

package/package.json

@@ -1,16 +1,15 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.2.52-beta.6",
+  "version": "2.2.53-beta.2",
   "main": "package.service.js",
-  "scripts": {
-    "i18n": "concurrently yarn:i18n:*",
-    "i18n:cn": "steedos i18n zh-CN -s ./../../steedos-projects/project-template -p ./../../services/service-pages",
-    "i18n:en": "steedos i18n en -s ./../../steedos-projects/project-template -p ./../../services/service-pages"
-  },
+  "scripts": {},
   "license": "MIT",
   "private": false,
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d255340f2b91b94ecc809ac7840552997b8ff5f5"
+  "gitHead": "d6d2230d72af49a72fc546093b553463cd2f0e9d",
+  "dependencies": {
+    "ejs": "^3.1.8"
+  }
 }