@steedos/service-plugin-amis 2.4.15-beta.1 → 2.4.15-beta.11

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

@@ -161,13 +161,24 @@
                                                 },
                                                 {
                                                     "name": "showSidebar",
-                                                    "label": "菜单显示在左侧",
+                                                    "label": "显示左侧导航",
                                                     "type": "checkbox",
                                                     "tpl": null,
                                                     "className": "m-0",
                                                     "labelClassName": "text-left",
                                                     "id": "u:07a8a4c5f877"
                                                 },
+                                                {
+                                                    "name": "enable_nav_schema",
+                                                    "label": "启用自定义导航",
+                                                    "required": false,
+                                                    "type": "checkbox",
+                                                    "tpl": null,
+                                                    "className": "m-0",
+                                                    "labelClassName": "text-left",
+                                                    "clearValueOnHidden": true,
+                                                    "fieldName": "enable_nav_schema"
+                                                },
                                                 {
                                                     "name": "description",
                                                     "label": "描述",

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

@@ -31,7 +31,7 @@
                 "method": "post",
                 "url": "${context.rootUrl}/graphql?rf=1653731141728",
                 "cache": 100,
-                "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;",
+                "adaptor": "const recordId = api.body.recordId;\nvar data;\nif (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}",
@@ -197,6 +197,7 @@
                                 "headers": {
                                     "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                 },
+                                "cache": 10000,
                                 "data": null,
                                 "requestAdaptor": "",
                                 "adaptor": "",
@@ -233,6 +234,7 @@
                                 "headers": {
                                     "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                 },
+                                "cache": 10000,
                                 "data": null,
                                 "requestAdaptor": "",
                                 "adaptor": "",
@@ -380,6 +382,7 @@
                                 "headers": {
                                     "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                 },
+                                "cache": 10000,
                                 "data": null,
                                 "requestAdaptor": "",
                                 "adaptor": "",
@@ -424,6 +427,7 @@
                                 "headers": {
                                     "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                 },
+                                "cache": 10000,
                                 "data": null,
                                 "requestAdaptor": "",
                                 "adaptor": "",

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

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.4.15-beta.1",
+  "version": "2.4.15-beta.11",
   "main": "package.service.js",
   "scripts": {
     "build": "yarn build:tailwind-base && yarn build:tailwind",
@@ -13,7 +13,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "dfdfa3789aed2115bec637d8b98a8ee9960fe9a0",
+  "gitHead": "1d302a5690085072b66d6ced061a79e54cd84414",
   "devDependencies": {
     "tailwindcss": "3.2.4"
   }

package/public/amis/amis.css

@@ -87,3 +87,7 @@
 .ant-message{
     z-index: 2600;
 }
+
+.antd-Form-item.p-0{
+    padding: 0;
+} 

package/public/tailwind/tailwind-steedos.css

@@ -46,37 +46,6 @@
   position: static
 }
 
-.fixed {
-  position: fixed
-}
-
-.absolute {
-  position: absolute
-}
-
-.sticky {
-  position: sticky
-}
-
-.inset-0 {
-  top: 0px;
-  right: 0px;
-  bottom: 0px;
-  left: 0px
-}
-
-.top-0 {
-  top: 0px
-}
-
-.z-40 {
-  z-index: 40
-}
-
-.z-20 {
-  z-index: 20
-}
-
 .col-span-2 {
   grid-column: span 2 / span 2
 }
@@ -108,18 +77,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 +97,14 @@
   margin-top: 0.75rem
 }
 
+.mb-0 {
+  margin-bottom: 0px
+}
+
+.ml-2 {
+  margin-left: 0.5rem
+}
+
 .block {
   display: block
 }
@@ -172,26 +137,6 @@
   height: 100%
 }
 
-.h-\[50px\] {
-  height: 50px
-}
-
-.h-10 {
-  height: 2.5rem
-}
-
-.w-full {
-  width: 100%
-}
-
-.w-auto {
-  width: auto
-}
-
-.w-64 {
-  width: 16rem
-}
-
 .w-10 {
   width: 2.5rem
 }
@@ -200,36 +145,23 @@
   width: 50%
 }
 
+.w-full {
+  width: 100%
+}
+
 .min-w-max {
   min-width: -moz-max-content;
   min-width: max-content
 }
 
-.flex-none {
-  flex: none
-}
-
 .flex-1 {
   flex: 1 1 0%
 }
 
-.-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))
-}
-
 .flex-row {
   flex-direction: row
 }
 
-.flex-col {
-  flex-direction: column
-}
-
-.flex-nowrap {
-  flex-wrap: nowrap
-}
-
 .items-center {
   align-items: center
 }
@@ -238,53 +170,14 @@
   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
 }
 
-.overflow-hidden {
-  overflow: hidden
-}
-
-.overflow-y-auto {
-  overflow-y: auto
-}
-
-.border-b-\[3px\] {
-  border-bottom-width: 3px
-}
-
-.border-r {
-  border-right-width: 1px
-}
-
 .border-b {
   border-bottom-width: 1px
 }
 
-.border-solid {
-  border-style: solid
-}
-
-.border-sky-500 {
-  --tw-border-opacity: 1;
-  border-color: rgb(14 165 233 / var(--tw-border-opacity))
-}
-
-.border-slate-200 {
-  --tw-border-opacity: 1;
-  border-color: rgb(226 232 240 / var(--tw-border-opacity))
-}
-
 .border-slate-300 {
   --tw-border-opacity: 1;
   border-color: rgb(203 213 225 / var(--tw-border-opacity))
@@ -303,16 +196,6 @@
   padding: 1rem
 }
 
-.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
@@ -333,28 +216,19 @@
   padding-bottom: 0.5rem
 }
 
-.pr-4 {
-  padding-right: 1rem
-}
-
-.pl-4 {
-  padding-left: 1rem
-}
-
-.pb-0 {
-  padding-bottom: 0px
+.py-5 {
+  padding-top: 1.25rem;
+  padding-bottom: 1.25rem
 }
 
-.pt-4 {
-  padding-top: 1rem
+.py-1 {
+  padding-top: 0.25rem;
+  padding-bottom: 0.25rem
 }
 
-.pb-24 {
-  padding-bottom: 6rem
-}
-
-.pb-4 {
-  padding-bottom: 1rem
+.px-0 {
+  padding-left: 0px;
+  padding-right: 0px
 }
 
 .pl-1\.5 {
@@ -373,6 +247,18 @@
   text-align: center
 }
 
+.text-lg {
+  font-size: 16px
+}
+
+.text-xl {
+  font-size: 18px
+}
+
+.font-bold {
+  font-weight: 700
+}
+
 .lowercase {
   text-transform: lowercase
 }
@@ -381,10 +267,6 @@
   font-style: italic
 }
 
-.leading-5 {
-  line-height: 1.25rem
-}
-
 .leading-none {
   line-height: 1
 }
@@ -408,43 +290,11 @@
   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)
-}
-
-.transition-colors {
-  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke;
-  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-  transition-duration: 150ms
-}
-
-.duration-500 {
-  transition-duration: 500ms
-}
-
-.duration-300 {
-  transition-duration: 300ms
-}
-
-.ease-in-out {
-  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1)
-}
-
 @media (min-width: 640px) {
-  .sm\:mt-\[90px\] {
-    margin-top: 90px
-  }
-
   .sm\:mt-3 {
     margin-top: 0.75rem
   }
 
-  .sm\:w-\[220px\] {
-    width: 220px
-  }
-
   .sm\:rounded-lg {
     border-radius: 0.5rem
   }
@@ -468,9 +318,3 @@
     box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
   }
 }
-
-@media (min-width: 1024px) {
-  .lg\:z-50 {
-    z-index: 50
-  }
-}