@steedos/service-plugin-amis 2.4.0-beta.42 → 2.4.0-beta.43

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

@@ -89,6 +89,23 @@
                                   setSchema(result)
                                 }
                               }, [JSON.stringify($schema)])
+
+                              if (!schema)
+                              return render('body', {
+                                "type": "wrapper",
+                                "className": "h-full flex items-center justify-center",
+                                "body": {
+                                  "type": "spinner",
+                                  "show": true
+                                }
+                              })
+
+                              if (props.env.enableAMISDebug && schema) {
+                                console.groupCollapsed("steedos debug", `Render ${asset.componentName}`);
+                                console.trace('Component: ', props, 'Generated Amis Schema: ', schema);
+                                console.groupEnd();
+                              }
+                              
                               return amisReact.createElement(amisReact.Fragment, null, amisReact.createElement(amisReact.Fragment, null, schema && render ? render('body', schema) : ''), amisReact.createElement(amisReact.Fragment, null, render ? render('body', body) : ''));
                             }
                           }

package/main/default/pages/listview_form.page.amis.json

@@ -19,13 +19,13 @@
                     "modalName": "${modalName}"
                 },
                 "requestAdaptor": "const formData = api.data.$;\nconst objectName = api.data.objectName;\nconst fieldsName = Object.keys(formData);\ndelete formData.created;\ndelete formData.created_by;\ndelete formData.modified;\ndelete formData.modified_by;\ndelete formData._display;\n\n//数据格式转换\nformData.columns = lodash.map(formData.columns, (item) => {\n    return { field: item };\n});\n\nformData.sort = lodash.map(formData.sort, (item) => {\n    const arr = item.split(':');\n    return { field_name: arr[0], order: arr[1]};\n});\n\nformData.mobile_columns = lodash.map(formData.mobile_columns, (item) => {\n    return { field: item };\n});\n\nformData.searchable_fields = lodash.map(formData.searchable_fields, (item) => {\n    return { field: item };\n});\n\n\nif (formData._filters_type_controller === 'conditions' && formData._filters_conditions) {\n    formData.filters = window.amisConvert.conditionsToFilters(formData._filters_conditions);\n    // formData.filters = JSON.stringify(window.amisConvert.conditionsToFilters(formData._filters_conditions), null, 4);\n} else {\n    formData.filters = formData._filters_function || null;\n}\n\ndelete formData._filters_type_controller;\ndelete formData._filters_conditions;\ndelete formData._filters_function;\n\nlet query = `mutation{record: ${objectName}__insert(doc: {__saveData}){_id}}`;\nif (formData.recordId) {\n    query = `mutation{record: ${objectName}__update(id: \"${formData.recordId}\", doc: {__saveData}){_id}}`;\n};\ndelete formData._id;\nlet __saveData = JSON.stringify(JSON.stringify(formData));\n\napi.data = { query: query.replace('{__saveData}', __saveData) };\nreturn api;",
+                "adaptor": "if (payload.errors) {\n    payload.status = 2;\n    payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;\n}\nreturn payload;",
                 "responseData": {
                     "recordId": "${record._id}"
                 },
                 "headers": {
                     "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                },
-                "adaptor": "\nvar object_name = Session.get(\"object_name\");\nif (window.FlowRouter && window.FlowRouter.current().route.pathDef === '/app/:app_id/:object_name/grid/:list_view_id' && object_name != 'object_listviews') {\n  var app_id = Session.get(\"app_id\");\n  var list_view_id = payload.data.record._id;\n  var url = \"/app/\" + app_id + \"/\" + object_name + \"/grid/\" + list_view_id;\n  SteedosUI.router.go({ objectName: api.body.objectName, recordId: payload.data.record._id, type: api.body.recordId ? 'edit' : 'new' }, url);\n} else { \n  SteedosUI.router.go({objectName: api.body.objectName, recordId: payload.data.record._id, type: api.body.recordId ? 'edit': 'new'});\n}\n\nreturn payload;\n        "
+                }
             },
             "initApi": {
                 "method": "post",
@@ -517,7 +517,23 @@
             "actionsClassName": "p-sm b-t b-light text-center",
             "className": "steedos-amis-form",
             "language": "javascript",
-            "id": "listview_form"
+            "id": "listview_form",
+            "onEvent": {
+                "submitSucc": {
+                    "weight": 0,
+                    "actions": [
+                        {
+                            "actionType": "broadcast",
+                            "args": {
+                                "eventName": "@data.changed.object_listviews"
+                            },
+                            "data": {
+                                "objectName": "object_listviews"
+                            }
+                        }
+                    ]
+                }
+            }
         }
     ],
     "regions": [

package/main/default/pages/object_layouts.page.amis.json

@@ -18,10 +18,10 @@
                     "modalName": "${modalName}"
                 },
                 "requestAdaptor": "\n        \n        const formData = api.data.$;\n        for (key in formData){\n            // image、select等字段清空值后保存的空字符串转换为null。\n            if(formData[key] === ''){\n                formData[key] = null;\n            }\n        }\n        const objectName = api.data.objectName;\n        const fieldsName = Object.keys(formData);\n        delete formData.created;\n        delete formData.created_by;\n        delete formData.modified;\n        delete formData.modified_by;\n        delete formData._display;\n        delete formData.sort_order_options;\n        delete formData.buttons_options;\n        delete formData.fields_options;\n        delete formData.field_groups_options;\n        delete formData.related_lists_options;\n        delete formData.related_object_fields_options;\n        delete formData.isLookup;\n\n        let query = `mutation{record: ${objectName}__insert(doc: {__saveData}){_id}}`;\n        if(formData.recordId){\n            query = `mutation{record: ${objectName}__update(id: \"${formData.recordId}\", doc: {__saveData}){_id}}`;\n        };\n        delete formData._id;\n        let __saveData = JSON.stringify(JSON.stringify(formData));\n    \n        api.data = {query: query.replace('{__saveData}', __saveData)};\n        return api;\n    ",
+                "adaptor": "if (payload.errors) {\n    payload.status = 2;\n    payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;\n}\nreturn payload;",
                 "responseData": {
                     "recordId": "${record._id}"
                 },
-                "adaptor": "var modal = SteedosUI.getRef(api.body.modalName);\nmodal && modal.close();\n            SteedosUI.router.go({objectName: api.body.objectName, recordId: payload.data.record._id, type: api.body.recordId ? 'edit': 'new'});\n            return payload;\n        ",
                 "headers": {
                     "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                 }
@@ -863,6 +863,20 @@
                             "script": "// 新建页面布局时初始化related_lists默认值，字段值是CRUD表格控件渲染，新建页面布局时，不会自动填充到form中，需要手动填充\nconst initDefaultRelatedLists = function (input, rowValue, prop_name) {\n  const superValues = input.__super.__super || {};\n  if (superValues.recordId) {\n    // 编辑记录本来就会初始化相关字段值，不需要再初始化\n    return;\n  }\n  return {\n    related_lists: superValues.related_lists,\n  }\n}\n\nconst eventData = event.data;\ndoAction({\n  actionType: 'setValue',\n  componentId: \"object-layout-form\",\n  args: {\n    value: initDefaultRelatedLists(eventData)\n  }\n});\n"
                         }
                     ]
+                },
+                "submitSucc": {
+                    "weight": 0,
+                    "actions": [
+                        {
+                            "actionType": "broadcast",
+                            "args": {
+                                "eventName": "@data.changed.object_layouts"
+                            },
+                            "data": {
+                                "objectName": "object_layouts"
+                            }
+                        }
+                    ]
                 }
             },
             "data": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.4.0-beta.42",
+  "version": "2.4.0-beta.43",
   "main": "package.service.js",
   "scripts": {
     "build": "yarn build:tailwind-base && yarn build:tailwind",
@@ -16,7 +16,7 @@
   "dependencies": {
     "@steedos-widgets/amis-lib": "^1.0.22"
   },
-  "gitHead": "88ee3600e5b84738139f20ae8065bca5c62de9fc",
+  "gitHead": "a04deddef8e15dc49c4d66bb252bda0ecd9edb37",
   "devDependencies": {
     "tailwindcss": "3.2.4"
   }