@steedos/service-plugin-amis 2.4.0-beta.4 → 2.4.0-beta.41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (19) hide show
  1. package/main/default/client/amis.render.client.js +65 -33
  2. package/main/default/pages/action_field_updates.page.amis.json +266 -0
  3. package/main/default/pages/action_field_updates.page.yml +12 -0
  4. package/main/default/pages/apps_form.page.amis.json +22 -3
  5. package/main/default/pages/apps_form.page.yml +0 -2
  6. package/main/default/pages/generate_object_tabs.page.amis.json +3 -2
  7. package/main/default/pages/listview_form.page.amis.json +38 -4
  8. package/main/default/pages/object_layouts.page.amis.json +14 -27
  9. package/main/default/services/metadata/objects.service.js +2 -1
  10. package/package.json +6 -3
  11. package/public/amis/amis.css +0 -18
  12. package/public/tailwind/tailwind-steedos.css +154 -111
  13. package/public/translations/amis/zh-CN.json +2 -2
  14. package/tailwind.config.js +1 -1
  15. package/main/default/client/load.assets.client.js +0 -26
  16. package/main/default/client/style.client.js +0 -24
  17. package/main/default/client/tailwind.client.js +0 -35
  18. package/main/default/objects/pages/fields/render_engine.field.yml +0 -11
  19. package/main/default/objects/pages/pages.object.yml +0 -2
package/main/default/pages/object_layouts.page.amis.json CHANGED
@@ -17,7 +17,7 @@
17
17
  "recordId": "${recordId}",
18
18
  "modalName": "${modalName}"
19
19
  },
20
- "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 ",
20
+ "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 ",
21
21
  "responseData": {
22
22
  "recordId": "${record._id}"
23
23
  },
@@ -29,10 +29,11 @@
29
29
  "initApi": {
30
30
  "method": "post",
31
31
  "url": "${context.rootUrl}/graphql",
32
- "sendOn": "!!this.recordId",
33
32
  "cache": 100,
34
- "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",
33
+ "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",
35
34
  "data": {
35
+ "recordId": "${recordId}",
36
+ "defaultData": "${defaultData}",
36
37
  "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}}}"
37
38
  },
38
39
  "headers": {
@@ -88,7 +89,7 @@
88
89
  "id": "u:4e769995f638",
89
90
  "source": {
90
91
  "method": "get",
91
- "url": "/service/api/amis-metadata-objects/objects/options",
92
+ "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/options",
92
93
  "headers": {
93
94
  "Authorization": "Bearer ${context.tenantId},${context.authToken}"
94
95
  }
@@ -228,7 +229,8 @@
228
229
  "id": "u:a0027ac6f8c1",
229
230
  "closeOnEsc": false,
230
231
  "closeOnOutside": false,
231
- "showCloseButton": true
232
+ "showCloseButton": true,
233
+ "size": "md"
232
234
  },
233
235
  "label": "设置按钮",
234
236
  "id": "u:1ac8afc8a9bb"
@@ -241,7 +243,7 @@
241
243
  "id": "u:bef2e378d96f",
242
244
  "api": {
243
245
  "method": "get",
244
- "url": "/service/api/amis-metadata-objects/objects/${object_name}/actions/options",
246
+ "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${object_name}/actions/options",
245
247
  "adaptor": "let data = payload.data;\ndata.buttons_options = data.options;\ndelete data.options\npayload.data = data;\nreturn payload;\n",
246
248
  "sendOn": "!!this.object_name",
247
249
  "headers": {
@@ -496,7 +498,7 @@
496
498
  "affixFooter": false,
497
499
  "api": {
498
500
  "method": "get",
499
- "url": "/service/api/amis-metadata-objects/objects/${object_name}/fields/layout_options",
501
+ "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${object_name}/fields/layout_options",
500
502
  "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",
501
503
  "sendOn": "!!this.object_name",
502
504
  "data": null,
@@ -536,7 +538,7 @@
536
538
  "id": "u:dbadaff47153",
537
539
  "api": {
538
540
  "method": "get",
539
- "url": "/service/api/amis-metadata-objects/objects/${object_name}/relatedLists/options",
541
+ "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${object_name}/relatedLists/options",
540
542
  "sendOn": "!!this.object_name",
541
543
  "adaptor": "let data = payload.data;\ndata.related_lists_options = data.options;\ndelete data.options\npayload.data = data;\nreturn payload;\n",
542
544
  "headers": {
@@ -700,7 +702,9 @@
700
702
  "name": "filters",
701
703
  "label": "过滤规则",
702
704
  "quickEdit": {
703
- "type": "input-text",
705
+ "type": "editor",
706
+ "language": "javascript",
707
+ "description": "函数签名：(filters, data) => 自定义过滤条件， 数据在 data 中，修改后返回 自定义过滤条件",
704
708
  "tpl": "<b><%=data.filters%></b>",
705
709
  "className": "col-span-2 m-0",
706
710
  "labelClassName": "text-left",
@@ -836,24 +840,7 @@
836
840
  ],
837
841
  "panelClassName": "m-0 -mt-3",
838
842
  "bodyClassName": "p-4",
839
- "actions": [
840
- {
841
- "type": "button",
842
- "label": "取消",
843
- "actionType": "",
844
- "level": "default",
845
- "block": false,
846
- "onClick": "SteedosUI.getRef(props.data.__super.modalName).close();",
847
- "id": "u:bf2587b53d64"
848
- },
849
- {
850
- "type": "button",
851
- "label": "保存",
852
- "actionType": "submit",
853
- "level": "info",
854
- "id": "u:08afd6e53cab"
855
- }
856
- ],
843
+ "actions": [],
857
844
  "actionsClassName": "p-sm b-t b-light text-center",
858
845
  "className": "steedos-amis-form",
859
846
  "checkAll": false,
package/main/default/services/metadata/objects.service.js CHANGED
@@ -302,9 +302,10 @@ module.exports = {
302
302
  actionsArr.push(action)
303
303
  })
304
304
  return _.uniq(_.compact(_.map(_.sortBy(actionsArr, "sort"), (action)=>{
305
+ const label = action.label || action.name
305
306
  return {
306
307
  value: action.name,
307
- label: action.label || action.name
308
+ label: `${label}(${action.name})`
308
309
  }
309
310
  })));
310
311
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/service-plugin-amis",
3
- "version": "2.4.0-beta.4",
3
+ "version": "2.4.0-beta.41",
4
4
  "main": "package.service.js",
5
5
  "scripts": {
6
6
  "build": "yarn build:tailwind-base && yarn build:tailwind",
@@ -14,7 +14,10 @@
14
14
  "access": "public"
15
15
  },
16
16
  "dependencies": {
17
- "@steedos-widgets/amis-lib": "^1.0.10"
17
+ "@steedos-widgets/amis-lib": "^1.0.22"
18
18
  },
19
- "gitHead": "c5a7aceb7af7ffa19263bf9de5bce97daa467491"
19
+ "gitHead": "899b75edfc401d65418d77acbce2d1ef1400e7d8",
20
+ "devDependencies": {
21
+ "tailwindcss": "3.2.4"
22
+ }
20
23
  }
package/public/amis/amis.css CHANGED
@@ -6,17 +6,12 @@
6
6
 
7
7
  .page-template-root{
8
8
  height: 100%;
9
- background: #ffffff;
10
9
  }
11
10
  /* .amis-scope svg {
12
11
  display: inline !important;
13
12
  vertical-align: initial !important;
14
13
  } */
15
14
 
16
- body{
17
- -webkit-font-smoothing: inherit !important;
18
- }
19
-
20
15
  /* .row-main{
21
16
  border-radius: 0.25rem
22
17
  } */
@@ -52,15 +47,6 @@ body{
52
47
  min-width: 100px;
53
48
  }
54
49
 
55
- .steedos-amis-form .antd-Collapse .antd-Form--normal, .antd-Form--normal .antd-Tabs .antd-Tabs-content .antd-Tabs-pane .form-content{
56
- display: grid!important;
57
- grid-template-columns: repeat(2,minmax(0,1fr))!important;
58
- grid-row-gap: 1rem!important;
59
- row-gap: 1rem!important;
60
- grid-column-gap: 1.5rem!important;
61
- -moz-column-gap: 1.5rem!important;
62
- column-gap: 1.5rem!important;
63
- }
64
50
 
65
51
  /* fix checkbox 隐藏时导致滚动条异常 */
66
52
  .steedos-amis-form .antd-Collapse .antd-Form--normal .antd-Checkbox input{
@@ -76,10 +62,6 @@ body{
76
62
  border-bottom: none;
77
63
  }
78
64
 
79
- .steedos-amis-form .antd-Collapse .antd-Form--normal{
80
- grid-template-columns: none !important;
81
- }
82
-
83
65
  .ant-modal-root .amis-scope .antd-Panel-footerWrap{
84
66
  position: fixed;
85
67
  }