@steedos/service-plugin-amis 2.5.0-beta.3 → 2.5.0-beta.33

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

@@ -34,7 +34,7 @@
                 "data": {
                     "recordId": "${recordId}",
                     "defaultData": "${defaultData}",
-                    "query": "{data:object_layouts(filters:[\"_id\", \"=\", \"${recordId}\"]){_id,name,label,object_name,profiles,buttons,fields,related_lists,is_system,created,created_by,modified,modified_by,instances,instance_state,_display:_ui{object_name,profiles,buttons,fields,related_lists,is_system,created,created_by,modified,modified_by,instances,instance_state}}}",
+                    "query": "{data:object_layouts(filters:[\"_id\", \"=\", \"${recordId}\"]){_id,name,label,object_name,profiles,buttons,fields,related_lists,field_groups,is_system,created,created_by,modified,modified_by,instances,instance_state,_display:_ui{object_name,profiles,buttons,fields,related_lists,is_system,created,created_by,modified,modified_by,instances,instance_state}}}",
                     "uiSchema": "${uiSchema}",
                     "objectName": "${objectName}"
                 },

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

@@ -234,15 +234,15 @@ module.exports = {
                 */
                 const relatedListObjects = [];
                 const relationsInfo = await object.getRelationsInfo();
-                const details = relationsInfo && relationsInfo.details;
-                // const lookupDetails = relationsInfo && relationsInfo.lookup_details;
-                // const relatedLists = _.union(details, lookupDetails);
+                let details = relationsInfo && relationsInfo.details;
+                const lookupDetails = relationsInfo && relationsInfo.lookup_details;
+                details = _.union(details, lookupDetails);
 
                 _.each(details, function(related){
                     /*related可能是一个lookup_details，它是对象而不是字符串，从中取出key值*/
-                    // if(typeof related !== "string"){
-                    //     relatedListObjects.push(related.objectName)
-                    // }
+                    if(typeof related !== "string"){
+                        relatedListObjects.push(related.objectName)
+                    }
                     let foo = related.split('.');
                     let rObjectName = foo[0];
                     relatedListObjects.push(rObjectName);

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

@@ -1,8 +1,8 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-19 11:38:30
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-03-15 17:37:05
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-04-19 13:20:20
  * @Description: 
  */
 const PageSchema = require('./utils/page-schema');

package/main/default/services/metadata/listviews.service.js

@@ -328,6 +328,13 @@ module.exports = {
                                     ...getField(objectName, field.name, field.data_type, lng)
                                 })
                                 break;
+                            case 'summary':
+                                fields.push({
+                                    label: field.label,
+                                    name: field.name,
+                                    ...getField(objectName, field.name, field.data_type, lng)
+                                })
+                                break;
                             default:
                                 fields.push({
                                     label: field.label,

package/main/default/services/utils/page-schema.js

@@ -100,67 +100,22 @@ const getRecordPageInitSchema = async function (objectApiName, userSession) {
     if (hasRelatedLists) {
         content.tabs.push(related)
     }
-    const amisSchema = {
-        "type": "service",
-        "body": [
-            {
-                "type": "steedos-record-detail-header",
-                "label": "标题面板",
-                "objectApiName": "${objectName}",
-                "recordId": "${recordId}",
-                onEvent: {
-                    "recordLoaded": {
-                        "actions": [
-                            {
-                                "actionType": "reload",
-                                "data": {
-                                    "name": `\${event.data.record.${uiSchema.NAME_FIELD_KEY || 'name'}}`,
-                                    "record": `\${event.data.record}`,
-                                    "recordLoaded": true,
-                                }
-                            },
-                            {
-                                "actionType": "reload",
-                                "componentId": `page_readonly_${objectApiName}_header`,  //刷新标题, 详细页面header service 嵌套太多, 导致仅刷新第一层service无法更新recordName
-                                "data": {
-                                    "name": `\${event.data.record.${uiSchema.NAME_FIELD_KEY || 'name'}}`,
-                                    "record": `\${event.data.record}`,
-                                    "recordLoaded": true,
-                                }
-                            }
-                        ]
-                    }
-                },
-            },
-            content
-        ],
-        data: {
-            "_master.objectName": "${objectName}",
-            "_master.recordId": "${recordId}"
-        },
-        onEvent: {
-            "recordLoaded": {
-                "actions": [
-                    {
-                        "actionType": "reload",
-                        "data": {
-                            "name": `\${record.${uiSchema.NAME_FIELD_KEY || 'name'}}`,
-                            "_master.record": `\${record}`,
-                            // 不清楚reload 如何给对象下的某个key复制, 所以此处重复设置_master的objectName、recordId
-                            "_master.objectName": "${objectName}",
-                            "_master.recordId": "${recordId}"
-                        }
-                    }
-                ]
-            }
+    body = [
+        {
+            "type": "steedos-record-detail-header",
+            "label": "标题面板",
+            "objectApiName": "${objectName}",
+            "recordId": "${recordId}"
         },
-    }
-    body.push(amisSchema);
+        content
+    ];
     return {
-        type: 'page',
+        type: 'steedos-record-service',
         id: `page_${objectApiName}_record_detail`,
         name: getScopeId(objectApiName, "record_detail"),
+        objectApiName: "${objectName}",
         bodyClassName: '',
+        className: "object-detail-page",
         regions: [
             "body"
         ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.5.0-beta.3",
+  "version": "2.5.0-beta.33",
   "main": "package.service.js",
   "scripts": {
     "build": "yarn build:tailwind-base && yarn build:tailwind",
@@ -13,7 +13,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "48546b91b2a44dd6f6673af7f5ab707faff6e07c",
+  "gitHead": "370c9eaa707a6932f3eb12fb3d711e679bcd2484",
   "devDependencies": {
     "tailwindcss": "3.2.4"
   }

package/public/amis/amis.css

@@ -87,3 +87,34 @@
 .ant-message{
     z-index: 2600;
 }
+
+.antd-Form-item.p-0{
+    padding: 0;
+} 
+
+.antd-Crud .antd-Table-toolbar.antd-Table-footToolbar{
+    padding: 0.75rem 0.5rem;
+}
+@media (max-width: 768px) {
+    .antd-Crud .antd-Table-toolbar.antd-Table-footToolbar{
+        padding: 0;
+    }
+}
+
+.antd-Crud .antd-Crud-body .antd-Table-contentWrap{
+    margin-bottom: 15px;
+}
+@media (max-width: 768px) {
+    .antd-Crud .antd-Crud-body .antd-Table-contentWrap{
+        margin-bottom: 0px;
+    }
+}
+
+
+.antd-Table-footToolbar .antd-Crud-toolbar .antd-Crud-toolbar-item--left:not(:first-child){
+    margin-left: 0.625rem;
+}
+
+.antd-Table-footToolbar .antd-Crud-pager .antd-Pagination > li > a{
+    display: block;
+}

package/public/tailwind/tailwind-steedos.css

@@ -65,14 +65,6 @@
   left: 0px
 }
 
-.top-0 {
-  top: 0px
-}
-
-.z-40 {
-  z-index: 40
-}
-
 .z-20 {
   z-index: 20
 }
@@ -89,10 +81,6 @@
   margin: 0px
 }
 
-.m-3 {
-  margin: 0.75rem
-}
-
 .mx-4 {
   margin-left: 1rem;
   margin-right: 1rem
@@ -108,18 +96,6 @@
   margin-right: -2.75rem
 }
 
-.mr-4 {
-  margin-right: 1rem
-}
-
-.mb-\[-3px\] {
-  margin-bottom: -3px
-}
-
-.mt-\[50px\] {
-  margin-top: 50px
-}
-
 .mt-0\.5 {
   margin-top: 0.125rem
 }
@@ -140,6 +116,14 @@
   margin-top: 0.75rem
 }
 
+.mb-0 {
+  margin-bottom: 0px
+}
+
+.ml-2 {
+  margin-left: 0.5rem
+}
+
 .block {
   display: block
 }
@@ -172,24 +156,8 @@
   height: 100%
 }
 
-.h-\[50px\] {
-  height: 50px
-}
-
-.h-10 {
-  height: 2.5rem
-}
-
-.w-full {
-  width: 100%
-}
-
-.w-auto {
-  width: auto
-}
-
-.w-64 {
-  width: 16rem
+.h-0 {
+  height: 0px
 }
 
 .w-10 {
@@ -200,6 +168,10 @@
   width: 50%
 }
 
+.w-full {
+  width: 100%
+}
+
 .w-96 {
   width: 24rem
 }
@@ -209,12 +181,12 @@
   min-width: max-content
 }
 
-.min-w-\[200px\] {
-  min-width: 200px
+.min-w-\[240px\] {
+  min-width: 240px
 }
 
-.flex-none {
-  flex: none
+.min-w-\[200px\] {
+  min-width: 200px
 }
 
 .flex-1 {
@@ -230,6 +202,10 @@
   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))
 }
 
+.transform {
+  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))
+}
+
 .flex-row {
   flex-direction: row
 }
@@ -238,10 +214,6 @@
   flex-direction: column
 }
 
-.flex-nowrap {
-  flex-wrap: nowrap
-}
-
 .items-center {
   align-items: center
 }
@@ -250,15 +222,6 @@
   justify-content: center
 }
 
-.justify-between {
-  justify-content: space-between
-}
-
-.gap-x-3 {
-  -moz-column-gap: 0.75rem;
-       column-gap: 0.75rem
-}
-
 .overflow-auto {
   overflow: auto
 }
@@ -275,35 +238,35 @@
   border-radius: 0.25rem
 }
 
-.border-b-\[3px\] {
-  border-bottom-width: 3px
-}
-
-.border-r {
-  border-right-width: 1px
+.border {
+  border-width: 1px
 }
 
 .border-b {
   border-bottom-width: 1px
 }
 
+.border-r {
+  border-right-width: 1px
+}
+
 .border-solid {
   border-style: solid
 }
 
-.border-sky-500 {
+.border-slate-300 {
   --tw-border-opacity: 1;
-  border-color: rgb(14 165 233 / var(--tw-border-opacity))
+  border-color: rgb(203 213 225 / var(--tw-border-opacity))
 }
 
-.border-slate-200 {
+.border-gray-300 {
   --tw-border-opacity: 1;
-  border-color: rgb(226 232 240 / var(--tw-border-opacity))
+  border-color: rgb(209 213 219 / var(--tw-border-opacity))
 }
 
-.border-slate-300 {
+.border-slate-200 {
   --tw-border-opacity: 1;
-  border-color: rgb(203 213 225 / var(--tw-border-opacity))
+  border-color: rgb(226 232 240 / var(--tw-border-opacity))
 }
 
 .border-gray-200 {
@@ -311,11 +274,6 @@
   border-color: rgb(229 231 235 / var(--tw-border-opacity))
 }
 
-.border-gray-300 {
-  --tw-border-opacity: 1;
-  border-color: rgb(209 213 219 / var(--tw-border-opacity))
-}
-
 .bg-white {
   --tw-bg-opacity: 1;
   background-color: rgb(255 255 255 / var(--tw-bg-opacity))
@@ -338,16 +296,6 @@
   padding: 0.5rem
 }
 
-.px-4 {
-  padding-left: 1rem;
-  padding-right: 1rem
-}
-
-.px-0 {
-  padding-left: 0px;
-  padding-right: 0px
-}
-
 .px-1 {
   padding-left: 0.25rem;
   padding-right: 0.25rem
@@ -368,28 +316,19 @@
   padding-bottom: 0.5rem
 }
 
-.pr-4 {
-  padding-right: 1rem
-}
-
-.pl-4 {
-  padding-left: 1rem
+.px-0 {
+  padding-left: 0px;
+  padding-right: 0px
 }
 
-.pb-0 {
+.py-0 {
+  padding-top: 0px;
   padding-bottom: 0px
 }
 
-.pt-4 {
-  padding-top: 1rem
-}
-
-.pb-24 {
-  padding-bottom: 6rem
-}
-
-.pb-4 {
-  padding-bottom: 1rem
+.py-1 {
+  padding-top: 0.25rem;
+  padding-bottom: 0.25rem
 }
 
 .pl-1\.5 {
@@ -408,6 +347,14 @@
   text-align: center
 }
 
+.text-lg {
+  font-size: 16px
+}
+
+.font-bold {
+  font-weight: 700
+}
+
 .lowercase {
   text-transform: lowercase
 }
@@ -416,10 +363,6 @@
   font-style: italic
 }
 
-.leading-5 {
-  line-height: 1.25rem
-}
-
 .leading-none {
   line-height: 1
 }
@@ -444,26 +387,23 @@
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
 }
 
-.filter {
+.invert {
+  --tw-invert: invert(100%);
   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)
 }
 
-.backdrop-blur {
-  --tw-backdrop-blur: blur(8px);
-  -webkit-backdrop-filter: var(--tw-backdrop-blur) var(--tw-backdrop-brightness) var(--tw-backdrop-contrast) var(--tw-backdrop-grayscale) var(--tw-backdrop-hue-rotate) var(--tw-backdrop-invert) var(--tw-backdrop-opacity) var(--tw-backdrop-saturate) var(--tw-backdrop-sepia);
-          backdrop-filter: var(--tw-backdrop-blur) var(--tw-backdrop-brightness) var(--tw-backdrop-contrast) var(--tw-backdrop-grayscale) var(--tw-backdrop-hue-rotate) var(--tw-backdrop-invert) var(--tw-backdrop-opacity) var(--tw-backdrop-saturate) var(--tw-backdrop-sepia)
+.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)
 }
 
-.transition-colors {
-  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke;
+.transition {
+  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter;
+  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
+  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
   transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
   transition-duration: 150ms
 }
 
-.duration-500 {
-  transition-duration: 500ms
-}
-
 .duration-300 {
   transition-duration: 300ms
 }
@@ -478,12 +418,8 @@
 }
 
 @media (min-width: 640px) {
-  .sm\:mt-\[90px\] {
-    margin-top: 90px
-  }
-
-  .sm\:w-\[220px\] {
-    width: 220px
+  .sm\:mt-3 {
+    margin-top: 0.75rem
   }
 
   .sm\:rounded-lg {
@@ -507,6 +443,15 @@
     padding: 0.75rem
   }
 
+  .sm\:px-3 {
+    padding-left: 0.75rem;
+    padding-right: 0.75rem
+  }
+
+  .sm\:pt-3 {
+    padding-top: 0.75rem
+  }
+
   .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);
@@ -515,10 +460,6 @@
 }
 
 @media (min-width: 1024px) {
-  .lg\:z-50 {
-    z-index: 50
-  }
-
   .lg\:order-first {
     order: -9999
   }