@steedos/service-plugin-amis 2.4.0-beta.14 → 2.4.0-beta.15

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": "描述",

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

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.4.0-beta.14",
+  "version": "2.4.0-beta.15",
   "main": "package.service.js",
   "scripts": {
     "build": "yarn build:tailwind-base && yarn build:tailwind",
@@ -16,5 +16,5 @@
   "dependencies": {
     "@steedos-widgets/amis-lib": "^1.0.10"
   },
-  "gitHead": "47f3797a400790410c8f333a4dbb21c877642aa9"
+  "gitHead": "095294ab9e56a8fbbffd17ce1aefa1f55ae4c676"
 }

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

package/public/tailwind/tailwind-steedos.css

@@ -93,6 +93,16 @@ 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 {
   margin-right: 1rem
 }
@@ -149,10 +159,6 @@ body.steedos .h-\[50px\] {
   height: 50px
 }
 
-body.steedos .h-7 {
-  height: 1.75rem
-}
-
 body.steedos .h-10 {
   height: 2.5rem
 }
@@ -302,6 +308,10 @@ body.steedos .py-2 {
   padding-bottom: 0.5rem
 }
 
+body.steedos .pr-4 {
+  padding-right: 1rem
+}
+
 body.steedos .pl-4 {
   padding-left: 1rem
 }
@@ -392,8 +402,8 @@ body.steedos .ease-in-out {
     margin: 0.75rem
   }
 
-  body.steedos .sm\:flex {
-    display: flex
+  body.steedos .sm\:mt-\[90px\] {
+    margin-top: 90px
   }
 
   body.steedos .sm\:w-\[220px\] {

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