@steedos/service-plugin-amis 2.3.4 → 2.3.6

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

@@ -33,7 +33,7 @@
                 "sendOn": "!!this.recordId",
                 "adaptor": "var data = payload.data.data[0];\nif(data){\n    //初始化接口返回的字段移除字段值为null的字段\n    for (key in data){\n        if(data[key] === null){\n            delete data[key];\n        }\n    }\n};\nif (data.tab_items && !_.isArray(data.tab_items)) {\n    // 数据库中存储的是对象格式而不是数组，转换为数组用于界面显示\n    let arrTabItems = [];\n    _.each(data.tab_items, function (n, k) {\n        n.tab_name = k;\n        delete n.index;\n        arrTabItems.push(n);\n    });\n    data.tab_items = arrTabItems;\n}\npayload.data = data;\ndelete payload.extensions;\nreturn payload;\n        ",
                 "data": {
-                    "query": "{data:apps(filters:[\"_id\", \"=\", \"${recordId}\"]){_id,name,code,icon_slds,visible,description,tabs,tab_items,tab_groups,objects,mobile_objects,is_creator,mobile,sort,url,is_use_ie,is_use_iframe,is_new_window,on_click,auth_name,secret,is_system,from_code_id,instance_state,created,created_by:created_by__expand{_id,name},modified,modified_by:modified_by__expand{_id,name},_display{visible,is_creator,mobile,is_use_ie,is_use_iframe,is_new_window,is_system,instance_state,created,modified}}}"
+                    "query": "{data:apps(filters:[\"_id\", \"=\", \"${recordId}\"]){_id,name,code,icon_slds,visible, showSidebar, description,tabs,tab_items,tab_groups,objects,mobile_objects,is_creator,mobile,sort,url,is_use_ie,is_use_iframe,is_new_window,on_click,auth_name,secret,is_system,from_code_id,instance_state,created,created_by:created_by__expand{_id,name},modified,modified_by:modified_by__expand{_id,name},_display{visible,is_creator,mobile,is_use_ie,is_use_iframe,is_new_window,is_system,instance_state,created,modified}}}"
                 },
                 "headers": {
                     "Authorization": "Bearer ${context.tenantId},${context.authToken}"
@@ -157,6 +157,15 @@
                                                     "labelClassName": "text-left",
                                                     "id": "u:07a8a4c5f875"
                                                 },
+                                                {
+                                                    "name": "showSidebar",
+                                                    "label": "菜单显示在左侧",
+                                                    "type": "checkbox",
+                                                    "tpl": null,
+                                                    "className": "m-0",
+                                                    "labelClassName": "text-left",
+                                                    "id": "u:07a8a4c5f877"
+                                                },
                                                 {
                                                     "name": "description",
                                                     "label": "描述",
@@ -356,6 +365,7 @@
                                                             }
                                                         }
                                                     ],
+                                                    "headerToolbarClassName": "px-1 py-3",
                                                     "id": "crud_tab_items",
                                                     "perPageAvailable": [
                                                         10
@@ -524,7 +534,16 @@
                             "script": "const data = context.props.data;\nif (!data._id) { \n  return;\n}\nif (data.tab_items) {\n  return;\n}\n\nconst tabOptions = data.tabs_options || [];\nconst tabItems = [];\n// 把应用中原来tabs属性值添加到新的tab_items属性的默认值中\nif (data.tabs && data.tabs.length) {\n  data.tabs.forEach(function (item) {\n    tabItems.push({ tab_name: item });\n  });\n}\nconst pushObjectsToTabItems = function (objects) {\n  objects.forEach(function (item) {\n    // 已经有绑定到指定对象的选项卡就不添加\n    let existObjectItem = !!tabItems.find(function (tabItem) {\n      return !!tabOptions.find(function (option) {\n        return tabItem.tab_name === tabItem.value && option.object === item;\n      });\n    });\n    if (existObjectItem) {\n      return;\n    }\n    // 找到指向指定对象的选项卡\n    let tempOption = tabOptions.find(function (option) {\n      return option.type === \"object\" && option.object === item;\n    });\n    if (!tempOption) {\n      return;\n    }\n    // 选项卡名称如果重复了就不添加\n    let existTabItem = !!tabItems.find(function (tabItem) {\n      return tabItem.tab_name === tempOption.value;\n    });\n    if (existTabItem) {\n      return;\n    }\n    if (tempOption) {\n      tabItems.push({ tab_name: tempOption.value });\n    }\n  });\n}\n// 把应用中原来objects属性值添加到新的tab_items属性的默认值中\nif (data.objects && data.objects.length) {\n  pushObjectsToTabItems(data.objects);\n}\n// 把应用中原来mobile_objects属性值添加到新的tab_items属性的默认值中\nif (data.mobile_objects && data.mobile_objects.length) {\n  pushObjectsToTabItems(data.mobile_objects);\n}\n\ndoAction({\n  actionType: 'setValue',\n  args: {\n    \"value\": { tab_items: tabItems }\n  }\n});"
                         }
                     ]
-                }
+                },
+                "submitSucc": {
+                    "weight": 0,
+                    "actions": [
+                      {
+                        "componentId": "listview_apps",
+                        "actionType": "reload"
+                      }
+                    ]
+                  }
             },
             "id": "apps-form"
         }
@@ -533,13 +552,7 @@
         "body"
     ],
     "data": {
-        "objectName": "apps",
-        "context": {
-            "rootUrl": "http://127.0.0.1:5800",
-            "tenantId": "hKdnwE55WcnWveYxS",
-            "userId": "62ede4f62161e377e35de58c",
-            "authToken": "770a0b9e5b4fc2f8d6317ca109b0c087d3d160da669ac0218c044e15db1da0e74dd7e16c03b9f7e1640539"
-        }
+        "objectName": "apps"
     },
     "id": "u:953fda4052b6",
     "bodyClassName": "p-0",

package/main/default/pages/apps_form.page.yml

@@ -1,6 +1,4 @@
 name: apps_form
-__filename: >-
-  /Users/yinlianghui/Documents/GitHub/steedos-platform2-3/services/service-plugin-amis/main/default/pages/apps_form.page.yml
 is_active: true
 label: 应用程序表单
 object_name: apps

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

@@ -20,7 +20,7 @@
                 },
                 "requestAdaptor": "const formData = api.data.$;\napi.data = { objects: formData.objects };\nreturn api;",
                 "responseData": null,
-                "adaptor": "\nif (api.body.objectName === \"tabs\") {\n  // 在tabs列表操作”对象选项卡“按钮，保存后需要刷新主列表\n  refreshGrid && refreshGrid();\n}\nreturn payload;\n        ",
+                "adaptor": "\nif (api.body.objectName === \"tabs\") {\n  // 在tabs列表操作”对象选项卡“按钮，保存后需要刷新主列表\n}\nreturn payload;\n        ",
                 "headers": {
                     "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                 }
@@ -63,7 +63,7 @@
                     "actions": [
                         {
                             "actionType": "custom",
-                            "script": "const result = event.data.result;\nconst doneCount = result.data && result.data.doneCount || 0;\nconst myMsg = '已成功生成' + doneCount.toString() + \"条选项卡！\";\ndoAction({\n  actionType: 'toast',\n  args: {\n    msg: myMsg,\n    msgType: \"success\"\n  }\n});\nconst errors = result.data && result.data.errors || [];\nif (errors && errors.length) { \n  console.warn(\"以下对象未能生成选项卡：\");\n  console.warn(JSON.stringify(errors));\n}\nconst superData = event.data.__super;\nif (superData && superData.objectName === \"apps\") { \n  // 在应用表单中生成选项卡后需要触发选项卡列表组件reload重新刷新列表\n  doAction({\n    actionType: 'reload',\n    componentId: \"tabs-options-service\"\n  });\n}"
+                            "script": "const result = event.data.result;\nconst doneCount = result.data && result.data.doneCount || 0;\nconst myMsg = '已成功生成' + doneCount.toString() + \"条选项卡！\";\ndoAction({\n  actionType: 'toast',\n  args: {\n    msg: myMsg,\n    msgType: \"success\"\n  }\n});\nconst errors = result.data && result.data.errors || [];\nif (errors && errors.length) { \n  console.warn(\"以下对象未能生成选项卡：\");\n  console.warn(JSON.stringify(errors));\n}\nconst objectName = event.data.objectName;\nif (objectName === \"apps\") {\n  // 在应用表单中生成选项卡后需要触发选项卡列表组件reload重新刷新列表\n  doAction({\n    actionType: 'reload',\n    componentId: \"tabs-options-service\"\n  });\n}\nelse {\n  // 刷新主列表\n  doAction({\n    actionType: 'reload',\n    componentId: `listview_${objectName}`\n  });\n}"
                         }
                     ]
                 }

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

@@ -33,7 +33,7 @@
                 "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;",
                 "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}}}"
+                    "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,
@@ -442,6 +442,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": "高级",

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

@@ -836,24 +836,7 @@
             ],
             "panelClassName": "m-0 -mt-3",
             "bodyClassName": "p-4",
-            "actions": [
-                {
-                    "type": "button",
-                    "label": "取消",
-                    "actionType": "",
-                    "level": "default",
-                    "block": false,
-                    "onClick": "SteedosUI.getRef(props.data.__super.modalName).close();",
-                    "id": "u:bf2587b53d64"
-                },
-                {
-                    "type": "button",
-                    "label": "保存",
-                    "actionType": "submit",
-                    "level": "info",
-                    "id": "u:08afd6e53cab"
-                }
-            ],
+            "actions": [],
             "actionsClassName": "p-sm b-t b-light text-center",
             "className": "steedos-amis-form",
             "checkAll": false,
@@ -896,10 +879,7 @@
         "body"
     ],
     "data": {
-        "objectName": "object_layouts",
-        "context": {
-            "rootUrl": "http://127.0.0.1:5800"
-        }
+        "objectName": "object_layouts"
     },
     "bodyClassName": "p-0",
     "name": "page_edit_${recordId}",

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

@@ -592,12 +592,7 @@
         "initialValues": {},
         "appId": "builder",
         "title": "",
-        "context": {
-            "rootUrl": "https://5000-steedos-steedosplatform-uwiv6wkdp2o.ws-us73.gitpod.io",
-            "tenantId": "e4YD58Xx68PQNPD2G",
-            "userId": "62ea04550167020d189ce439",
-            "authToken": "077c2bb0f4a7c594572fceb47086e2ebd439c6689852b2264c2b20905a38f0f2fbe3491ce3aebfd1872bd5"
-        }
+        "context": "${context}"
     },
     "id": "u:b80a805eb7fa"
 }

package/main/default/services/amis.service.js

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-19 11:38:30
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-05-23 10:01:02
+ * @LastEditTime: 2022-12-01 16:20:59
  * @Description: 
  */
 const AmisSchema = require('./utils/amis-schema');

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.3.4",
+  "version": "2.3.6",
   "main": "package.service.js",
   "scripts": {
-    "build": "node .scripts/build.tailwind.js"
+    "build": "yarn build:tailwind-base && yarn build:tailwind",
+    "build:tailwind-cdn": "node .scripts/build.tailwind.js",
+    "build:tailwind-base": "tailwindcss -i ./src/styles/tailwind-base.css -o ./public/tailwind/tailwind-base.css",
+    "build:tailwind": "tailwindcss -i ./src/styles/tailwind.css -o ./public/tailwind/tailwind-steedos.css"
   },
   "license": "MIT",
   "private": false,
@@ -11,7 +14,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos-widgets/amis-lib": "^1.0.10"
+    "@steedos-widgets/amis-lib": "^1.0.22"
   },
-  "gitHead": "adfbf2b14c15751d6702d8e127426ac1d9d813eb"
+  "gitHead": "3ef6bf3744c616d6a961b3264e5f204b9697ef6a",
+  "devDependencies": {
+    "tailwindcss": "3.2.4"
+  }
 }

package/public/amis/amis.css

@@ -13,10 +13,6 @@
     vertical-align: initial !important;
 } */
 
-body{
-    -webkit-font-smoothing: inherit !important;
-}
-
 /* .row-main{
     border-radius: 0.25rem
 } */
@@ -52,15 +48,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 +63,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;
     }
@@ -104,4 +87,4 @@ body{
 
 .ant-message{
     z-index: 2600;
-}
+}