@steedos/service-plugin-amis 2.7.27-beta.6 → 3.0.0-beta.100

package/main/default/client/amis.render.client.js

@@ -29,17 +29,12 @@
           
             return true;
           }
-
-        // 加载Amis SDK: 如果直接放到body中会导致 meteor 编译后的 cordova.js 加载报错
-        // let amisSDKScript = document.createElement("script");
-        // amisSDKScript.setAttribute("src", Steedos.absoluteUrl('/unpkg.com/amis/sdk/sdk.js'));
-        // document.getElementsByTagName("head")[0].appendChild(amisSDKScript);
     } catch (error) {
         console.error(error)
     };
 
     const getAmisLng = ()=>{
-        var locale = Creator.USER_CONTEXT ? Creator.USER_CONTEXT.user.language : null;
+        var locale = Builder.settings.context.user ? Builder.settings.context.user.language : null;
         if(locale){
             locale = locale.replace('_', '-');
             locale = locale === 'en' ? 'en-US' : locale;
@@ -257,13 +252,8 @@
 
                   // 主要是支持 nav 中的跳转
                   if (action && to && action.target) {
-                      if(Meteor.isCordova && to.indexOf('http') != 0){
-                        window.open(Steedos.absoluteUrl(to), action.target);
-                        return;
-                      }else{
-                        window.open(to, action.target);
-                        return;
-                      }
+                      window.open(to, action.target);
+                      return;
                   }
 
                   if (/^https?:\/\//.test(to)) {
@@ -281,10 +271,6 @@
                     }
                     // url是相对路径
                     if(config.url && (!/^http[s]?:\/\//i.test(config.url))){
-                      if(Meteor.isCordova){
-                        config.url = Meteor.absoluteUrl(config.url)
-                      }
-
                       if(!config.headers){
                         config.headers = {}
                       }
@@ -292,17 +278,6 @@
                       if(!config.headers.Authorization && Builder.settings.context && Builder.settings.context.tenantId && Builder.settings.context.authToken){
                         config.headers.Authorization = `Bearer ${Builder.settings.context.tenantId},${Builder.settings.context.authToken}`;
                       }
-                    }else if(config.url && Meteor.isCordova && Builder.settings.context && Builder.settings.context.rootUrl && config.url.startsWith(Builder.settings.context.rootUrl)){
-                      // 是绝对路径,且是cordova环境, 且以root url开头, 则自动处理认证
-                      if(Meteor.isCordova){
-                        if(!config.headers){
-                          config.headers = {}
-                        }
-              
-                        if(!config.headers.Authorization && Builder.settings.context && Builder.settings.context.tenantId && Builder.settings.context.authToken){
-                          config.headers.Authorization = `Bearer ${Builder.settings.context.tenantId},${Builder.settings.context.authToken}`;
-                        }
-                      }
                     }
                     return config;
                 },
@@ -418,23 +393,6 @@
             };
 
             const initMonaco = ()=>{
-
-                // const { detect } = require('detect-browser');
-
-                // const browser = detect();
-
-                // // 低于86版的chrome 不支持code类型字段及功能
-                // if (browser && browser.name === 'chrome' && Number(browser.version.split(".")[0]) < 86) {
-                //     return Promise.resolve(true)
-                // }
-
-                // // 手机版暂不支持code类型字段.
-                // if(Meteor.isCordova){
-                //     return Promise.resolve(true)
-                // }else{
-                //     return Builder.initMonaco()
-                // }
-
                 return Promise.resolve(true)
             }
             //Amis SDK 中已清理了monaco, 所以这里需要提前注册,否则会导致amis code类型报错

package/main/default/client/{creator.function.client.js → steedos.function.client.js}

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-20 17:42:20
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-08-22 22:36:38
+ * @LastEditTime: 2025-03-05 11:30:22
  * @Description: 提供辅助函数
  */
 (function(){
@@ -73,7 +73,7 @@
         }
       }
 
-    Creator.showListFilter = (objectName, listView, data, props)=>{
+    Steedos.showListFilter = (objectName, listView, data, props)=>{
         const pageName = `${objectName}-list-filter`;
         const canSave = canSaveFilters();
         return Steedos.Page.render(SteedosUI.Drawer, {

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

@@ -141,16 +141,19 @@
                     "multiple": false
                   },
                   {
-                    "name": "formula",
-                    "label": "${'action_field_updates.action_field_updates_form.formula' | t}",
-                    "required": false,
-                    "type": "textarea",
-                    "tpl": "<b><%=data.formula%></b>",
+                    "type": "service",
+                    "schemaApi": {
+                      "method": "get",
+                      "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${target_object}/fields/options",
+                      "cache": 30000,
+                      "adaptor": "const field = {label: t('action_field_updates.action_field_updates_form.formula')}; const variables = SteedosUI.getFormulaVariables(payload.data.options);\n var fieldSchema={label: field.label, type:'input-formula', name: 'formula', 'evalMode': false, variableMode: 'tabs', variables: variables, labelRemark: field.inlineHelpText, description: field.description } \n return {...payload, data:fieldSchema};",
+                      "trackExpression": "${target_object}",
+                      "sendOn": "${target_object}"
+                    },
+                    "dsType": "api",
+                    "id": "u:508198dbfac7",
                     "className": "col-span-2 m-1",
                     "labelClassName": "text-left",
-                    "clearValueOnHidden": true,
-                    "fieldName": "formula",
-                    "id": "u:20766a86a9f4",
                     "hiddenOn": "this.operation != 'formula'"
                   },
                   {

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

@@ -76,7 +76,6 @@
     ],
     "data": {
         "context": {
-            "rootUrl": "http://127.0.0.1:5800"
         }
     },
     "id": "u:3b0de7e88def",

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

@@ -289,7 +289,7 @@
           }
         },
         "initApiAdaptor": "\nvar data;\nif (recordId) {\n  data = payload.data || { _filters_type_controller: 'conditions' };\n  //数据格式转换\n  if (data) {\n    data.sort = lodash.map(data.sort, (item) => {\n      return item.field_name + \":\" + item.order;\n    });\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 uiSchema = api.body.uiSchema;\n const contextDefaultData = context && context.data && context.data.defaultData; const defaultData = api.body.defaultData || contextDefaultData;\n  let defaultValues = {};\n _.each(uiSchema && uiSchema.fields, function (field) {\n    var value = SteedosUI.getFieldDefaultValue(field, api.body.global);\n    if (!_.isNil(value)) {\n      defaultValues[field.name] = value;\n    }\n  });\n if (defaultData && _.isObject(defaultData) && !_.isArray(defaultData)) {\n    data = Object.assign({}, defaultValues, defaultData); \n  }else{data = Object.assign({}, defaultValues) } \n}\nfor (key in data) {\n  if (data[key] === null) {\n    delete data[key];\n  }\n}\npayload.data = data;\ndelete payload.extensions; if (data.is_enable != false) { data.is_enable = true; };\nreturn payload;",
-        "apiRequestAdaptor": "delete formData.created;\ndelete formData.created_by;\ndelete formData.modified;\ndelete formData.modified_by;\ndelete formData._display;\n\n//数据格式转换\nformData.sort = lodash.map(formData.sort, (item) => {\n  const arr = item.split(':');\n  return { field_name: arr[0], order: arr[1] };\n});\n\nformData.searchable_fields = lodash.map(formData.searchable_fields, (item) => {\n  return { field: item };\n});\n\nif (!formData._filters_type_controller) {\n  formData._filters_type_controller = 'conditions';\n}\n\nif (formData._filters_type_controller === 'conditions' && formData._filters_conditions) {\n  formData.filters = window.amisConvert.conditionsToFilters(formData._filters_conditions);\n  // formData.filters = JSON.stringify(window.amisConvert.conditionsToFilters(formData._filters_conditions), null, 4);\n} else {\n  formData.filters = formData._filters_function || null;\n}\n\ndelete formData._filters_type_controller;\ndelete formData._filters_conditions;\ndelete formData._filters_function;\n\nquery = `mutation{record: object_listviews__insert(doc: {__saveData}){_id}}`;\nif (formData.recordId) {\n  query = `mutation{record: object_listviews__update(id: \"` + formData._id + `\", doc: {__saveData}){_id}}`;\n};\n__saveData = JSON.stringify(JSON.stringify(formData));\n\napi.data = { query: query.replace('{__saveData}', __saveData) };\nreturn api;",
+        "apiRequestAdaptor": "delete formData.created;\ndelete formData.created_by;\ndelete formData.modified;\ndelete formData.modified_by;\ndelete formData._display;\n\n//数据格式转换\nformData.sort = lodash.map(formData.sort, (item) => {\n  const arr = item.split(':');\n  return { field_name: arr[0], order: arr[1] };\n});\n\nformData.searchable_fields = lodash.map(formData.searchable_fields, (item) => {\n  return { field: item };\n});\n\nif (!formData._filters_type_controller) {\n  formData._filters_type_controller = 'conditions';\n}\n\nif (formData._filters_type_controller === 'conditions' && formData._filters_conditions) {\n  formData.filters = window.amisConvert.conditionsToFilters(formData._filters_conditions);\n  // formData.filters = JSON.stringify(window.amisConvert.conditionsToFilters(formData._filters_conditions), null, 4);\n} else {\n  formData.filters = formData._filters_function || null;\n}\n\ndelete formData._filters_type_controller;\ndelete formData._filters_conditions;\ndelete formData._filters_function;\n\nquery = `mutation{record: object_listviews__insert(doc: {__saveData}){_id}}`;\nif (formData.recordId) {\n  query = `mutation{record: object_listviews__update(id: \"` + api.body.recordId + `\", doc: {__saveData}){_id}}`;\n};\n__saveData = JSON.stringify(JSON.stringify(formData));\n\napi.data = { query: query.replace('{__saveData}', __saveData) };\nreturn api;",
         "id": "u:ce9e3fcc411a"
       }
     ],
@@ -304,16 +304,5 @@
     "initApi": null,
     "initFetch": null,
     "id": "u:6ada123f9d4a",
-    "onEvent": {
-      "init": {
-        "weight": 0,
-        "actions": [
-          {
-            "actionType": "custom",
-            "script": "//初始化时给外层dialog加上类名，使过滤组件popover正常显示\n$('.steedos-object-listview-form-page').closest('.amis-dialog-widget.antd-Modal').addClass('steedos-overflow-visible-dialog');"
-          }
-        ]
-      }
-    },
     "className": "steedos-object-listview-form-page"
 }

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

@@ -302,8 +302,9 @@ module.exports = {
                         fields: 1
                     }
                 };
+                const forceUnHiddenObjectNames = ["cms_files", "tasks", "notes", "events", "instances", "approvals", "process_instance_history",  "audit_records"];
                 let objects = _.map(_.filter((allObjects), (obj)=>{
-                    return obj.hidden != true;
+                    return obj.hidden != true || forceUnHiddenObjectNames.includes(obj.name);
                 }), (obj)=>{
                     return {
                         name: obj.name,

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

@@ -195,7 +195,7 @@ const getField = (objectName, fieldName, type, lng)=>{
         case 'date':
             // 华炎魔方中日期字段存的是utc的0点
             field = {
-                type: "date",
+                type: "text",
                 format: "YYYY-MM-DDT00:00:00+00:00",
                 operators: getFieldOperators("date", lng)
             };
@@ -203,7 +203,7 @@ const getField = (objectName, fieldName, type, lng)=>{
         case 'datetime':
             // 即amis中日期时间控件的format默认值为"YYYY-MM-DDTHH:mm+08:00"正好满足需求
             field = {
-                type: "datetime",
+                type: "text",
                 operators: getFieldOperators("datetime", lng)
             };
             break;
@@ -217,6 +217,11 @@ const getField = (objectName, fieldName, type, lng)=>{
             break;
         case 'lookup':
         case 'master_detail':
+            field = {
+                type: 'text',
+                operators: getFieldOperators("select", lng)
+            };
+            break;
         case 'select':
             field = {
                 type: 'select',

package/main/default/services/utils/fields/index.js

@@ -193,7 +193,7 @@ function  convertSFieldToAmisFilesField(field,readonly){
         type: getAmisStaticFieldType(fieldType, readonly),
         receiver: {
             method: "post",
-            url: `\${context.rootUrl}/s3/${table_name}`,
+            url: `/api/v6/files/${table_name}`,
             adaptor: `
 var rootUrl = ${JSON.stringify(rootUrl)};
 payload = {

package/main/default/services/utils/object-record.js

@@ -160,7 +160,7 @@ function getScriptForRewriteValueForFileFields(fields){
                                     return {
                                         value: value,
                                         name: fileFieldNames[index],
-                                        url: fileRootUrl + value + "?download=true",
+                                        url: fileRootUrl + value,
                                         state: "uploaded"
                                     }
                                 });
@@ -169,7 +169,7 @@ function getScriptForRewriteValueForFileFields(fields){
                             data[item] = {
                                 value: fileFieldValue,
                                 name: fileFieldNames[0],
-                                url: fileRootUrl + fileFieldValue + "?download=true",
+                                url: fileRootUrl + fileFieldValue,
                                 state: "uploaded"
                             };
                         }

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

@@ -41,7 +41,7 @@ const getListPageInitSchema = function (objectApiName) {
     return {
         type: 'page',
         name: getScopeId(objectApiName, "list"),
-        bodyClassName: '',
+        bodyClassName: 'p-0',
         regions: [
             "body"
         ],
@@ -112,7 +112,7 @@ const getRecordPageInitSchema = async function (objectApiName, userSession) {
         name: getScopeId(objectApiName, "record_detail"),
         objectApiName: "${objectName}",
         bodyClassName: '',
-        className: "object-detail-page steedos-record-content overflow-y-auto p-0 m-0 flex-1 h-full bg-gray-100",
+        className: "object-detail-page steedos-record-content overflow-y-auto p-0 m-0 flex-1 h-full bg-gray-50",
         regions: [
             "body"
         ],

package/main/default/services/utils/util.js

@@ -9,7 +9,7 @@ function getSvgUrl(source, name) {
       name = foo[1];
     }
     url = "/assets/icons/" + source + "/svg/symbols.svg#" + name;
-    return Creator.getRelativeUrl(url);
+    return Steedos.getRelativeUrl(url);
 }
 
 exports.getSvgUrl = getSvgUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.7.27-beta.6",
+  "version": "3.0.0-beta.100",
   "main": "package.service.js",
   "scripts": {
     "build": "yarn build:tailwind-base && yarn build:tailwind",
@@ -13,7 +13,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4cc6978a51be2b5b8efcad8ec8adba467df6e02a",
+  "gitHead": "89c69deb3ceb9d9e97c70ee23694ccecf1b4ce2b",
   "devDependencies": {
     "tailwindcss": "3.2.4"
   }

package/package.service.js

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-19 11:38:30
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-08-02 15:05:31
+ * @LastEditTime: 2025-03-10 11:59:01
  * @Description: 
  */
 "use strict";
@@ -49,16 +49,7 @@ module.exports = {
 	 * Events
 	 */
 	events: {
-		"steedos-server.started": {
-            async handler() {
-                await this.publicClientJS();
-            }
-        },
-        "space.initialized": {
-            async handler() {
-                await this.publicClientJS();
-            }
-        }
+		
 	},
 
 	/**
@@ -74,10 +65,11 @@ module.exports = {
 				const { path : packagePath } = packageInfo;
                 let publicPath = path.join(packagePath, 'main', 'default', 'client');
                 try {
-                    if (!fs.existsSync(publicPath) || this.settings.loadedPublicClientJS || typeof WebApp == 'undefined') {
+                    if (!fs.existsSync(publicPath) || this.settings.loadedPublicClientJS) {
                         return;
                     }
                 } catch (error) {
+					console.log('error', error)
                     return
                 }
 
@@ -87,12 +79,11 @@ module.exports = {
                     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;
+                        if (process.env.ROOT_URL_PATH_PREFIX) {
+                            routerPath = process.env.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;
@@ -115,9 +106,7 @@ module.exports = {
 	 * Service started lifecycle event handler
 	 */
 	async started() {
-		this.broker.waitForServices("steedos-server").then(async () => {
-			await this.publicClientJS()
-		});
+		await this.publicClientJS()
 	},
 
 	/**

package/public/tailwind/tailwind-steedos.css

@@ -68,17 +68,6 @@
   position: sticky
 }
 
-.inset-0 {
-  top: 0px;
-  right: 0px;
-  bottom: 0px;
-  left: 0px
-}
-
-.z-20 {
-  z-index: 20
-}
-
 .col-span-2 {
   grid-column: span 2 / span 2
 }
@@ -87,25 +76,20 @@
   float: right
 }
 
-.m-1 {
-  margin: 0.25rem
-}
-
 .m-0 {
   margin: 0px
 }
 
-.-m-8 {
-  margin: -2rem
-}
-
 .m-auto {
   margin: auto
 }
 
-.mx-4 {
-  margin-left: 1rem;
-  margin-right: 1rem
+.m-4 {
+  margin: 1rem
+}
+
+.m-1 {
+  margin: 0.25rem
 }
 
 .my-2 {
@@ -113,45 +97,54 @@
   margin-bottom: 0.5rem
 }
 
-.-mx-11 {
-  margin-left: -2.75rem;
-  margin-right: -2.75rem
-}
-
-.mt-3 {
-  margin-top: 0.75rem
+.my-4 {
+  margin-top: 1rem;
+  margin-bottom: 1rem
 }
 
-.mb-4 {
-  margin-bottom: 1rem
+.mx-4 {
+  margin-left: 1rem;
+  margin-right: 1rem
 }
 
-.mt-2 {
-  margin-top: 0.5rem
+.mb-0 {
+  margin-bottom: 0px
 }
 
-.mr-4 {
-  margin-right: 1rem
+.ml-2 {
+  margin-left: 0.5rem
 }
 
 .mb-2 {
   margin-bottom: 0.5rem
 }
 
-.-mt-3 {
-  margin-top: -0.75rem
+.mb-4 {
+  margin-bottom: 1rem
 }
 
 .mr-7 {
   margin-right: 1.75rem
 }
 
-.mb-0 {
-  margin-bottom: 0px
+.ml-4 {
+  margin-left: 1rem
 }
 
-.ml-2 {
-  margin-left: 0.5rem
+.mr-1 {
+  margin-right: 0.25rem
+}
+
+.mt-2 {
+  margin-top: 0.5rem
+}
+
+.mr-4 {
+  margin-right: 1rem
+}
+
+.-mt-3 {
+  margin-top: -0.75rem
 }
 
 .block {
@@ -186,34 +179,22 @@
   display: none
 }
 
-.h-9 {
-  height: 2.25rem
-}
-
 .h-full {
   height: 100%
 }
 
-.h-0 {
-  height: 0px
-}
-
 .h-7 {
   height: 1.75rem
 }
 
-.w-9 {
-  width: 2.25rem
+.h-9 {
+  height: 2.25rem
 }
 
 .w-full {
   width: 100%
 }
 
-.w-6\/12 {
-  width: 50%
-}
-
 .w-4\/5 {
   width: 80%
 }
@@ -222,12 +203,12 @@
   width: 24rem
 }
 
-.min-w-\[240px\] {
-  min-width: 240px
+.w-9 {
+  width: 2.25rem
 }
 
-.min-w-\[200px\] {
-  min-width: 200px
+.min-w-\[220px\] {
+  min-width: 220px
 }
 
 .max-w-4xl {
@@ -246,19 +227,10 @@
   flex-grow: 1
 }
 
-.-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))
-}
-
 .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
-}
-
 .flex-col {
   flex-direction: column
 }
@@ -275,6 +247,10 @@
   justify-content: space-between
 }
 
+.gap-3 {
+  gap: 0.75rem
+}
+
 .overflow-auto {
   overflow: auto
 }
@@ -283,18 +259,10 @@
   overflow: hidden
 }
 
-.overflow-x-auto {
-  overflow-x: auto
-}
-
 .overflow-y-auto {
   overflow-y: auto
 }
 
-.whitespace-nowrap {
-  white-space: nowrap
-}
-
 .rounded {
   border-radius: 0.25rem
 }
@@ -311,17 +279,12 @@
   border-width: 0px
 }
 
-.border-y {
-  border-top-width: 1px;
+.border-b {
   border-bottom-width: 1px
 }
 
-.border-r {
-  border-right-width: 1px
-}
-
-.border-b {
-  border-bottom-width: 1px
+.border-none {
+  border-style: none
 }
 
 .border-gray-300 {
@@ -329,38 +292,33 @@
   border-color: rgb(209 213 219 / var(--tw-border-opacity))
 }
 
-.border-gray-200 {
-  --tw-border-opacity: 1;
-  border-color: rgb(229 231 235 / var(--tw-border-opacity))
-}
-
 .bg-white {
   --tw-bg-opacity: 1;
   background-color: rgb(255 255 255 / var(--tw-bg-opacity))
 }
 
-.bg-gray-50 {
+.bg-gray-100 {
   --tw-bg-opacity: 1;
-  background-color: rgb(249 250 251 / var(--tw-bg-opacity))
+  background-color: rgb(243 244 246 / var(--tw-bg-opacity))
 }
 
-.bg-gray-100 {
+.bg-gray-50 {
   --tw-bg-opacity: 1;
-  background-color: rgb(243 244 246 / var(--tw-bg-opacity))
+  background-color: rgb(249 250 251 / var(--tw-bg-opacity))
 }
 
 .bg-none {
   background-image: none
 }
 
-.p-0 {
-  padding: 0px
-}
-
 .p-4 {
   padding: 1rem
 }
 
+.p-0 {
+  padding: 0px
+}
+
 .p-2 {
   padding: 0.5rem
 }
@@ -369,6 +327,21 @@
   padding: 0.25rem
 }
 
+.py-1 {
+  padding-top: 0.25rem;
+  padding-bottom: 0.25rem
+}
+
+.px-0 {
+  padding-left: 0px;
+  padding-right: 0px
+}
+
+.py-4 {
+  padding-top: 1rem;
+  padding-bottom: 1rem
+}
+
 .px-2 {
   padding-left: 0.5rem;
   padding-right: 0.5rem
@@ -394,29 +367,14 @@
   padding-bottom: 0.5rem
 }
 
-.px-0 {
-  padding-left: 0px;
-  padding-right: 0px
-}
-
-.py-1 {
-  padding-top: 0.25rem;
-  padding-bottom: 0.25rem
-}
-
-.py-4 {
-  padding-top: 1rem;
-  padding-bottom: 1rem
+.pt-4 {
+  padding-top: 1rem
 }
 
 .pl-10 {
   padding-left: 2.5rem
 }
 
-.pt-4 {
-  padding-top: 1rem
-}
-
 .text-left {
   text-align: left
 }
@@ -433,22 +391,18 @@
   font-weight: 700
 }
 
-.italic {
-  font-style: italic
-}
-
 .leading-none {
   line-height: 1
 }
 
-.text-gray-600 {
+.text-black {
   --tw-text-opacity: 1;
-  color: rgb(75 85 99 / var(--tw-text-opacity))
+  color: rgb(0 0 0 / var(--tw-text-opacity))
 }
 
-.text-black {
+.text-gray-300 {
   --tw-text-opacity: 1;
-  color: rgb(0 0 0 / var(--tw-text-opacity))
+  color: rgb(209 213 219 / var(--tw-text-opacity))
 }
 
 .text-gray-500 {
@@ -456,13 +410,15 @@
   color: rgb(107 114 128 / var(--tw-text-opacity))
 }
 
-.text-gray-300 {
+.text-gray-600 {
   --tw-text-opacity: 1;
-  color: rgb(209 213 219 / var(--tw-text-opacity))
+  color: rgb(75 85 99 / var(--tw-text-opacity))
 }
 
-.underline {
-  text-decoration-line: underline
+.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)
 }
 
 .shadow-none {
@@ -471,12 +427,6 @@
   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)
 }
@@ -489,30 +439,6 @@
   transition-duration: 150ms
 }
 
-.duration-300 {
-  transition-duration: 300ms
-}
-
-.ease-in-out {
-  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1)
-}
-
-.hover\:ml-2\.5:hover {
-  margin-left: 0.625rem
-}
-
-.hover\:ml-2:hover {
-  margin-left: 0.5rem
-}
-
-.hover\:inline-block:hover {
-  display: inline-block
-}
-
-.hover\:cursor-pointer:hover {
-  cursor: pointer
-}
-
 .focus\:outline-none:focus {
   outline: 2px solid transparent;
   outline-offset: 2px
@@ -523,14 +449,18 @@
     margin: 0.5rem
   }
 
-  .sm\:rounded-lg {
-    border-radius: 0.5rem
+  .sm\:m-4 {
+    margin: 1rem
   }
 
   .sm\:rounded {
     border-radius: 0.25rem
   }
 
+  .sm\:rounded-lg {
+    border-radius: 0.5rem
+  }
+
   .sm\:border {
     border-width: 1px
   }
@@ -540,15 +470,6 @@
     border-color: rgb(209 213 219 / var(--tw-border-opacity))
   }
 
-  .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);

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

@@ -1,336 +0,0 @@
-{
-  "type": "page",
-  "title": "Welcome to Steedos",
-  "body": [
-    {
-      "type": "steedos-object-form",
-      "className": "sm:border sm:rounded sm:border-gray-300 bg-white p-4",
-      "label": "对象表单",
-      "objectApiName": "apps",
-      "recordId": "${recordId}",
-      "mode": "edit",
-      "fieldsExtend": {
-        "tab_items": {
-          "amis": {
-            "name": "tab_items",
-            "type": "steedos-input-table",
-            "label": "",
-            "showIndex": true,
-            "source": "${tab_items}",
-            "strictMode": true,
-            "affixHeader": false,
-            "editable": true,
-            "addable": false,
-            "removable": true,
-            "draggable": false,
-            "fields": [
-              {
-                "label": "${'apps.apps_form.tab' | t}",
-                "type": "lookup",
-                "multiple": false,
-                "is_wide": false,
-                "required": true,
-                "reference_to": "tabs",
-                "reference_to_field": "name",
-                "sort_no": 30,
-                "name": "tab_name",
-                "hidden": false,
-                "readonly": false,
-                "disabled": false,
-                "_prefix": "tab_items."
-              },
-              {
-                "label": "${'apps.apps_form.tab_grouping' | t}",
-                "name": "group",
-                "_prefix": "tab_items.",
-                "type": "text",
-                "amis": {
-                  "type": "select",
-                  "source": "${tab_groups|pick:group_name}",
-                  "onEvent": {
-                    "change": {
-                      "actions": [
-                        {
-                          "actionType": "custom",
-                          "script": "const tabGroupKey = \"group\";const getTabsSortFun = function (groupNames) {  return function (m, n) {    var tempM = !!m[tabGroupKey] ? 1 : 0;    var tempN = !!n[tabGroupKey] ? 1 : 0;    if (!m[tabGroupKey] || !n[tabGroupKey]) {      return tempM - tempN;    }    return groupNames.indexOf(m[tabGroupKey]) - groupNames.indexOf(n[tabGroupKey]);  };};const quickEidtSaveForTab = function (input, prop_name) {  const currentPropValue = input.value;  const rowValue = input.__super;  const formValue = input.__super.__super;  const tab_name = rowValue.tab_name;  rowValue[prop_name] = currentPropValue;  delete rowValue.index;  let newTabs = formValue.tab_items.map(function (item) {    if (item.tab_name == tab_name) {      return Object.assign({}, item, rowValue);    }    else {      return item;    }  }); const tabGroups = input.__super.__super.tab_groups;  const groupNames = _.compact(_.map(tabGroups, \"group_name\"));  if (groupNames && groupNames.length) {    newTabs.sort(getTabsSortFun(groupNames));  }  return {    tab_items: newTabs  }};const eventData = event.data;const newTabTtemsProp = quickEidtSaveForTab(eventData, \"group\");setTimeout(function () {   doAction({    actionType: 'setValue',    componentId: \"object_form\",    args: {      value: newTabTtemsProp    }  });},300);"
-                        }
-                      ]
-                    }
-                  },
-                  "placeholder": "-"
-                },
-                "className": "m-0",
-                "checkAll": false,
-                "selectFirst": false,
-                "searchable": true,
-                "clearable": true,
-                "multiple": false,
-                "mode": "inline"
-              }
-            ],
-            "columns": [
-              {
-                "name": "tab_name",
-                "inlineEditMode": false
-              },
-              "group"
-            ],
-            "headerToolbar": [
-              {
-                "type": "service",
-                "id": "tabs-options-service",
-                "className": "mb-2",
-                "body": [
-                  {
-                    "type": "button",
-                    "id": "u:a35a2276145d",
-                    "label": "${'apps.apps_form.tab_generate' | t}",
-                    "onEvent": {
-                      "click": {
-                        "actions": [
-                          {
-                            "script": "const appId = null;  const page = Steedos.Page.getPage('app', appId, null, null, 'generate_object_tabs');  if (page && page.schema) {    const pageSchema = JSON.parse(page.schema);    let formSchema = pageSchema.body[0];    formSchema.canAccessSuperData = false;    formSchema.wrapWithPanel = false;    formSchema.className = 'steedos-amis-form';    const title = t('apps.apps_form.tab_generate_title');    doAction({      'actionType': 'dialog',      'dialog': {        'type': 'dialog',        'title': title,        'body': formSchema,        'size': 'lg'      }    });  }",
-                            "actionType": "custom"
-                          }
-                        ],
-                        "weight": 0
-                      }
-                    },
-                    "tpl": "内容"
-                  },
-                  {
-                    "type": "button",
-                    "label": "${'apps.apps_form.tab_set' | t}",
-                    "id": "u:853b890ab524",
-                    "actionType": "dialog",
-                    "dialog": {
-                      "type": "dialog",
-                      "title": "${'apps.apps_form.tab_set' | t}",
-                      "body": [
-                        {
-                          "type": "transfer",
-                          "name": "picked_tabs",
-                          "value": "${tab_items|pick:tab_name}",
-                          "sortable": true,
-                          "source": "${tabs_options}",
-                          "searchable": true,
-                          "itemHeight": 40,
-                          "id": "u:f2d36873abd1"
-                        }
-                      ],
-                      "onEvent": {
-                        "confirm": {
-                          "actions": [
-                            {
-                              "actionType": "custom",
-                              "script": "const tabGroupKey = 'group';const getTabsSortFun = function (groupNames) {  return function (m, n) {    var tempM = !!m[tabGroupKey] ? 1 : 0;    var tempN = !!n[tabGroupKey] ? 1 : 0;    if (!m[tabGroupKey] || !n[tabGroupKey]) {      return tempM - tempN;    }    return groupNames.indexOf(m[tabGroupKey]) - groupNames.indexOf(n[tabGroupKey]);  };};const clearTabs = function (input) {   return {    tab_items: []  }};const convertDataForTabs = function (input) {  let pickedTabs = input.picked_tabs || [];   const superTabs = _.keyBy(input.__super.tab_items, 'tab_name');  if (typeof pickedTabs === 'string') {    pickedTabs = pickedTabs.split(',');  } const tabOptions = _.keyBy(input.__super.tabs_options, 'value');  const convertedTabs = pickedTabs.map(function (tab_name) {    const superTab = superTabs[tab_name];    if (superTab) {      return superTab;    }    else {      const tabOption = tabOptions[tab_name];      return {        tab_name: tab_name,        group: tabOption.group      }    }  });  const tabGroups = input.__super.tab_groups;   const groupNames = _.compact(_.map(tabGroups, 'group_name'));   if (groupNames && groupNames.length) {     convertedTabs.sort(getTabsSortFun(groupNames));   }  return {    tab_items: convertedTabs  }};const eventData = event.data;doAction({  actionType: 'setValue',  componentId: 'object_form',  args: {    value: convertDataForTabs(eventData)  }});doAction({  actionType: 'setValue',  componentId: 'tabs-options-service',  args: {    value: convertDataForTabs(eventData)  }});"
-                            }
-                          ]
-                        }
-                      },
-                      "size": "lg",
-                      "id": "u:9c93896a73cf",
-                      "closeOnEsc": false,
-                      "closeOnOutside": false,
-                      "showCloseButton": true,
-                      "showErrorMsg": true,
-                      "showLoading": true,
-                      "dataMapSwitch": false
-                    }
-                  },
-                  {
-                    "type": "button",
-                    "label": "${'apps.apps_form.tab_grouping_set' | t}",
-                    "actionType": "dialog",
-                    "dialog": {
-                      "title": "${'apps.apps_form.tab_grouping_set' | t}",
-                      "body": [
-                        {
-                          "type": "input-table",
-                          "name": "setting_groups",
-                          "value": "${tab_groups}",
-                          "addable": true,
-                          "draggable": true,
-                          "editable": true,
-                          "needConfirm": false,
-                          "columns": [
-                            {
-                              "name": "group_name",
-                              "label": "${'apps.apps_form.tab_grouping_name' | t}",
-                              "id": "u:383c7744b499"
-                            },
-                            {
-                              "name": "default_open",
-                              "label": "${'apps.apps_form.tab_grouping_open' | t}",
-                              "id": "u:7a243c84ed66",
-                              "type": "checkbox",
-                              "value": true
-                            }
-                          ],
-                          "removable": true,
-                          "id": "setting_groups"
-                        }
-                      ],
-                      "onEvent": {
-                        "confirm": {
-                          "actions": [
-                            {
-                              "actionType": "custom",
-                              "script": "const tabGroupKey = 'group';\nconst getTabsSortFun = function (groupNames) {\n  return function (m, n) {\n    var tempM = !!m[tabGroupKey] ? 1 : 0;\n    var tempN = !!n[tabGroupKey] ? 1 : 0;\n    if (!m[tabGroupKey] || !n[tabGroupKey]) {\n      return tempM - tempN;\n    }\n    return groupNames.indexOf(m[tabGroupKey]) - groupNames.indexOf(n[tabGroupKey]);\n  };\n};\nconst clearTabs = function (input) { return { tab_items: [] } };\nconst convertDataForGroups = function (input) {\n \n  const settingGroups = input.setting_groups || [];\n  const convertedGroups = _.uniqBy(settingGroups.map(function (item) {\n    return { group_name: item.group_name, default_open: item.default_open }\n  }), 'group_name');\n  const groupNames = _.compact(_.map(convertedGroups, 'group_name'));\n  const tab_items = input.tab_items;\n  tab_items?.sort(getTabsSortFun(groupNames));\n  \n  return { tab_groups: convertedGroups, tab_items: tab_items }\n};\nconst eventData = event.data;\ndoAction(\n  {\n    actionType: 'setValue',\n    componentId: 'object_form',\n    args: { value: convertDataForGroups(eventData) }\n  }\n);"
-                            }
-                          ]
-                        }
-                      },
-                      "type": "dialog",
-                      "size": "lg",
-                      "id": "setting_groups",
-                      "closeOnEsc": false,
-                      "closeOnOutside": false,
-                      "showCloseButton": true,
-                      "showErrorMsg": true,
-                      "showLoading": true,
-                      "dataMapSwitch": false
-                    },
-                    "id": "u:111b043b193c"
-                  }
-                ],
-                "messages": {
-                },
-                "api": {
-                  "method": "post",
-                  "url": "${context.rootUrl}/graphql",
-                  "adaptor": "let data = payload.data;\ndata.tabs_options = [];\nif (data.options && data.options.length) {\n  data.tabs_options = data.options.map(function (option) {\n    option.label = option.label + '(' + option.value + ')';\n    return option;\n  });\n}\nif (!api.body.recordId) {\n  const defaultValues = {\n    is_creator: true,\n    mobile: true,\n    visible: true,\n    sort: 9100\n  };\n  data = Object.assign({}, data, defaultValues);\n}\ndelete data.options;\npayload.data = data;\nreturn payload;  ",
-                  "data": {
-                    "query": "{options:tabs{_id label:label value:name,type,object,desktop,mobile}}",
-                    "recordId": "${recordId}"
-                  },
-                  "headers": {
-                    "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                  },
-                  "messages": {
-                  },
-                  "requestAdaptor": ""
-                }
-              }
-            ],
-            "enableDialog": false,
-            "id": "u:7949aecf0ca9"
-          }
-        },
-        "objects": {
-          "amis": {
-            "name": "objects",
-            "type": "select",
-            "className": "m-0",
-            "labelClassName": "text-left",
-            "id": "u:4e5047e44905",
-            "joinValues": false,
-            "extractValue": true,
-            "labelField": "label",
-            "valueField": "value",
-            "multiple": true,
-            "checkAll": false,
-            "searchable": true,
-            "menuTpl": "",
-            "source": {
-              "method": "get",
-              "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/options",
-              "headers": {
-                "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-              }
-            },
-            "autoComplete": ""
-          }
-        },
-        "mobile_objects": {
-          "amis": {
-            "name": "mobile_objects",
-            "type": "select",
-            "className": "m-0",
-            "labelClassName": "text-left",
-            "id": "u:cfaeb2f857a8",
-            "joinValues": false,
-            "extractValue": true,
-            "labelField": "label",
-            "valueField": "value",
-            "multiple": true,
-            "checkAll": false,
-            "searchable": true,
-            "menuTpl": "",
-            "source": {
-              "method": "get",
-              "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/options",
-              "messages": {
-              },
-              "headers": {
-                "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-              }
-            },
-            "autoComplete": ""
-          }
-        },
-        "visible_on": {
-          "amis": {
-            "type": "control",
-            "body": [
-              {
-                "type": "service",
-                "id": "u:edcd865de7d8",
-                "body": [
-                  {
-                    "type": "input-formula",
-                    "name": "visible_on",
-                    "evalMode": false,
-                    "variableMode": "tabs",
-                    "variables": "${visibleOnVariables}",
-                    "visibleOn": "${visibleOnVariables}",
-                    "id": "u:618105d5bfad",
-                    "labelClassName": "none"
-                  }
-                ],
-                "api": {
-                  "method": "get",
-                  "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/apps/fields/options",
-                  "cache": 30000,
-                  "adaptor": "const visibleOnVariables = SteedosUI.getFormulaVariables(payload.data.options);\nconst defaultValueVariables = [visibleOnVariables[1]];\npayload = {\n  data: {\n    visibleOnVariables,\n    defaultValueVariables\n  }\n};\nreturn payload;",
-                  "headers": {
-                    "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                  }
-                },
-                "dsType": "api"
-              }
-            ],
-            "id": "u:996ef29c6851"
-          }
-        }
-      },
-      "enableTabs": true,
-      "debug": false,
-      "initApiRequestAdaptor": "",
-      "initApiAdaptor": "var data = payload.data;\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}\nif (data._id && !data.tab_items) {\n    const tabOptions = data.tabs_options || [];\n    const tabItems = [];\n    // 把应用中原来tabs属性值添加到新的tab_items属性的默认值中\n    if (data.tabs && data.tabs.length) {\n        data.tabs.forEach(function (item) {\n            tabItems.push({ tab_name: item });\n        });\n    }\n    const pushObjectsToTabItems = function (objects) {\n        objects.forEach(function (item) {\n            // 已经有绑定到指定对象的选项卡就不添加\n            let existObjectItem = !!tabItems.find(function (tabItem) {\n                return !!tabOptions.find(function (option) {\n                    return tabItem.tab_name === tabItem.value && option.object === item;\n                });\n            });\n            if (existObjectItem) {\n                return;\n            }\n            // 找到指向指定对象的选项卡\n            let tempOption = tabOptions.find(function (option) {\n                return option.type === \"object\" && option.object === item;\n            });\n            if (!tempOption) {\n                return;\n            }\n            // 选项卡名称如果重复了就不添加\n            let existTabItem = !!tabItems.find(function (tabItem) {\n                return tabItem.tab_name === tempOption.value;\n            });\n            if (existTabItem) {\n                return;\n            }\n            if (tempOption) {\n                tabItems.push({ tab_name: tempOption.value });\n            }\n        });\n    }\n    // 把应用中原来objects属性值添加到新的tab_items属性的默认值中\n    if (data.objects && data.objects.length) {\n        pushObjectsToTabItems(data.objects);\n    }\n    // 把应用中原来mobile_objects属性值添加到新的tab_items属性的默认值中\n    if (data.mobile_objects && data.mobile_objects.length) {\n        pushObjectsToTabItems(data.mobile_objects);\n    }\n    data.tab_items = tabItems;\n}\n\npayload.data = data;\ndelete payload.extensions;\nreturn payload;\n        ",
-      "apiRequestAdaptor": "delete formData.tabs_options;\nconst recordId = formData.recordId;\n\n// 新加字段tab_items，值同步回传到老字段tabs中兼容老UI界面\nformData.tabs = [];\nif (formData.tab_items && formData.tab_items.length) { \n    formData.tabs = formData.tab_items.map(function (item) { return item.tab_name; });\n}\n\n/*\ntab_items存储为：\ntab_items: {\n  test1:{\n    group:\"xxx\"\n  },\n  test3:{\n    group:\"yyy\"\n  }\n}\n而不是：\ntab_items: [\n  {\n    \"index\":1,\n    \"group\":\"xxx\"\n  },\n  {\n    \"index\":2,\n    \"group\":\"yyy\"\n  }\n]\n*/\nif (formData.tab_items) { \n    formData.tab_items = _.keyBy(formData.tab_items, \"tab_name\")\n    let tempIndex = 0;\n    _.each(formData.tab_items, function (n, k) {\n      tempIndex++;\n      n.index = tempIndex;\n      delete n.tab_name;\n    });\n}\n\nquery = `mutation{record: ${objectName}__insert(doc: {__saveData}){_id}}`;\nif(recordId){\n    query = `mutation{record: ${objectName}__update(id: \"${recordId}\", doc: {__saveData}){_id}}`;\n};\n__saveData = JSON.stringify(JSON.stringify(formData));\n\napi.data = {query: query.replace('{__saveData}', __saveData)};\nreturn api;\n",
-      "apiAdaptor": "",
-      "form": {
-        "id": "object_form"
-      },
-      "id": "u:e1c1a841d373",
-      "tabsMode": "line"
-    }
-  ],
-  "regions": [
-    "body"
-  ],
-  "data": {
-    "objectName": "apps",
-    "initialValues": {},
-    "appId": "builder",
-    "title": "",
-    "context": {
-      "rootUrl": "http://127.0.0.1:5800",
-      "tenantId": "64a4d6dd7fe9acaf8c330a37",
-      "userId": "683e09cd-8482-4034-bd29-5a30643e6c0f",
-      "authToken": "2906ff4353c25cfe291352f899ba3446aa5577f3de7ad60e1aa500c60dee7ca6fb446412f1c9693775b4cc"
-    }
-  },
-  "id": "u:de840f3523f2"
-}

package/main/default/pages/apps_form.page.yml

@@ -1,12 +0,0 @@
-name: apps_form
-is_active: true
-label: 应用程序表单
-object_name: apps
-pageAssignments:
-  - desktop: true
-    mobile: true
-    page: apps_form
-    type: orgDefault
-render_engine: amis
-type: form
-widgets: []