@steedos/service-plugin-amis 2.4.0-beta.3 → 2.4.0-beta.30

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

@@ -19,8 +19,8 @@
     };
   }
   // loadCss(Steedos.absoluteUrl("/unpkg.com/amis/sdk/sdk.css"))
-  loadCss(Steedos.absoluteUrl("/unpkg.com/amis/sdk/helper.css"))
-  loadCss(Steedos.absoluteUrl("/unpkg.com/amis/sdk/iconfont.css"))
+  // loadCss(Steedos.absoluteUrl("/unpkg.com/amis/sdk/helper.css"))
+  // loadCss(Steedos.absoluteUrl("/unpkg.com/amis/sdk/iconfont.css"))
   loadCss(Steedos.absoluteUrl("/amis/amis.css"))
     
     try {
@@ -48,9 +48,9 @@
           }
 
         // 加载Amis SDK: 如果直接放到body中会导致 meteor 编译后的 cordova.js 加载报错
-        let amisSDKScript = document.createElement("script");
-        amisSDKScript.setAttribute("src", Steedos.absoluteUrl('/unpkg.com/amis/sdk/sdk.js'));
-        document.getElementsByTagName("head")[0].appendChild(amisSDKScript);
+        // let amisSDKScript = document.createElement("script");
+        // amisSDKScript.setAttribute("src", Steedos.absoluteUrl('/unpkg.com/amis/sdk/sdk.js'));
+        // document.getElementsByTagName("head")[0].appendChild(amisSDKScript);
     } catch (error) {
         console.error(error)
     };
@@ -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) : ''));
                             }
                           }
@@ -203,7 +203,7 @@
                 console.error(`error`, error)
               }
             }
-            const AmisEnv = {
+            AmisEnv = {
                 // getModalContainer: (props)=>{
                 //     let div = document.querySelector("#amisModalContainer");
                 //     if(!div){
@@ -223,7 +223,7 @@
                 to = normalizeLink(to);
 
                 if (action && action.actionType === 'url') {
-                    action.blank === false ? (window.location.href = to) : window.open(to);
+                    action.blank === true ? window.open(to): (window.location.href = to);
                     return;
                 }
 
@@ -248,10 +248,13 @@
                 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){
+                    try {
+                      SteedosUI.refs[refName].unmount()
+                    } catch (Exception) {
+                    }
                   }else{
                     console.log(`not find amis scope unmount`)
                   }
@@ -279,19 +282,65 @@
                     return scoped = ref
                   }
 
-                React.useEffect(()=>{
+                
+                let amisReact = amisRequire('react');
+
+                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 React.createElement("div", {
+                return amisReact.createElement("div", {
                     className: "amis-scope"
-                  }, React.createElement("div", {
+                  }, amisReact.createElement("div", {
                     className: `steedos-amis-render-scope-${name}`
                   }));
             };
 
+            window.renderAmis = function (root, schema, data, env) {
+              const refName = schema.name || schema.id;
+              if(SteedosUI.refs[refName]){
+                if(SteedosUI.refs[refName].unmount){
+                  try {
+                    SteedosUI.refs[refName].unmount()
+                  } catch (Exception) {
+                  }
+                }else{
+                  console.log(`not find amis scope unmount`)
+                }
+              }
+
+              // if(props.pageType === 'form'){
+              //     env = Object.assign({
+              //         getModalContainer: ()=>{
+              //             return document.querySelector('.amis-scope');
+              //         }
+              //     }, env);
+              // }
+              schema.scopeRef = (ref) => {
+                  try {
+                    if(!window.amisScopes){
+                      window.amisScopes = {};
+                    }
+                    if(name){
+                      window.amisScopes[name] = ref; 
+                    }
+                  } catch (error) {
+                    console.error('error', error)
+                  }
+                  
+                  return scoped = ref
+                }
+
+              
+                const amisScope = amisRequire('amis/embed').embed(root, schema, {data, name, locale: getAmisLng()}, Object.assign({}, AmisEnv, env))
+                if(window.SteedosUI && refName){
+                  SteedosUI.refs[refName] = amisScope;
+                }
+            };
+
             const initMonaco = ()=>{
 
                 // const { detect } = require('detect-browser');

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

@@ -0,0 +1,294 @@
+{
+    "type": "page",
+    "body": [
+      {
+        "type": "service",
+        "className": "p-0",
+        "name": "page_edit_${recordId}",
+        "api": {
+          "method": "post",
+          "url": "${context.rootUrl}/graphql",
+          "adaptor": "\n            if(payload.data.data){\n                var data = payload.data.data[0];\n                if(data){\n                    \n                    \n                    //初始化接口返回的字段移除字段值为null的字段\n                    for (key in data){\n                        if(data[key] === null){\n                            delete data[key];\n                        }\n                    }\n                };\n                payload.data = data;\n                delete payload.extensions;\n            }\n            return payload;\n        ",
+          "data": {
+            "query": "{data:action_field_updates(filters:[\"_id\", \"=\", \"${recordId}\"]){_id,name,label,object_name,target_object,field_name,operation,formula,literal_value,description,reevaluate_on_change,undirect,created,created_by,modified,modified_by,_display:_ui{object_name,target_object,field_name,operation,reevaluate_on_change,undirect,created,created_by,modified,modified_by}, \n    recordPermissions: _permissions{\n        allowCreate,\n        allowCreateFiles,\n        allowDelete,\n        allowDeleteFiles,\n        allowEdit,\n        allowEditFiles,\n        allowRead,\n        allowReadFiles,\n        disabled_actions,\n        disabled_list_views,\n        field_permissions,\n        modifyAllFiles,\n        modifyAllRecords,\n        modifyAssignCompanysRecords,\n        modifyCompanyRecords,\n        uneditable_fields,\n        unreadable_fields,\n        unrelated_objects,\n        viewAllFiles,\n        viewAllRecords,\n        viewAssignCompanysRecords,\n        viewCompanyRecords,\n      }\n    }}"
+          },
+          "headers": {
+            "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+          },
+          "sendOn": "!!this.recordId",
+          "cache": 100
+        },
+        "initFetch": null,
+        "body": [
+          {
+            "type": "form",
+            "title": "",
+            "body": [
+              {
+                "type": "fieldSet",
+                "id": "u:3ce1d050bcac",
+                "title": "通用",
+                "collapsable": true,
+                "body": [
+                  {
+                    "name": "name",
+                    "label": "API 名称",
+                    "required": true,
+                    "type": "input-text",
+                    "className": "m-1",
+                    "labelClassName": "text-left",
+                    "clearValueOnHidden": true,
+                    "fieldName": "name",
+                    "id": "u:8ebca359c714"
+                  },
+                  {
+                    "name": "label",
+                    "label": "显示名称",
+                    "required": true,
+                    "type": "input-text",
+                    "className": "m-1",
+                    "labelClassName": "text-left",
+                    "clearValueOnHidden": true,
+                    "fieldName": "label",
+                    "id": "u:124c34a09c5c"
+                  },
+                  {
+                    "name": "object_name",
+                    "label": "对象",
+                    "required": false,
+                    "type": "select",
+                    "joinValues": false,
+                    "extractValue": true,
+                    "autoComplete": {
+                      "method": "post",
+                      "url": "${context.rootUrl}/graphql",
+                      "data": {
+                        "query": "{objects(filters: [\"_id\", \"=\", \"-1\"]){_id}}",
+                        "$": "$$",
+                        "$term": "$term",
+                        "$value": "$object_name._id",
+                        "rfield": "${object_name}"
+                      },
+                      "requestAdaptor": "\n        var filters = '[]';\n        var top = 10;\n        if(api.data.$term){\n            filters = '[\"name\", \"contains\", \"'+ api.data.$term +'\"]';\n        }else if(api.data.$value){\n            filters = '[\"_id\", \"=\", \"'+ api.data.$value +'\"]';\n        }\n        api.data.query = api.data.query.replace(/{__filters}/g, filters).replace('{__top}', top);\n        return api;\n    ",
+                      "adaptor": "\n        payload.data.options = eval(function anonymous(\n) {\n\n  return Steedos.getObjectsOptions();\n\n})(api.data);\n        return payload;\n        "
+                    },
+                    "className": "m-1",
+                    "labelClassName": "text-left",
+                    "clearValueOnHidden": true,
+                    "fieldName": "object_name",
+                    "id": "u:0f2e40f882e2"
+                  },
+                  {
+                    "name": "target_object",
+                    "label": "要更新的对象",
+                    "required": false,
+                    "type": "select",
+                    "joinValues": false,
+                    "extractValue": true,
+                    "autoComplete": {
+                      "method": "post",
+                      "url": "${context.rootUrl}/graphql",
+                      "data": {
+                        "query": "{objects(filters: [\"_id\", \"=\", \"-1\"]){_id}}",
+                        "$": "$$",
+                        "$term": "$term",
+                        "$value": "$target_object._id",
+                        "object_name": "$object_name",
+                        "rfield": "${object_name}"
+                      },
+                      "requestAdaptor": "\n        var filters = '[]';\n        var top = 10;\n        if(api.data.$term){\n            filters = '[\"name\", \"contains\", \"'+ api.data.$term +'\"]';\n        }else if(api.data.$value){\n            filters = '[\"_id\", \"=\", \"'+ api.data.$value +'\"]';\n        }\n        api.data.query = api.data.query.replace(/{__filters}/g, filters).replace('{__top}', top);\n        return api;\n    ",
+                      "adaptor": "\n        payload.data.options = eval(function anonymous(doc\n) {\n\n  var object = Creator.objectsByName[doc.object_name];\n  if(object){\n    var _options = [{label: object.label, value: object.name}];\n    _.forEach(object.fields, function (field, fname) {\n      if(field && field.type === 'master_detail' && _.isString(field.reference_to)){\n        var referenceToObject = Creator.objectsByName[field.reference_to];\n        if(referenceToObject){\n          _options.push({\n            label: referenceToObject.label,\n            value: field.name,\n          });\n        }\n      }\n    });\n    return _options;\n  }\n return [];\n\n})(api.data);\n        return payload;\n        "
+                    },
+                    "className": "m-1",
+                    "labelClassName": "text-left",
+                    "clearValueOnHidden": true,
+                    "fieldName": "target_object",
+                    "id": "u:dd1c95753238"
+                  },
+                  {
+                    "name": "field_name",
+                    "label": "要更新的字段",
+                    "required": false,
+                    "type": "select",
+                    "joinValues": false,
+                    "extractValue": true,
+                    "autoComplete": {
+                      "method": "post",
+                      "url": "${context.rootUrl}/graphql",
+                      "data": {
+                        "query": "{objects(filters: [\"_id\", \"=\", \"-1\"]){_id}}",
+                        "$": "$$",
+                        "$term": "$term",
+                        "$value": "$field_name._id",
+                        "object_name": "$object_name",
+                        "target_object": "$target_object",
+                        "rfield": "${object_name}"
+                      },
+                      "requestAdaptor": "\n        var filters = '[]';\n        var top = 10;\n        if(api.data.$term){\n            filters = '[\"name\", \"contains\", \"'+ api.data.$term +'\"]';\n        }else if(api.data.$value){\n            filters = '[\"_id\", \"=\", \"'+ api.data.$value +'\"]';\n        }\n        api.data.query = api.data.query.replace(/{__filters}/g, filters).replace('{__top}', top);\n        return api;\n    ",
+                      "adaptor": "\n        payload.data.options = eval(function anonymous(doc\n) {\n\n  var mainObjectName = null;\n  if(doc.target_object && doc.target_object != doc.object_name){\n    mainObjectName = Creator.objectsByName[doc.object_name].fields[doc.target_object].reference_to;\n  }else{\n    mainObjectName = doc.object_name;\n  }\n  var object = Creator.objectsByName[mainObjectName];\n  if(object){\n    var _options = [];\n    _.forEach(object.fields, function (field, fname) {\n      if([\"formula\", \"summary\", \"autonumber\"].indexOf(field.type) < 0){\n        /*公式、累计汇总、自动编号三种字段类型是只读的，不允许字段更新来变更其值*/\n        _options.push({\n          label: field.label,\n          value: field.name,\n        });\n      }\n    });\n    return _options;\n  }\n  return [];\n\n})(api.data);\n        return payload;\n        "
+                    },
+                    "className": "m-1",
+                    "labelClassName": "text-left",
+                    "clearValueOnHidden": true,
+                    "fieldName": "field_name",
+                    "id": "u:204fadb7cef0"
+                  },
+                  {
+                    "name": "operation",
+                    "label": "新字段值类型",
+                    "required": false,
+                    "type": "select",
+                    "joinValues": false,
+                    "extractValue": true,
+                    "autoComplete": {
+                      "method": "post",
+                      "url": "${context.rootUrl}/graphql",
+                      "data": {
+                        "query": "{objects(filters: [\"_id\", \"=\", \"-1\"]){_id}}",
+                        "$": "$$",
+                        "$term": "$term",
+                        "$value": "$operation._id",
+                        "field_name": "$field_name",
+                        "target_object": "$target_object",
+                        "object_name": "$object_name",
+                        "rfield": "${object_name}"
+                      },
+                      "requestAdaptor": "\n        var filters = '[]';\n        var top = 10;\n        if(api.data.$term){\n            filters = '[\"name\", \"contains\", \"'+ api.data.$term +'\"]';\n        }else if(api.data.$value){\n            filters = '[\"_id\", \"=\", \"'+ api.data.$value +'\"]';\n        }\n        api.data.query = api.data.query.replace(/{__filters}/g, filters).replace('{__top}', top);\n        return api;\n    ",
+                      "adaptor": "\n        payload.data.options = eval(function anonymous(doc\n) {\n\n  var mainObjectName = null;\n  if(doc.target_object && doc.target_object != doc.object_name){\n    mainObjectName = Creator.objectsByName[doc.object_name].fields[doc.target_object].reference_to;\n  }else{\n    mainObjectName = doc.object_name;\n  }\n  var object = Creator.objectsByName[mainObjectName];\n  if(object && doc.field_name){\n    var _options = [];\n    var field = object.fields[doc.field_name];\n    if(field && field.type != 'boolean'){\n      _options.push({\n          label: TAPi18n.__(\"action_field_updates_field_operation_options_null\"),\n          value: 'null',\n      }) \n    }\n    _options.push({\n        label: TAPi18n.__(\"action_field_updates_field_operation_options_formula\"),\n        value: 'formula',\n    });\n    _options.push({\n        label: TAPi18n.__(\"action_field_updates_field_operation_options_literal\"),\n        value: 'literal',\n    })\n    return _options;\n  }\n  return [];\n\n})(api.data);\n        return payload;\n        "
+                    },
+                    "className": "m-1",
+                    "labelClassName": "text-left",
+                    "clearValueOnHidden": true,
+                    "fieldName": "operation",
+                    "id": "u:627e520855b5",
+                    "multiple": false
+                  },
+                  {
+                    "name": "formula",
+                    "label": "公式",
+                    "required": false,
+                    "type": "textarea",
+                    "tpl": "<b><%=data.formula%></b>",
+                    "className": "col-span-2 m-1",
+                    "labelClassName": "text-left",
+                    "clearValueOnHidden": true,
+                    "fieldName": "formula",
+                    "id": "u:20766a86a9f4",
+                    "hiddenOn": "this.operation != 'formula'"
+                  },
+                  {
+                    "type": "service",
+                    "id": "u:d201a629c160",
+                    "body": [],
+                    "messages": {},
+                    "schemaApi": {
+                      "method": "get",
+                      "url": "${context.rootUrl}/service/api/@${object_name}/uiSchema?field_name=${field_name}&operation=${operation}",
+                      "adaptor": "const formData = api.body;\nconst target_field_name = formData.field_name;\nconst target_object_uiSchema = payload;\nconst target_fields = target_object_uiSchema && target_object_uiSchema.fields;\nconst target_field_type = target_fields && target_fields[target_field_name].type;\nlet literal_value_schema = {\n  \"type\": \"text\",\n  \"name\": \"literal_value\",\n  \"label\": \"指定新字段值\",\n  \"required\": false,\n  \"is_wide\": true,\n  \"labelClassName\": \"text-left\"\n}\nif (target_field_type) {\n  literal_value_schema = Object.assign({}, target_object_uiSchema.fields[target_field_name], {\n    name: \"literal_value\",\n    label: \"指定新字段值\",\n    disabled: false,\n    readonly: false,\n    is_wide: true\n  });\n}\npayload = {\n  \"status\": 0,\n  \"msg\": \"\",\n  \"data\": {\n    \"body\": [\n      {\n        \"type\": \"steedos-field\",\n        \"field\": literal_value_schema,\n        \"name\": \"literal_value\",\n        \"clearValueOnHidden\": true,\n        \"fieldName\": \"literal_value\",\n        \"visibleOn\": \"this.operation === 'literal'\"\n      }\n    ]\n  }\n}\nreturn payload;",
+                      "sendOn": "!!this.object_name && !!this.field_name && this.operation === 'literal'",
+                      "headers": {
+                        "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                      },
+                      "data": {
+                        "&": "$$"
+                      }
+                    }
+                  },
+                  {
+                    "name": "description",
+                    "label": "描述",
+                    "required": false,
+                    "type": "textarea",
+                    "tpl": "<b><%=data.description%></b>",
+                    "className": "col-span-2 m-1",
+                    "labelClassName": "text-left",
+                    "clearValueOnHidden": true,
+                    "fieldName": "description",
+                    "id": "u:16a7ebd835a6"
+                  },
+                  {
+                    "name": "reevaluate_on_change",
+                    "label": "字段更改后重新评估工作流规则",
+                    "required": false,
+                    "type": "checkbox",
+                    "tpl": null,
+                    "className": "m-1",
+                    "labelClassName": "text-left",
+                    "clearValueOnHidden": true,
+                    "fieldName": "reevaluate_on_change",
+                    "id": "u:b9baf683b6b0"
+                  },
+                  {
+                    "name": "undirect",
+                    "label": "触发对象触发器、工作流规则、字段验证规则",
+                    "required": false,
+                    "type": "checkbox",
+                    "tpl": null,
+                    "className": "m-1",
+                    "labelClassName": "text-left",
+                    "clearValueOnHidden": true,
+                    "fieldName": "undirect",
+                    "id": "u:b86f699bbe4f"
+                  }
+                ]
+              }
+            ],
+            "id": "u:f57077c2a95f",
+            "mode": "horizontal",
+            "persistData": false,
+            "promptPageLeave": true,
+            "name": "form_edit_${recordId}",
+            "debug": false,
+            "submitText": "",
+            "api": {
+              "method": "post",
+              "url": "${context.rootUrl}/graphql",
+              "data": {
+                "objectName": "${objectName}",
+                "$": "$$",
+                "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.created;\r\ndelete formData.created_by;\r\ndelete formData.modified;\r\ndelete formData.modified_by;\n        \n        \n        let query = `mutation{record: ${objectName}__insert(doc: {__saveData}){_id}}`;\n        if(formData.recordId && formData.recordId !='new'){\n            query = `mutation{record: ${objectName}__update(id: \"${formData._id}\", 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    ",
+              "responseData": {
+                "recordId": "${record._id}"
+              },
+              "adaptor": "\n            if(payload.errors){\n                payload.status = 2;\n                payload.msg = payload.errors[0].message;\n            }\n            return payload;\n        ",
+              "headers": {
+                "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+              }
+            },
+            "initFetch": true,
+            "panelClassName": "m-0 sm:rounded-lg shadow-none",
+            "bodyClassName": "p-0",
+            "className": "steedos-amis-form",
+            "onEvent": {
+              "submitSucc": {
+                "weight": 0,
+                "actions": [
+                  {
+                    "componentId": "listview_action_field_updates",
+                    "actionType": "reload",
+                    "expression": "!!listViewId"
+                  },
+                  {
+                    "actionType": "custom",
+                    "script": "\n      const { recordId, listViewId } = context.props.data;\n      const data = event.data;\n      const appId = data.appId;\n      const objectName = data.objectName;\n      // 在记录详细界面时isRecordDetail为true\n      // TODO: isRecordDetail这个判断需要优化\n      const isRecordDetail = !!data.$master && data.$master.$master?.recordId;\n      if(recordId){\n        // 编辑记录时，刷新主表单\n        doAction({\n          componentId: `detail_${recordId}`,\n          actionType: \"reload\",\n          expression: `!${listViewId}`\n        });\n      }\n      else if(!isRecordDetail){\n        // 在列表视图界面新建记录时跳转到详细页面\n        const jumpTo = event.context.env && event.context.env.jumpTo;\n        if(jumpTo){\n          const newRecordId = data.result.data?.recordId;\n          jumpTo(\"/app/\" + appId + \"/\" + objectName + \"/view/\" + newRecordId);\n        }\n      }\n    "
+                  }
+                ]
+              }
+            }
+          }
+        ],
+        "initApi": null
+      }
+    ],
+    "data": {
+      "objectName": "action_field_updates",
+      "context": {}
+    },
+    "regions": [
+      "body"
+    ],
+    "bodyClassName": ""
+  }

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

@@ -0,0 +1,12 @@
+name: action_field_updates
+is_active: true
+label: 字段更新表单
+object_name: action_field_updates
+pageAssignments:
+  - desktop: true
+    mobile: true
+    page: action_field_updates
+    type: orgDefault
+render_engine: amis
+type: form
+widgets: []

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"
         }

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}"
                         }
                     ]
                 }
@@ -75,6 +75,7 @@
     ],
     "data": {
         "context": {
+            "rootUrl": "http://127.0.0.1:5800"
         }
     },
     "id": "u:3b0de7e88def",

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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.4.0-beta.3",
+  "version": "2.4.0-beta.30",
   "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": "1c901ac5b13f425f28aedf0f1bf61199f0012663"
+  "gitHead": "22c0cf80236640dac2c2a85b7a209355ef00e57c",
+  "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;
     }
@@ -105,7 +88,3 @@ body{
 .ant-message{
     z-index: 2600;
 }
-
-.page-list-view-root .amis-scope .antd-Table-headToolbar{
-    display: none;
-}

package/public/tailwind/tailwind-steedos.css

@@ -54,10 +54,6 @@ body.steedos .absolute {
   position: absolute
 }
 
-body.steedos .relative {
-  position: relative
-}
-
 body.steedos .sticky {
   position: sticky
 }
@@ -85,12 +81,22 @@ body.steedos .col-span-2 {
   grid-column: span 2 / span 2
 }
 
+body.steedos .m-1 {
+  margin: 0.25rem
+}
+
 body.steedos .m-0 {
   margin: 0px
 }
 
-body.steedos .m-1 {
-  margin: 0.25rem
+body.steedos .mx-4 {
+  margin-left: 1rem;
+  margin-right: 1rem
+}
+
+body.steedos .my-2 {
+  margin-top: 0.5rem;
+  margin-bottom: 0.5rem
 }
 
 body.steedos .mr-4 {
@@ -117,6 +123,10 @@ body.steedos .-mt-3 {
   margin-top: -0.75rem
 }
 
+body.steedos .mt-3 {
+  margin-top: 0.75rem
+}
+
 body.steedos .block {
   display: block
 }
@@ -149,10 +159,6 @@ body.steedos .h-\[50px\] {
   height: 50px
 }
 
-body.steedos .h-7 {
-  height: 1.75rem
-}
-
 body.steedos .h-10 {
   height: 2.5rem
 }
@@ -186,20 +192,16 @@ body.steedos .min-w-max {
   min-width: max-content
 }
 
-body.steedos .flex-none {
-  flex: none
-}
-
 body.steedos .flex-1 {
   flex: 1 1 0%
 }
 
-body.steedos .-translate-x-0 {
-  --tw-translate-x: -0px;
-  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))
+body.steedos .flex-none {
+  flex: none
 }
 
-body.steedos .transform {
+body.steedos .-translate-x-0 {
+  --tw-translate-x: -0px;
   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))
 }
 
@@ -228,6 +230,10 @@ body.steedos .gap-x-3 {
        column-gap: 0.75rem
 }
 
+body.steedos .overflow-hidden {
+  overflow: hidden
+}
+
 body.steedos .overflow-y-auto {
   overflow-y: auto
 }
@@ -240,10 +246,19 @@ body.steedos .border-r {
   border-right-width: 1px
 }
 
+body.steedos .border-b {
+  border-bottom-width: 1px
+}
+
 body.steedos .border-solid {
   border-style: solid
 }
 
+body.steedos .border-slate-300 {
+  --tw-border-opacity: 1;
+  border-color: rgb(203 213 225 / var(--tw-border-opacity))
+}
+
 body.steedos .border-sky-500 {
   --tw-border-opacity: 1;
   border-color: rgb(14 165 233 / var(--tw-border-opacity))
@@ -259,10 +274,6 @@ body.steedos .bg-white {
   background-color: rgb(255 255 255 / var(--tw-bg-opacity))
 }
 
-body.steedos .p-3 {
-  padding: 0.75rem
-}
-
 body.steedos .p-0 {
   padding: 0px
 }
@@ -276,6 +287,21 @@ body.steedos .px-4 {
   padding-right: 1rem
 }
 
+body.steedos .px-0 {
+  padding-left: 0px;
+  padding-right: 0px
+}
+
+body.steedos .px-1 {
+  padding-left: 0.25rem;
+  padding-right: 0.25rem
+}
+
+body.steedos .py-3 {
+  padding-top: 0.75rem;
+  padding-bottom: 0.75rem
+}
+
 body.steedos .px-10 {
   padding-left: 2.5rem;
   padding-right: 2.5rem
@@ -286,6 +312,10 @@ body.steedos .py-2 {
   padding-bottom: 0.5rem
 }
 
+body.steedos .pr-4 {
+  padding-right: 1rem
+}
+
 body.steedos .pl-4 {
   padding-left: 1rem
 }
@@ -294,8 +324,16 @@ body.steedos .pb-0 {
   padding-bottom: 0px
 }
 
-body.steedos .pt-2 {
-  padding-top: 0.5rem
+body.steedos .pt-4 {
+  padding-top: 1rem
+}
+
+body.steedos .pb-16 {
+  padding-bottom: 4rem
+}
+
+body.steedos .pb-4 {
+  padding-bottom: 1rem
 }
 
 body.steedos .pl-1\.5 {
@@ -339,6 +377,12 @@ body.steedos .underline {
   text-decoration-line: underline
 }
 
+body.steedos .shadow-none {
+  --tw-shadow: 0 0 #0000;
+  --tw-shadow-colored: 0 0 #0000;
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
+}
+
 body.steedos .filter {
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)
 }
@@ -368,14 +412,34 @@ body.steedos .ease-in-out {
 }
 
 @media (min-width: 640px) {
-  body.steedos .sm\:flex {
-    display: flex
+  body.steedos .sm\:m-3 {
+    margin: 0.75rem
+  }
+
+  body.steedos .sm\:mt-\[90px\] {
+    margin-top: 90px
   }
 
   body.steedos .sm\:w-\[220px\] {
     width: 220px
   }
 
+  body.steedos .sm\:rounded {
+    border-radius: 0.25rem
+  }
+
+  body.steedos .sm\:rounded-lg {
+    border-radius: 0.5rem
+  }
+
+  body.steedos .sm\:border {
+    border-width: 1px
+  }
+
+  body.steedos .sm\:p-3 {
+    padding: 0.75rem
+  }
+
   body.steedos .sm\:shadow {
     --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
     --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);

package/public/translations/amis/zh-CN.json

@@ -282,8 +282,8 @@
   "Editor.fullscreen": "全屏",
   "Editor.exitFullscreen": "退出全屏",
   "Condition.not": "非",
-  "Condition.and": "并且",
-  "Condition.or": "或者",
+  "Condition.and": "并",
+  "Condition.or": "或",
   "Condition.add_cond": "添加条件",
   "Condition.add_cond_group": "添加条件组",
   "Condition.delete_cond_group": "删除组",

package/main/default/objects/pages/fields/render_engine.field.yml

@@ -1,11 +0,0 @@
-name: render_engine
-type: select
-label: 渲染器
-defaultValue: amis
-options:
-  - label: Amis
-    value: amis
-  - label: Redash
-    value: redash
-required: true
-sort_no: 125

package/main/default/objects/pages/pages.object.yml

@@ -1,2 +0,0 @@
-extend: pages
-name: pages