@steedos/service-plugin-amis 2.4.0-beta.8 → 2.4.0

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

@@ -19,23 +19,24 @@
                     "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",
                 "url": "${context.rootUrl}/graphql?rf=1653731141728",
                 "cache": 100,
-                "adaptor": "var data = payload.data.data[0] || { _filters_type_controller: 'conditions' };\n//数据格式转换\nif (data) {\n    data.columns = lodash.map(data.columns, 'field');\n    data.sort = lodash.map(data.sort, (item) => {\n        return `${item.field_name}:${item.order || 'asc'}`\n    });\n    data.mobile_columns = lodash.map(data.mobile_columns, 'field');\n    data.searchable_fields = lodash.map(data.searchable_fields, 'field');\n\n    if (data.filters && lodash.isString(data.filters)) {\n        try {\n            data.filters = JSON.parse(data.filters);\n        }catch(e){}\n    }\n\n    if (data.filters && lodash.isString(data.filters)) {\n        data._filters_type_controller = 'function';\n    } else {\n        data._filters_type_controller = 'conditions'\n    }\n\n    if (data._filters_type_controller === 'conditions') {\n        data._filters_conditions = window.amisConvert.filtersToConditions(data.filters || []);\n    } else {\n        data._filters_function = data.filters;\n    }\n}\npayload.data = data;\ndelete payload.extensions;\nreturn payload;",
+                "adaptor": "const recordId = api.body.recordId;\nvar data;\nif (recordId) {\n    console.log('recordId==>', recordId)\n    data = payload.data.data[0] || { _filters_type_controller: 'conditions' };\n    //数据格式转换\n    if (data) {\n        data.columns = lodash.map(data.columns, 'field');\n        data.sort = lodash.map(data.sort, (item) => {\n            return `${item.field_name}:${item.order || 'asc'}`\n        });\n        data.mobile_columns = lodash.map(data.mobile_columns, 'field');\n        data.searchable_fields = lodash.map(data.searchable_fields, 'field');\n\n        if (data.filters && lodash.isString(data.filters)) {\n            try {\n                data.filters = JSON.parse(data.filters);\n            } catch (e) { }\n        }\n\n        if (data.filters && lodash.isString(data.filters)) {\n            data._filters_type_controller = 'function';\n        } else {\n            data._filters_type_controller = 'conditions'\n        }\n\n        if (data._filters_type_controller === 'conditions') {\n            data._filters_conditions = window.amisConvert.filtersToConditions(data.filters || []);\n        } else {\n            data._filters_function = data.filters;\n        }\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}\nfor (key in data) {\n    if (data[key] === null) {\n        delete data[key];\n    }\n}\npayload.data = data;\ndelete payload.extensions;\nreturn payload;",
                 "data": {
-                    "query": "{data:object_listviews(filters:[\"_id\", \"=\", \"${recordId}\"]){_id,label,name,object_name,filter_scope,shared,show_count,columns,filter_fields,sort,filters,filter_logic,mobile_columns,searchable_fields,sort_no,created,created_by:created_by__expand{_id,name},modified,modified_by:modified_by__expand{_id,name},enable_amis_schema,amis_schema,_display{shared,show_count,created,modified}}}"
+                    "recordId": "${recordId}",
+                    "defaultData": "${defaultData}",
+                    "query": "{data:object_listviews(filters:[\"_id\", \"=\", \"${recordId}\"]){_id,label,name,object_name,requestAdaptor,adaptor,filter_scope,shared,show_count,columns,filter_fields,sort,filters,filter_logic,mobile_columns,searchable_fields,sort_no,created,created_by:created_by__expand{_id,name},modified,modified_by:modified_by__expand{_id,name},enable_amis_schema,amis_schema,_display{shared,show_count,created,modified}}}"
                 },
-                "sendOn": "!!this.recordId",
                 "replaceData": false,
                 "responseData": {
                     "&": "$$"
@@ -298,7 +299,7 @@
                             "label": "js脚本",
                             "name": "_filters_function",
                             "id": "u:84714ec9abba",
-                            "visibleOn": "!!this.object_name && _filters_type_controller == 'function'",
+                            "visibleOn": "!!this.object_name && !!this._filters_type_controller && _filters_type_controller== 'function'",
                             "className": "col-span-2 m-0",
                             "labelClassName": "hidden"
                         }
@@ -442,6 +443,39 @@
                         "title": "searchable"
                     }
                 },
+                {
+                    "type": "fieldSet",
+                    "title": "数据接口",
+                    "description": "获取列表数据的 api",
+                    "collapsable": true,
+                    "body": [
+                        {
+                            "type": "editor",
+                            "name": "requestAdaptor",
+                            "label": "发送适配器",
+                            "required": false,
+                            "language": "javascript",
+                            "description": "函数签名：(api) => api， 数据在 api.data 中，修改后返回 api 对象。",
+                            "className": "col-span-2 m-1",
+                            "labelClassName": "text-left"
+                        },
+                        {
+                            "type": "editor",
+                            "name": "adaptor",
+                            "label": "接收适配器",
+                            "required": false,
+                            "language": "javascript",
+                            "description": "函数签名: (payload, response, api) => payload",
+                            "className": "col-span-2 m-1",
+                            "labelClassName": "text-left"
+                        }
+                    ],
+                    "collapsed": true,
+                    "visibleOn": "!!this.object_name",
+                    "en-US": {
+                        "title": "API"
+                    }
+                },
                 {
                     "type": "fieldSet",
                     "title": "高级",
@@ -483,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

@@ -17,11 +17,11 @@
                     "recordId": "${recordId}",
                     "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\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    ",
+                "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}"
                 }
@@ -29,10 +29,11 @@
             "initApi": {
                 "method": "post",
                 "url": "${context.rootUrl}/graphql",
-                "sendOn": "!!this.recordId",
                 "cache": 100,
-                "adaptor": "var data = payload.data.data[0];\nif(data){\n    data.object_name = data.object_name ? data.object_name.name:null;\n    \n    \n    //初始化接口返回的字段移除字段值为null的字段\n    for (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": "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",
                 "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}}}"
                 },
                 "headers": {
@@ -88,7 +89,7 @@
                                             "id": "u:4e769995f638",
                                             "source": {
                                                 "method": "get",
-                                                "url": "/service/api/amis-metadata-objects/objects/options",
+                                                "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/options",
                                                 "headers": {
                                                     "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                                 }
@@ -228,7 +229,8 @@
                                                                 "id": "u:a0027ac6f8c1",
                                                                 "closeOnEsc": false,
                                                                 "closeOnOutside": false,
-                                                                "showCloseButton": true
+                                                                "showCloseButton": true,
+                                                                "size": "md"
                                                             },
                                                             "label": "设置按钮",
                                                             "id": "u:1ac8afc8a9bb"
@@ -241,7 +243,7 @@
                                             "id": "u:bef2e378d96f",
                                             "api": {
                                                 "method": "get",
-                                                "url": "/service/api/amis-metadata-objects/objects/${object_name}/actions/options",
+                                                "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${object_name}/actions/options",
                                                 "adaptor": "let data = payload.data;\ndata.buttons_options = data.options;\ndelete data.options\npayload.data = data;\nreturn payload;\n",
                                                 "sendOn": "!!this.object_name",
                                                 "headers": {
@@ -496,7 +498,7 @@
                                             "affixFooter": false,
                                             "api": {
                                                 "method": "get",
-                                                "url": "/service/api/amis-metadata-objects/objects/${object_name}/fields/layout_options",
+                                                "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${object_name}/fields/layout_options",
                                                 "adaptor": "let data = payload.data;\ndata.fields_options = data.options;\ndata.field_groups_options = lodash.uniq(lodash.compact(lodash.map(data.options, \"group\"))) || [];\ndelete data.options\npayload.data = data;\nreturn payload;\n",
                                                 "sendOn": "!!this.object_name",
                                                 "data": null,
@@ -536,7 +538,7 @@
                                             "id": "u:dbadaff47153",
                                             "api": {
                                                 "method": "get",
-                                                "url": "/service/api/amis-metadata-objects/objects/${object_name}/relatedLists/options",
+                                                "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${object_name}/relatedLists/options",
                                                 "sendOn": "!!this.object_name",
                                                 "adaptor": "let data = payload.data;\ndata.related_lists_options = data.options;\ndelete data.options\npayload.data = data;\nreturn payload;\n",
                                                 "headers": {
@@ -700,7 +702,9 @@
                                                             "name": "filters",
                                                             "label": "过滤规则",
                                                             "quickEdit": {
-                                                                "type": "input-text",
+                                                                "type": "editor",
+                                                                "language": "javascript",
+                                                                "description": "函数签名：(filters, data) => 自定义过滤条件， 数据在 data 中，修改后返回 自定义过滤条件",
                                                                 "tpl": "<b><%=data.filters%></b>",
                                                                 "className": "col-span-2 m-0",
                                                                 "labelClassName": "text-left",
@@ -859,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/main/default/services/metadata/objects.service.js

@@ -302,9 +302,10 @@ module.exports = {
                     actionsArr.push(action)
                 })
                 return _.uniq(_.compact(_.map(_.sortBy(actionsArr, "sort"), (action)=>{
+                    const label = action.label || action.name
                     return {
                         value: action.name,
-                        label: action.label || action.name
+                        label: `${label}(${action.name})`
                     }
                 })));
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.4.0-beta.8",
+  "version": "2.4.0",
   "main": "package.service.js",
   "scripts": {
     "build": "yarn build:tailwind-base && yarn build:tailwind",
@@ -14,7 +14,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos-widgets/amis-lib": "^1.0.10"
+    "@steedos-widgets/amis-lib": "^1.0.22"
   },
-  "gitHead": "61fe4ff720d68127dadcd728b9bc465b62c38855"
+  "gitHead": "70a4e7417d8d86c47cf5c7e3bbe0e89f2cee4222",
+  "devDependencies": {
+    "tailwindcss": "3.2.4"
+  }
 }

package/public/amis/amis.css

@@ -6,17 +6,12 @@
 
 .page-template-root{
     height: 100%;
-    background: #ffffff;
 }
 /* .amis-scope svg {
     display: inline !important;
     vertical-align: initial !important;
 } */
 
-body{
-    -webkit-font-smoothing: inherit !important;
-}
-
 /* .row-main{
     border-radius: 0.25rem
 } */
@@ -52,15 +47,6 @@ body{
     min-width: 100px;
 }
 
-.steedos-amis-form .antd-Collapse .antd-Form--normal, .antd-Form--normal .antd-Tabs .antd-Tabs-content .antd-Tabs-pane .form-content{
-    display: grid!important;
-    grid-template-columns: repeat(2,minmax(0,1fr))!important;
-    grid-row-gap: 1rem!important;
-    row-gap: 1rem!important;
-    grid-column-gap: 1.5rem!important;
-    -moz-column-gap: 1.5rem!important;
-    column-gap: 1.5rem!important;
-}
 
 /* fix checkbox 隐藏时导致滚动条异常 */
 .steedos-amis-form .antd-Collapse .antd-Form--normal .antd-Checkbox input{
@@ -76,10 +62,6 @@ body{
         border-bottom: none;
     }
     
-    .steedos-amis-form .antd-Collapse .antd-Form--normal{
-        grid-template-columns: none !important;
-    }
-
     .ant-modal-root .amis-scope .antd-Panel-footerWrap{
         position: fixed;
     }