@steedos/service-plugin-amis 2.4.0-beta.20 → 2.4.0-beta.23

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

@@ -94,7 +94,7 @@
                         if(comp.componentType === 'amisSchema'){
                             let amisReact = amisRequire('react');
                             AmisWrapper = function(props){
-                              const { body, render } = props
+                              const { $schema, body, render } = props
                               const [schema, setSchema] = amisReact.useState(null);
                               amisReact.useEffect(()=>{
                                 const result = Component.class(props);
@@ -105,7 +105,7 @@
                                 }else{
                                   setSchema(result)
                                 }
-                              }, [])
+                              }, [JSON.stringify($schema)])
                               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) : ''));
                             }
                           }
@@ -248,10 +248,10 @@
                 const schema = props.schema;
                 const data = props.data;
                 const name = props.name;
-
-                if(SteedosUI.refs[schema.name]){
-                  if(SteedosUI.refs[schema.name].unmount){
-                    SteedosUI.refs[schema.name].unmount()
+                const refName = schema.name || schema.id;
+                if(SteedosUI.refs[refName]){
+                  if(SteedosUI.refs[refName].unmount){
+                    SteedosUI.refs[refName].unmount()
                   }else{
                     console.log(`not find amis scope unmount`)
                   }
@@ -284,8 +284,9 @@
 
                 amisReact.useEffect(()=>{
                     const amisScope = amisRequire('amis/embed').embed(`.steedos-amis-render-scope-${name}`,schema, {data, name, locale: getAmisLng()}, Object.assign({}, AmisEnv, env))
-                    if(window.SteedosUI && schema.name){
-                      SteedosUI.refs[schema.name] = amisScope;
+                    const refName = schema.name || schema.id;
+                    if(window.SteedosUI && refName){
+                      SteedosUI.refs[refName] = amisScope;
                     }
                   }, [])
                 return amisReact.createElement("div", {
@@ -296,10 +297,10 @@
             };
 
             window.renderAmis = function (root, schema, data, env) {
-
-              if(SteedosUI.refs[schema.name]){
-                if(SteedosUI.refs[schema.name].unmount){
-                  SteedosUI.refs[schema.name].unmount()
+              const refName = schema.name || schema.id;
+              if(SteedosUI.refs[refName]){
+                if(SteedosUI.refs[refName].unmount){
+                  SteedosUI.refs[refName].unmount()
                 }else{
                   console.log(`not find amis scope unmount`)
                 }
@@ -329,8 +330,8 @@
 
               
                 const amisScope = amisRequire('amis/embed').embed(root, schema, {data, name, locale: getAmisLng()}, Object.assign({}, AmisEnv, env))
-                if(window.SteedosUI && schema.name){
-                  SteedosUI.refs[schema.name] = amisScope;
+                if(window.SteedosUI && refName){
+                  SteedosUI.refs[refName] = amisScope;
                 }
             };
 

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.4.0-beta.20",
+  "version": "2.4.0-beta.23",
   "main": "package.service.js",
   "scripts": {
     "build": "yarn build:tailwind-base && yarn build:tailwind",
@@ -16,7 +16,7 @@
   "dependencies": {
     "@steedos-widgets/amis-lib": "^1.0.20"
   },
-  "gitHead": "21e6705921d682193a70b10a2e0e402a3ca32539",
+  "gitHead": "02fd9ceab1405e0eddbb1752882168f0f4d660f0",
   "devDependencies": {
     "tailwindcss": "3.2.4"
   }