@steedos/service-plugin-amis 2.6.1-beta.7 → 2.6.2-beta.10

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

@@ -121,20 +121,34 @@ module.exports = {
                 const fieldsOptions = await this.getObjectFieldsOptions(ctx);
                 const userSession = ctx.meta.user;
                 const lng = userSession.language || "zh-CN";
+                const objectName = ctx.params.objectName;
+                const object = await objectql.getSteedosSchema().getObject(objectName);
+                const objectConfig = object.toConfig();
+                const fields = objectConfig.fields;
+
+                // image、file、lookup、master_detail、select 不参与排序
+                let ascChildren = [];
+                _.forEach(fieldsOptions, (opt)=>{
+                    if(["image","file","lookup","master_detail","select"].indexOf(fields[opt.value].type)<0){
+                        ascChildren.push({label: `${opt.label}(${steedosI18n.t('asc', {}, lng)})`, value: `${opt.value}:asc`})
+                    }
+                })
+                let descChildren = [];
+                _.forEach(fieldsOptions, (opt)=>{
+                    if(["image","file","lookup","master_detail","select"].indexOf(fields[opt.value].type)<0){
+                        descChildren.push({label: `${opt.label}(${steedosI18n.t('desc', {}, lng)})`, value: `${opt.value}:desc`})
+                    }
+                })
                 const options = [
                     {
                         label: steedosI18n.t('asc', {}, lng),
                         searchable: true,
-                        children: _.map(fieldsOptions, (opt)=>{
-                            return {label: `${opt.label}(${steedosI18n.t('asc', {}, lng)})`, value: `${opt.value}:asc`}
-                        })
+                        children: ascChildren
                     },
                     {
                         label: steedosI18n.t('desc', {}, lng),
                         searchable: true,
-                        children: _.map(fieldsOptions, (opt)=>{
-                            return {label: `${opt.label}(${steedosI18n.t('desc', {}, lng)})`, value: `${opt.value}:desc`}
-                        })
+                        children: descChildren
                     }
                 ];
 
@@ -180,7 +194,7 @@ module.exports = {
                 const lng = userSession.language || 'zh-CN';
                 const spaceId = userSession.spaceId;
                 const allMetadataObjects = await objectql.getSteedosSchema().getAllObject();
-                const allObjects = _.map(clone(allMetadataObjects), 'metadata');
+                const allObjects = _.map(allMetadataObjects, 'metadata');
                 const query = {
                     filters: [  ['name', '<>', ExcludeObjectNames]], //['hidden', '!=', true] ,
                     projection: {
@@ -189,7 +203,14 @@ module.exports = {
                     }
                 };
 
-                const objects = objectql.getSteedosSchema().metadataDriver.find(allObjects, query, spaceId);
+                const objects = _.map(_.filter(allObjects, (obj)=>{
+                    return !_.includes(ExcludeObjectNames, obj.name)
+                }), (obj)=>{
+                    return {
+                        name: obj.name,
+                        label: obj.label
+                    }
+                })
 
                 _.each(objects, (object)=>{
                     if(object && object.name){
@@ -236,7 +257,7 @@ module.exports = {
 
                 let output = [];
                 output =  _.uniq(_.compact(_.map(_.sortBy(fieldsArr, "sort_no"), (field)=>{
-                    if((include_hide || !field.hidden) && !_.includes(["grid", "object", "[Object]", "[object]", "Object", "markdown", "html"], field.type)){
+                    if((include_hide || !field.hidden) && !_.includes(["grid", "object", "[Object]", "[object]", "Object", "markdown"], field.type)){
                         // 隐藏的字段 和 字段类型 判断
                         return {
                             value: field.name,
@@ -342,7 +363,7 @@ module.exports = {
                         })
                         let relatedOptions = [];
                         relatedOptions = _.uniq(_.compact(_.map(_.sortBy(fieldsArr, "sort_no"), (field) => {
-                            if ((!field.hidden) && !_.includes(["grid", "object", "[Object]", "[object]", "Object", "markdown", "html"], field.type)) {
+                            if ((!field.hidden) && !_.includes(["grid", "object", "[Object]", "[object]", "Object", "markdown"], field.type)) {
                                 return {
                                     'value': field.name,
                                     'label': field.label || field.name
@@ -378,6 +399,10 @@ module.exports = {
                 const userSession = ctx.meta.user;
                 const lng = userSession.language || 'zh-CN';
                 const objectName = ctx.params.objectName;
+                let {showHiddenField = false} = ctx.params;
+                if(showHiddenField=='true'){
+                    showHiddenField = true;
+                }
                 const objectConfig = await objectql.getSteedosSchema().getObject(objectName).toConfig();
                 steedosI18n.translationObject(lng, objectConfig.name, objectConfig);
 
@@ -391,7 +416,7 @@ module.exports = {
 
                 const fieldsArr = [];
                 _.each(objectConfig.fields , (field, field_name)=>{
-                    if (field.hidden) return;
+                    if (showHiddenField != true && field.hidden) return;
                     if (ExcludeFieldNames.includes(field_name)) return;
                     if(!_.has(field, "name")){
                         field.name = field_name
@@ -567,7 +592,7 @@ module.exports = {
                 const objectTabs = await objectql.getObject('tabs').find({filters: [['type', '=', "object"]]});
                 const tabObjects = _.map(objectTabs, "object");
                 const allMetadataObjects = await objectql.getSteedosSchema().getAllObject();
-                const allObjects = _.map(clone(allMetadataObjects), 'metadata');
+                const allObjects = _.map(allMetadataObjects, 'metadata');
                 const query = {
                     filters: [['hidden', '!=', true], ['name', '<>', tabObjects]],
                     projection: {
@@ -607,7 +632,7 @@ module.exports = {
                 const companyId = userSession.company_id;
                 const companyIds = userSession.company_ids;
                 const allMetadataObjects = await objectql.getSteedosSchema().getAllObject();
-                const allObjects = _.map(clone(allMetadataObjects), 'metadata');
+                const allObjects = _.map(allMetadataObjects, 'metadata');
                 const query = {
                     filters: [['name', 'in', selectedObjects]], //['hidden', '!=', true] ,
                     projection: {

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

@@ -21,18 +21,15 @@ const getFormPageInitSchema = function (objectApiName) {
         "label": "对象表单",
         "objectApiName": objectApiName,
         "recordId": "${recordId}",
-        "className": "sm:border sm:shadow sm:rounded sm:border-gray-300 bg-white p-4",
+        "className": "",
         "id": "u:b3d626885b90",
+        "enableTabs": true,
         "mode": "edit",
         "layout": "normal"
     };
     return {
-        type: 'page',
+        type: 'service',
         name: getScopeId(objectApiName, "form"),
-        bodyClassName: '',
-        regions: [
-            "body"
-        ],
         body: [
             amisSchema
         ]
@@ -53,7 +50,7 @@ const getListPageInitSchema = function (objectApiName) {
             "objectApiName": objectApiName,
             "columnsTogglable": false,
             "showHeader": true,
-            className: "sm:border bg-white sm:shadow sm:rounded border-slate-300 border-solid"
+            className: "sm:border bg-white sm:rounded border-gray-300 border-solid"
         }]
     }
 }
@@ -92,7 +89,7 @@ const getRecordPageInitSchema = async function (objectApiName, userSession) {
     }
     const content = {
         "type": "tabs",
-        "className": "sm:mt-3 bg-white sm:shadow sm:rounded sm:border border-slate-300 p-4",
+        "className": "sm:mt-3 bg-white sm:rounded sm:border border-gray-300 p-4",
         "tabs": [
             detailed
         ]

package/main/default/translations/en.translation.yml

@@ -13,6 +13,7 @@ CustomLabels:
       field_set: Set Fields
       grouping_set: Set Grouping
       group_name: Name
+      visible_on: VisibleOn
       related_list_name: Related List Name
       related_list_label: Displayed Title
       related_list_label_remark: Default to object name

package/main/default/translations/zh-CN.translation.yml

@@ -13,6 +13,7 @@ CustomLabels:
       field_set: 设置字段
       grouping_set: 设置分组
       group_name: 名称
+      visible_on: 显示条件
       related_list_name: 子表名称
       related_list_label: 显示标题
       related_list_label_remark: 默认为对象名称

package/package.json

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

package/package.service.js

@@ -1,8 +1,18 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-05-19 11:38:30
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-08-02 15:05:31
+ * @Description: 
+ */
 "use strict";
 const project = require('./package.json');
 const packageName = project.name;
 const packageLoader = require('@steedos/service-package-loader');
 
+const path = require('path');
+const fs = require("fs");
+
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
  * 软件包服务启动后也需要抛出事件。
@@ -19,7 +29,8 @@ module.exports = {
 			path: __dirname,
 			name: this.name,
 			isPackage: false
-		}
+		},
+		loadedPublicClientJS: false,
 	},
 
 	/**
@@ -38,14 +49,59 @@ module.exports = {
 	 * Events
 	 */
 	events: {
-		
+		"steedos-server.started": {
+            async handler() {
+                await this.publicClientJS();
+            }
+        },
+        "space.initialized": {
+            async handler() {
+                await this.publicClientJS();
+            }
+        }
 	},
 
 	/**
 	 * Methods
 	 */
 	methods: {
-		
+		publicClientJS: {
+            handler() {
+				let packageInfo = this.settings.packageInfo;
+				if (!packageInfo) {
+					return;
+				}
+				const { path : packagePath } = packageInfo;
+                let publicPath = path.join(packagePath, 'main', 'default', 'client');
+                try {
+                    if (!fs.existsSync(publicPath) || this.settings.loadedPublicClientJS || typeof WebApp == 'undefined') {
+                        return;
+                    }
+                } catch (error) {
+                    return
+                }
+
+                try {
+                    const express = require('express');
+                    this.settings.loadedPublicClientJS = true;
+                    try {
+                        const router = require('@steedos/router').staticRouter();
+                        let routerPath = "";
+                        if (__meteor_runtime_config__.ROOT_URL_PATH_PREFIX) {
+                            routerPath = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
+                        }
+                        const cacheTime = 86400000 * 1; // one day
+                        router.use(`${routerPath}/amis-pages/js`, express.static(publicPath, { maxAge: cacheTime }));
+                        // WebApp.connectHandlers.use(router);
+                    } catch (error) {
+                        console.error(error)
+                        this.settings.loadedPublicClientJS = false;
+                    }
+                } catch (error) {
+                        
+                }
+            }
+        },
 	},
 
 	/**
@@ -59,7 +115,9 @@ module.exports = {
 	 * Service started lifecycle event handler
 	 */
 	async started() {
-
+		this.broker.waitForServices("steedos-server").then(async () => {
+			await this.publicClientJS()
+		});
 	},
 
 	/**

package/public/tailwind/tailwind-steedos.css

@@ -73,6 +73,10 @@
   grid-column: span 2 / span 2
 }
 
+.float-right {
+  float: right
+}
+
 .m-1 {
   margin: 0.25rem
 }
@@ -81,6 +85,14 @@
   margin: 0px
 }
 
+.-m-8 {
+  margin: -2rem
+}
+
+.m-auto {
+  margin: auto
+}
+
 .mx-4 {
   margin-left: 1rem;
   margin-right: 1rem
@@ -96,18 +108,30 @@
   margin-right: -2.75rem
 }
 
-.-mt-3 {
-  margin-top: -0.75rem
-}
-
 .mb-4 {
   margin-bottom: 1rem
 }
 
+.mt-2 {
+  margin-top: 0.5rem
+}
+
+.mr-4 {
+  margin-right: 1rem
+}
+
+.-mt-3 {
+  margin-top: -0.75rem
+}
+
 .mt-3 {
   margin-top: 0.75rem
 }
 
+.mr-7 {
+  margin-right: 1.75rem
+}
+
 .mb-0 {
   margin-bottom: 0px
 }
@@ -120,6 +144,10 @@
   display: block
 }
 
+.inline-block {
+  display: inline-block
+}
+
 .inline {
   display: inline
 }
@@ -144,6 +172,10 @@
   display: none
 }
 
+.h-9 {
+  height: 2.25rem
+}
+
 .h-full {
   height: 100%
 }
@@ -152,6 +184,14 @@
   height: 0px
 }
 
+.h-7 {
+  height: 1.75rem
+}
+
+.w-9 {
+  width: 2.25rem
+}
+
 .w-10 {
   width: 2.5rem
 }
@@ -164,6 +204,10 @@
   width: 100%
 }
 
+.w-4\/5 {
+  width: 80%
+}
+
 .w-96 {
   width: 24rem
 }
@@ -181,6 +225,10 @@
   min-width: 200px
 }
 
+.max-w-4xl {
+  max-width: 56rem
+}
+
 .flex-1 {
   flex: 1 1 0%
 }
@@ -218,6 +266,10 @@
   justify-content: center
 }
 
+.justify-between {
+  justify-content: space-between
+}
+
 .overflow-auto {
   overflow: auto
 }
@@ -230,14 +282,26 @@
   overflow-y: auto
 }
 
+.whitespace-nowrap {
+  white-space: nowrap
+}
+
 .rounded {
   border-radius: 0.25rem
 }
 
+.rounded-full {
+  border-radius: 9999px
+}
+
 .border {
   border-width: 1px
 }
 
+.border-0 {
+  border-width: 0px
+}
+
 .border-b {
   border-bottom-width: 1px
 }
@@ -250,21 +314,11 @@
   border-style: solid
 }
 
-.border-slate-300 {
-  --tw-border-opacity: 1;
-  border-color: rgb(203 213 225 / var(--tw-border-opacity))
-}
-
 .border-gray-300 {
   --tw-border-opacity: 1;
   border-color: rgb(209 213 219 / var(--tw-border-opacity))
 }
 
-.border-slate-200 {
-  --tw-border-opacity: 1;
-  border-color: rgb(226 232 240 / var(--tw-border-opacity))
-}
-
 .border-gray-200 {
   --tw-border-opacity: 1;
   border-color: rgb(229 231 235 / var(--tw-border-opacity))
@@ -275,11 +329,20 @@
   background-color: rgb(255 255 255 / var(--tw-bg-opacity))
 }
 
+.bg-gray-50 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(249 250 251 / var(--tw-bg-opacity))
+}
+
 .bg-gray-100 {
   --tw-bg-opacity: 1;
   background-color: rgb(243 244 246 / var(--tw-bg-opacity))
 }
 
+.bg-none {
+  background-image: none
+}
+
 .p-0 {
   padding: 0px
 }
@@ -292,6 +355,25 @@
   padding: 0.5rem
 }
 
+.p-1 {
+  padding: 0.25rem
+}
+
+.px-2 {
+  padding-left: 0.5rem;
+  padding-right: 0.5rem
+}
+
+.py-0\.5 {
+  padding-top: 0.125rem;
+  padding-bottom: 0.125rem
+}
+
+.py-0 {
+  padding-top: 0px;
+  padding-bottom: 0px
+}
+
 .px-1 {
   padding-left: 0.25rem;
   padding-right: 0.25rem
@@ -312,11 +394,6 @@
   padding-right: 0px
 }
 
-.py-0 {
-  padding-top: 0px;
-  padding-bottom: 0px
-}
-
 .py-1 {
   padding-top: 0.25rem;
   padding-bottom: 0.25rem
@@ -326,6 +403,10 @@
   padding-bottom: 0.75rem
 }
 
+.pl-10 {
+  padding-left: 2.5rem
+}
+
 .text-left {
   text-align: left
 }
@@ -342,10 +423,6 @@
   font-weight: 700
 }
 
-.lowercase {
-  text-transform: lowercase
-}
-
 .italic {
   font-style: italic
 }
@@ -354,6 +431,11 @@
   line-height: 1
 }
 
+.text-gray-600 {
+  --tw-text-opacity: 1;
+  color: rgb(75 85 99 / var(--tw-text-opacity))
+}
+
 .text-black {
   --tw-text-opacity: 1;
   color: rgb(0 0 0 / var(--tw-text-opacity))
@@ -374,6 +456,12 @@
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
 }
 
+.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);
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
+}
+
 .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)
 }
@@ -404,14 +492,14 @@
     margin-top: 0.75rem
   }
 
-  .sm\:rounded-lg {
-    border-radius: 0.5rem
-  }
-
   .sm\:rounded {
     border-radius: 0.25rem
   }
 
+  .sm\:rounded-lg {
+    border-radius: 0.5rem
+  }
+
   .sm\:border {
     border-width: 1px
   }