@steedos/service-plugin-amis 2.4.7 → 2.4.8-beta.2

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

@@ -30,15 +30,18 @@
                 "method": "post",
                 "url": "${context.rootUrl}/graphql",
                 "cache": 100,
-                "adaptor": "const recordId = api.body.recordId;\nvar data;\nif (recordId) {\n    data = payload.data.data[0];\n    if (data) {\n        data.object_name = data.object_name ? data.object_name.name : null;\n    }\n}else{\n    const defaultData = api.body.defaultData;\n    let defaultValues = {};\n    // TODO:字段默认值后期添加\n    if (defaultData && _.isObject(defaultData) && !_.isArray(defaultData)) {\n        data = Object.assign({}, defaultValues, defaultData)\n    }\n}\n\n//初始化接口返回的字段移除字段值为null的字段\nfor (key in data){\n    if(data[key] === null){\n        delete data[key];\n    }\n}\n\npayload.data = data;\ndelete payload.extensions;\nreturn payload;\n",
+                "adaptor": "\n\nconst recordId = api.body.recordId;\nlet initialValues = {};\nif (recordId && payload.data.data) {\n    var data = payload.data.data[0];\n    const dataKeys = _.keys(data);\n    const uiSchema = api.body.uiSchema;\n    const fieldKeys = uiSchema && _.keys(uiSchema.fields);\n    if (data) {\n        _.each(dataKeys, function (key) {\n            if (fieldKeys.indexOf(key) < 0) {\n                delete data[key];\n            }\n        })\n\n        //初始化接口返回的字段移除字段值为null的字段\n        for (key in data) {\n            if (data[key] === null) {\n                delete data[key];\n            }\n        }\n    };\n    initialValues = data;\n}\nelse {\n    var uiSchema = api.body.uiSchema;\n    var defaultData = api.body.defaultData;\n    var defaultValues = {};\n    _.each(uiSchema?.fields, function (field) {\n        var value = SteedosUI.getFieldDefaultValue(field, api.body.global);\n        if (value) {\n            defaultValues[field.name] = value;\n        }\n    });\n    if (defaultData && _.isObject(defaultData) && !_.isArray(defaultData)) {\n        defaultValues = Object.assign({}, defaultValues, defaultData)\n    }\n    if (uiSchema.form) {\n        try {\n            var objectFormConfig = JSON.parse(uiSchema.form);\n            initialValues = objectFormConfig.initialValues;\n            if (initialValues) {\n                initialValues = new Function(\"return \" + initialValues)();\n            }\n            if (typeof initialValues === \"function\") {\n                initialValues = initialValues.apply({ doc: defaultValues || {} })\n            }\n        }\n        catch (ex) {\n            console.warn(ex);\n        }\n    }\n    if (_.isObject(initialValues)) {\n        // uiSchema.form.initialValues为函数且执行后为json，则优先取initialValues中的默认值\n        initialValues = Object.assign({}, defaultValues, initialValues);\n    }\n    else {\n        initialValues = defaultValues;\n    }\n}\n\npayload.data = initialValues;\ndelete payload.extensions;\nreturn payload;\n",
                 "data": {
                     "recordId": "${recordId}",
                     "defaultData": "${defaultData}",
-                    "query": "{data:object_layouts(filters:[\"_id\", \"=\", \"${recordId}\"]){_id,name,label,object_name:object_name__expand{name,label},profiles,buttons,fields,related_lists,field_groups,created,created_by:created_by__expand{_id,name},modified,modified_by:modified_by__expand{_id,name},_display{created,modified}}}"
+                    "query": "{data:object_layouts(filters:[\"_id\", \"=\", \"${recordId}\"]){_id,name,label,object_name,profiles,buttons,fields,related_lists,is_system,created,created_by,modified,modified_by,instances,instance_state,_display:_ui{object_name,profiles,buttons,fields,related_lists,is_system,created,created_by,modified,modified_by,instances,instance_state}}}",
+                    "uiSchema": "${uiSchema}",
+                    "objectName": "${objectName}"
                 },
                 "headers": {
                     "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                }
+                },
+                "requestAdaptor": "\n// 所有不想在network请求中发送的数据都应该从data中分离出来，data变量只需要留下query才需要发送出去\nvar { recordId, objectName, uiSchema, global, context, ...data } = api.data;\nif (!recordId) {\n  // 新建则不请求任何数据\n  data.query = \"{data:\" + objectName + \"(filters: \" + JSON.stringify([\"_id\", \"=\", null]) + \", top: 1){_id}}\";\n}\napi.data = data;\nreturn api;"
             },
             "initFetch": true,
             "body": [

package/main/default/services/utils/page-schema.js

@@ -7,7 +7,7 @@ const callObjectServiceAction = async function (actionName, userSession, data) {
 }
 
 const getUISchema = async function (objectName, userSession) {
-    return await callObjectServiceAction(`@${objectName}.getRecordView`, userSession);
+    return await callObjectServiceAction(`objectql.getRecordView`, userSession, { objectName });
 }
 
 const getScopeId = function (objectApiName, type) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.4.7",
+  "version": "2.4.8-beta.2",
   "main": "package.service.js",
   "scripts": {
     "build": "yarn build:tailwind-base && yarn build:tailwind",
@@ -13,7 +13,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a58a5e537a2ff15dda57bf1c31d00f8a9ae19879",
+  "gitHead": "75409cde3a71561adfff93fbb36a7dc1ce5252d5",
   "devDependencies": {
     "tailwindcss": "3.2.4"
   }

package/public/tailwind/tailwind-steedos.css

@@ -103,6 +103,11 @@
   margin-bottom: 0.5rem
 }
 
+.-mx-11 {
+  margin-left: -2.75rem;
+  margin-right: -2.75rem
+}
+
 .mr-4 {
   margin-right: 1rem
 }
@@ -213,6 +218,10 @@
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))
 }
 
+.flex-row {
+  flex-direction: row
+}
+
 .flex-col {
   flex-direction: column
 }