@steedos/service-plugin-amis 2.4.0-beta.39 → 2.4.0-beta.40

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

@@ -245,7 +245,7 @@
                   },
                   {
                     "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    "
+                    "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._isRelated;\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    "
                   }
                 ]
               }

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

@@ -391,7 +391,7 @@
                                                 {
                                                     "name": "url",
                                                     "label": "外部链接",
-                                                    "type": "input-url",
+                                                    "type": "input-text",
                                                     "className": "m-0",
                                                     "labelClassName": "text-left",
                                                     "id": "u:d7116a113670"

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

@@ -31,11 +31,12 @@
                 "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": {
+                    "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"
                         }

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

@@ -17,7 +17,7 @@
                     "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    ",
                 "responseData": {
                     "recordId": "${record._id}"
                 },
@@ -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": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.4.0-beta.39",
+  "version": "2.4.0-beta.40",
   "main": "package.service.js",
   "scripts": {
     "build": "yarn build:tailwind-base && yarn build:tailwind",
@@ -16,7 +16,7 @@
   "dependencies": {
     "@steedos-widgets/amis-lib": "^1.0.22"
   },
-  "gitHead": "0925adf0cf3215fd5d068f50517be378a758c148",
+  "gitHead": "19fb1590a63241875e23e7b83217e09bdc52162e",
   "devDependencies": {
     "tailwindcss": "3.2.4"
   }

package/public/amis/amis.css

@@ -6,7 +6,6 @@
 
 .page-template-root{
     height: 100%;
-    background: #ffffff;
 }
 /* .amis-scope svg {
     display: inline !important;

package/public/tailwind/tailwind-steedos.css

@@ -69,10 +69,6 @@ body.steedos .top-0 {
   top: 0px
 }
 
-body.steedos .bottom-0 {
-  bottom: 0px
-}
-
 body.steedos .z-40 {
   z-index: 40
 }
@@ -195,27 +191,19 @@ body.steedos .w-6\/12 {
   width: 50%
 }
 
-body.steedos .w-72 {
-  width: 18rem
-}
-
-body.steedos .w-1\/2 {
-  width: 50%
-}
-
 body.steedos .min-w-max {
   min-width: -moz-max-content;
   min-width: max-content
 }
 
-body.steedos .flex-1 {
-  flex: 1 1 0%
-}
-
 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))
@@ -270,11 +258,6 @@ 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))
@@ -285,9 +268,9 @@ body.steedos .border-slate-200 {
   border-color: rgb(226 232 240 / var(--tw-border-opacity))
 }
 
-body.steedos .border-gray-300 {
+body.steedos .border-slate-300 {
   --tw-border-opacity: 1;
-  border-color: rgb(209 213 219 / var(--tw-border-opacity))
+  border-color: rgb(203 213 225 / var(--tw-border-opacity))
 }
 
 body.steedos .bg-white {
@@ -295,11 +278,6 @@ body.steedos .bg-white {
   background-color: rgb(255 255 255 / var(--tw-bg-opacity))
 }
 
-body.steedos .bg-gray-100 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(243 244 246 / var(--tw-bg-opacity))
-}
-
 body.steedos .p-0 {
   padding: 0px
 }
@@ -438,10 +416,6 @@ body.steedos .ease-in-out {
 }
 
 @media (min-width: 640px) {
-  body.steedos .sm\:m-3 {
-    margin: 0.75rem
-  }
-
   body.steedos .sm\:mt-\[90px\] {
     margin-top: 90px
   }
@@ -450,20 +424,16 @@ body.steedos .ease-in-out {
     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\:rounded {
+    border-radius: 0.25rem
   }
 
-  body.steedos .sm\:p-3 {
-    padding: 0.75rem
+  body.steedos .sm\:border {
+    border-width: 1px
   }
 
   body.steedos .sm\:shadow {