@steedos/standard-ui 2.6.1-beta.7 → 2.6.2-beta.2

package/main/default/applications/admin.app.yml

@@ -20,6 +20,9 @@ tab_items:
   # admin_space_user_info:
   #   group: 个人设置
   #   index: 1
+  admin_personal_information:
+    group: personal_settings
+    index: 1
   admin_process_delegation_rules:
     group: personal_settings
     index: 2
@@ -53,9 +56,6 @@ tab_items:
   admin_datasources:
     group: object_settings
     index: 13
-  admin_queue_import:
-    group: advanced_settings
-    index: 38
   admin_pages:
     group: user_interface
     index: 15
@@ -74,6 +74,9 @@ tab_items:
   admin_developer:
     group: development
     index: 19.50
+  admin_metadata:
+    group: development
+    index: 19.505
   admin_developer_triggers:
     group: development
     index: 19.51
@@ -98,15 +101,18 @@ tab_items:
   admin_workflow_outbound_messages:
     group: process_automation
     index: 25
+  admin_flows:
+    group: approval_workflow
+    index: 20
   admin_roles:
     group: approval_workflow
     index: 25
   admin_flow_roles:
     group: approval_workflow
     index: 26
-  admin_flows:
+  admin_flow_positions:
     group: approval_workflow
-    index: 27
+    index: 26.5
   admin_categories:
     group: approval_workflow
     index: 28
@@ -131,12 +137,12 @@ tab_items:
   # admin_dashboard:
   #   group: 高级设置
   #   index: 35
-  admin_audit_records:
-    group: advanced_settings
-    index: 36
   admin_autonumber:
     group: advanced_settings
     index: 37
+  admin_queue_import:
+    group: advanced_settings
+    index: 38
   # admin_web_forms:
   #   group: 高级设置
   #   index: 38
@@ -153,6 +159,6 @@ tab_items:
     group: development
     index: 42
 objects: []
-sort: 9100
+sort: 999999
 #url: /app/admin
-visible: false
+visible: true

package/main/default/client/favicon.client.js

@@ -0,0 +1,11 @@
+
+Meteor.startup(function(){
+    Tracker.autorun(function(){
+        const space = db.spaces.findOne(Steedos.getSpaceId());
+        if(space && space.favicon){
+            const faviconLink = document.querySelector('link[rel="shortcut icon"]');
+            faviconLink.href = Steedos.absoluteUrl("/api/files/avatars/"+space.favicon);
+            console.log('update faviconLink.href', faviconLink.href)
+        }
+    })
+})

package/main/default/client/history_paths.client.js

@@ -1,115 +1,40 @@
 /*
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-05-16 17:00:38
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-05-28 10:13:45
+ * @LastEditors: 涂佳俊 tujiajun@steedos.com
+ * @LastEditTime: 2023-11-23 17:22:22
  */
 var buttonTriggerHistoryPathsChange;
-; (function () {
-    try {
-        Meteor.startup(function () {
-            var rootId = "steedosHistoryPathsRoot";
-            var modalRoot = document.getElementById(rootId);
-            if (!modalRoot) {
-                modalRoot = document.createElement('div');
-                modalRoot.setAttribute('id', rootId);
-                $("body")[0].appendChild(modalRoot);
-            }
-            const page = {
-                name: "pageSteedosHistoryPaths",
-                render_engine: "amis",
-                schema: {
-                    name: "serviceSteedosHistoryPaths",
-                    id: "serviceSteedosHistoryPaths",
-                    type: "service",
-                    className: "service-steedos-history-paths",
-                    body: [{
-                        "type": "button",
-                        "label": "触发@history_paths.changed",
-                        "name": "buttonTriggerHistoryPathsChange",
-                        "className": "button-trigger-history-paths-change hidden",
-                        "onEvent": {
-                            "click": {
-                                "actions": [
-                                    {
-                                        "actionType": "broadcast",
-                                        "args": {
-                                            "eventName": "@history_paths.changed"
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    }]
-                }
-            };
-            const root = $("#" + rootId)[0];
-            Tracker.autorun(function (c) {
-                if (Creator.steedosInit.get() && Creator.validated.get()) {
-                    Steedos.Page.render(root, page, {});
-                    const findVars = (obj, vars) => {
-                        try {
-                            return vars.length === vars.filter(function (item) {
-                                return item.split(".").reduce(function (sum, n) {
-                                    return sum[n];
-                                }, obj) !== undefined;
-                            }).length;
-                        }
-                        catch (ex) {
-                            return false;
-                        }
-                    }
-                    const waittingVars = ["SteedosUI.refs.serviceSteedosHistoryPaths.getComponentByName"];
-                    Promise.all([
-                        waitForThing(window, waittingVars, findVars)
-                    ]).then(() => {
-                        var scope = SteedosUI.refs["serviceSteedosHistoryPaths"];
-                        buttonTriggerHistoryPathsChange = scope.getComponentByName("serviceSteedosHistoryPaths.buttonTriggerHistoryPathsChange");
-                        Object.assign(Steedos, {
-                            goBack
-                        });
-                    });
-                }
-            });
-        });
-
-    } catch (error) {
-        console.error(error)
-    };
-})();
 
 let historyPathsStoreKey = "history_paths";
 
-// 使用debounce防抖动函数，连续多次自动触发enter事件时，只需要捕获最后一次
-FlowRouter.triggers.enter(debounce(function (context, redirect, stop) {
-    if(!!window.opener){
-        // 记录详细页面点击右上角查看审批单等打开新窗口情况下，新窗口的history path继承了opener页面的history path，所以需要区别出来，否则会报错
-        historyPathsStoreKey = "history_paths_opener_level" + getOpenerLevel(window,0);
-    }
+// 切换应用、对象、列表视图时清除本地存储中的过滤条件
+function clearHistoryFilters(context, lastPath, paths) {
     const path = context.path;
     const params = context.params || {};
-    // const pathDef = context.route.pathDef;
-    const recordId = params.record_id;
-    if (recordId) {
-        // 触发广播事件，把当前path和params累加存入amis变量historyPaths中
-        var paths = getHistoryPaths() || [];
-        let lastPath = paths && paths[paths.length - 1];
-        //判断当前路由与记录的路由是否相同，为解决从设计器微页面返回重复记录的问题#4978
-        if(path.split('?')[0] != lastPath?.path?.split('?')[0]){
-            pushHistoryPath(path, params);
-        } 
-    }
-    else {
-        // 触发广播事件重围amis变量historyPaths值为空数组，并把当前path和params存入amis变量historyPaths中
-        resetHistoryPath(path, params);
-    }
-    triggerBroadcastHistoryPathsChanged(buttonTriggerHistoryPathsChange);
-}, 200));
-
-function goBack(){
-    let prevPath = popHistoryPath();
-    if(prevPath && prevPath.path){
-        FlowRouter.go(prevPath.path);
+    if (!lastPath || lastPath.params.app_id != params.app_id || lastPath.params.object_name != params.object_name || lastPath.params.list_view_id != params.list_view_id) {
+        let listViewPropsStoreKey;
+        if (lastPath) {
+            if(lastPath.params.record_id){
+                // 是从记录详细界面直接切换到其他对象列表或其他应用时，进一步往上找，找到对象列表的path作为lastPath来清除对应的本地存储
+                for(let i = paths.length - 1;i >= 0;i--){
+                    let tempPath = paths[i];
+                    // if(!tempPath.params.record_id && tempPath.params.list_view_id){
+                    // 不可以判断list_view_id表示对象列表，因为有可以从应用程序微页面进入记录详细页面，需要清除应用程序微页面中的对象表格或对象列表组件中本地存储中保存的过滤条件
+                    if(!tempPath.params.record_id){
+                        // record_id不存在，list_view_id存在表示对象列表页面
+                        lastPath = tempPath;
+                        break;
+                    }
+                }
+            }
+            listViewPropsStoreKey = lastPath.path.split('?')[0] + "/crud";
+        }
+        else {
+            listViewPropsStoreKey = path.split('?')[0] + "/crud";
+        }
+        sessionStorage.removeItem(listViewPropsStoreKey);
+        sessionStorage.removeItem(listViewPropsStoreKey + "/query");
     }
 }
 
@@ -195,10 +120,132 @@ function debounce(fn, delay) {
     }
 }
 
-function getOpenerLevel(opener,level){
+function getOpenerLevel(opener, level) {
+    if (level > 3) {
+        return level + 1;
+    }
     if (!!opener['opener']) {
         return getOpenerLevel(opener['opener'], level + 1);
-    }else{
-       return level; 
+    } else {
+        return level;
+    }
+}
+
+
+function goBack(){
+    let prevPath = popHistoryPath();
+    if(prevPath && prevPath.path){
+        FlowRouter.go(prevPath.path);
     }
-}
+}
+
+window.goBack = goBack;
+
+; (function () {
+    try {
+        Meteor.startup(function () {
+            Object.assign(Steedos, {
+                goBack
+            });
+            var rootId = "steedosHistoryPathsRoot";
+            var modalRoot = document.getElementById(rootId);
+            if (!modalRoot) {
+                modalRoot = document.createElement('div');
+                modalRoot.setAttribute('id', rootId);
+                $("body")[0].appendChild(modalRoot);
+            }
+            const page = {
+                name: "pageSteedosHistoryPaths",
+                render_engine: "amis",
+                schema: {
+                    name: "serviceSteedosHistoryPaths",
+                    id: "serviceSteedosHistoryPaths",
+                    type: "service",
+                    className: "service-steedos-history-paths",
+                    body: [{
+                        "type": "button",
+                        "label": "触发@history_paths.changed",
+                        "name": "buttonTriggerHistoryPathsChange",
+                        "className": "button-trigger-history-paths-change hidden",
+                        "onEvent": {
+                            "click": {
+                                "actions": [
+                                    {
+                                        "actionType": "broadcast",
+                                        "args": {
+                                            "eventName": "@history_paths.changed"
+                                        }
+                                    }
+                                ]
+                            }
+                        }
+                    }]
+                }
+            };
+            const root = $("#" + rootId)[0];
+            Tracker.autorun(function (c) {
+                if (Creator.steedosInit.get() && Creator.validated.get()) {
+                    Steedos.Page.render(root, page, {});
+                    const findVars = (obj, vars) => {
+                        try {
+                            return vars.length === vars.filter(function (item) {
+                                return item.split(".").reduce(function (sum, n) {
+                                    return sum[n];
+                                }, obj) !== undefined;
+                            }).length;
+                        }
+                        catch (ex) {
+                            return false;
+                        }
+                    }
+                    Promise.all([
+                        waitForThing(window, 'SteedosUI'),
+                    ]).then(() => {
+                        const waittingVars = ["SteedosUI.refs.serviceSteedosHistoryPaths.getComponentByName"];
+                        Promise.all([
+                            waitForThing(window, waittingVars, findVars)
+                        ]).then(() => {
+                            var scope = SteedosUI.refs["serviceSteedosHistoryPaths"];
+                            buttonTriggerHistoryPathsChange = scope.getComponentByName("serviceSteedosHistoryPaths.buttonTriggerHistoryPathsChange");
+                        });
+                    });
+                }
+            });
+        });
+
+    } catch (error) {
+        console.error(error)
+    };
+})();
+
+
+// 使用debounce防抖动函数，连续多次自动触发enter事件时，只需要捕获最后一次
+FlowRouter.triggers.enter(debounce(function (context, redirect, stop) {
+    if(!!window.opener){
+        // 记录详细页面点击右上角查看审批单等打开新窗口情况下，新窗口的history path继承了opener页面的history path，所以需要区别出来，否则会报错
+        historyPathsStoreKey = "history_paths_opener_level" + getOpenerLevel(window,0);
+    }
+    const path = context.path;
+    const params = context.params || {};
+    // const pathDef = context.route.pathDef;
+    const recordId = params.record_id;
+    var paths = getHistoryPaths() || [];
+    let lastPath = paths && paths[paths.length - 1];
+    if (recordId) {
+        //判断当前路由与记录的路由是否相同，为解决从设计器微页面返回重复记录的问题#4978
+        var top0 = null;
+        if(lastPath && lastPath.path && lastPath.path.split){
+            top0 = lastPath.path.split('?')[0]
+        }
+        if(path.split('?')[0] != top0){
+            // 触发广播事件前，把当前path和params累加存入amis变量historyPaths中
+            pushHistoryPath(path, params);
+        } 
+    }
+    else {
+        clearHistoryFilters(context, lastPath, paths);
+        // 触发广播事件前重置amis变量historyPaths值为空数组，并把当前path和params存入amis变量historyPaths中
+        resetHistoryPath(path, params);
+    }
+    triggerBroadcastHistoryPathsChanged(buttonTriggerHistoryPathsChange);
+}, 200));

package/main/default/objectTranslations/tabs.en/tabs.en.objectTranslation.yml

@@ -61,3 +61,5 @@ fields:
 listviews:
   all:
     label: All Tabs
+  customize:
+    label: Customize

package/main/default/objectTranslations/tabs.zh-CN/tabs.zh-CN.objectTranslation.yml

@@ -58,6 +58,10 @@ fields:
     label: 在新窗口打开
     help: 
     description:
+  is_use_iframe:
+    label: 使用iframe打开
 listviews:
   all:
     label: 所有
+  customize:
+    label: 自定义

package/main/default/objects/apps/buttons/amis_nav_schema_design.button.js

@@ -2,30 +2,30 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-04-11 14:05:42
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-04-11 14:08:41
+ * @LastEditTime: 2023-10-09 15:44:47
  * @Description: 
  */
 module.exports = {
-    amis_nav_schema_design: function (object_name, record_id) {
-      document.location = Steedos.absoluteUrl(`/api/amisAppNavSchemaDesign?id=${record_id}&object=${this.record.object_name}&assetUrls=${Builder.settings.assetUrls}&locale=${Builder.settings.locale}`);
-    },
-    amis_nav_schema_designVisible: function (object_name, record_id, record_permissions) {
-        var perms= {};
-        var record = Creator.getObjectRecord(object_name, record_id);
-        if(!record){
-          return false;
-        }
-        if(!record.enable_nav_schema){
-          return false;
-        }
-        if (record_permissions) {
-          perms = record_permissions;
-        } else {
-            record_permissions = Creator.getRecordPermissions(object_name, record, Meteor.userId());
-            if (record_permissions) {
-                perms = record_permissions;
-            }
-        }
-        return perms["allowEdit"];
+  amis_nav_schema_design: function (object_name, record_id) {
+    document.location = Steedos.absoluteUrl(`/api/amisAppNavSchemaDesign?id=${record_id}&object=${this.record.object_name}&assetUrls=${Builder.settings.assetUrls}&locale=${Builder.settings.locale}`);
+  },
+  amis_nav_schema_designVisible: function (object_name, record_id, record_permissions, data) {
+    var perms = {};
+    var record = data.record;
+    if (!record) {
+      return false;
     }
-  }
+    if (!record.enable_nav_schema) {
+      return false;
+    }
+    if (record_permissions) {
+      perms = record_permissions;
+    } else {
+      record_permissions = Creator.getRecordPermissions(object_name, record, Meteor.userId());
+      if (record_permissions) {
+        perms = record_permissions;
+      }
+    }
+    return perms["allowEdit"];
+  }
+}

package/main/default/objects/apps.action.js

@@ -1,8 +1,8 @@
 /*
  * @Author: baozhoutao@hotoa.com
  * @Date: 2021-12-27 10:49:33
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-06-16 12:04:04
+ * @LastEditors: 廖大雪 2291335922@qq.com
+ * @LastEditTime: 2023-03-05 18:11:32
  * @Description: 
  */
 module.exports = {
@@ -13,7 +13,6 @@ module.exports = {
         delete newRecord._id;
         delete newRecord.record_permissions;
         newRecord.from_code_id = record_id;
-        newRecord.tabs = doc.tabs;
         Creator.odata.insert(object_name, newRecord, function(result, error){
             if(result){
                 FlowRouter.go(`/app/-/${object_name}/view/${result._id}`)

package/main/default/objects/tabs.object.yml

@@ -80,6 +80,10 @@ fields:
   is_new_window:
     type: boolean
     visible_on: "{{'url' === formData.type ? true: false}}"
+  is_use_iframe:
+    type: boolean
+    label: Open with iframe
+    defaultValue: false
   page:
     type: lookup
     label: 页面
@@ -105,7 +109,20 @@ fields:
     disabled: true
 list_views:
   all:
-    label: All Apps
+    label: All Tabs
+    filter_scope: space
+    columns:
+      - label
+      - name
+      # - parent
+      - desktop
+      - mobile
+      - type
+      - is_system
+  customize:
+    label: 自定义
+    filters:
+      - ["is_system","<>",true]
     filter_scope: space
     columns:
       - label

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

@@ -0,0 +1,256 @@
+{
+    "type": "page",
+    "title": "Welcome to Steedos",
+    "body": [
+        {
+            "type": "tabs",
+            "id": "u:688bc8415b59",
+            "tabs": [
+                {
+                    "title": "对象",
+                    "body": [
+                        {
+                            "type": "steedos-object-listview",
+                            "label": "列表视图",
+                            "objectApiName": "objects",
+                            "listName": "customize",
+                            "showHeader": true,
+                            "className": "sm:border sm:shadow sm:rounded sm:border-gray-300 mb-4",
+                            "id": "u:6f86e8fc0bac"
+                        }
+                    ],
+                    "id": "u:1f46ff0c18e9"
+                },
+                {
+                    "title": "字段",
+                    "body": [
+                        {
+                            "type": "steedos-object-listview",
+                            "label": "列表视图",
+                            "objectApiName": "object_fields",
+                            "listName": "customize",
+                            "showHeader": true,
+                            "className": "sm:border sm:shadow sm:rounded sm:border-gray-300 mb-4",
+                            "id": "u:3ce7bf1fb9fc"
+                        }
+                    ],
+                    "id": "u:a7903575040d"
+                },
+                {
+                    "title": "列表视图",
+                    "body": [
+                        {
+                            "type": "steedos-object-listview",
+                            "label": "列表视图",
+                            "objectApiName": "object_listviews",
+                            "listName": "customize",
+                            "showHeader": true,
+                            "className": "sm:border sm:shadow sm:rounded sm:border-gray-300 mb-4",
+                            "id": "u:65e97e052474",
+                            "formFactor": "LARGE"
+                        }
+                    ],
+                    "id": "u:59b92e6a3fd2"
+                },
+                {
+                    "title": "操作按钮",
+                    "body": [
+                        {
+                            "type": "steedos-object-listview",
+                            "label": "列表视图",
+                            "objectApiName": "object_actions",
+                            "listName": "customize",
+                            "showHeader": true,
+                            "className": "sm:border sm:shadow sm:rounded sm:border-gray-300 mb-4",
+                            "id": "u:65e97e052474",
+                            "formFactor": "LARGE"
+                        }
+                    ],
+                    "id": "u:936ab602e2a9"
+                },
+                {
+                    "title": "页面布局",
+                    "body": [
+                        {
+                            "type": "steedos-object-listview",
+                            "label": "列表视图",
+                            "objectApiName": "object_layouts",
+                            "listName": "customize",
+                            "showHeader": true,
+                            "className": "sm:border sm:shadow sm:rounded sm:border-gray-300 mb-4",
+                            "id": "u:65e97e052474",
+                            "formFactor": "LARGE",
+                            "crud": {
+                                "footerToolbar": [],
+                                "id": "u:8cf8bde10dcb"
+                            }
+                        }
+                    ],
+                    "id": "u:3729aa71eccf"
+                },
+                {
+                    "title": "对象权限",
+                    "body": [
+                        {
+                            "type": "steedos-object-listview",
+                            "label": "列表视图",
+                            "objectApiName": "permission_objects",
+                            "listName": "customize",
+                            "showHeader": true,
+                            "className": "sm:border sm:shadow sm:rounded sm:border-gray-300 mb-4",
+                            "id": "u:65e97e052474",
+                            "formFactor": "LARGE"
+                        }
+                    ],
+                    "id": "u:5b798c6b51b3"
+                },
+                {
+                    "title": "触发器",
+                    "body": [
+                        {
+                            "type": "steedos-object-listview",
+                            "label": "列表视图",
+                            "objectApiName": "object_triggers",
+                            "listName": "customize",
+                            "showHeader": true,
+                            "className": "sm:border sm:shadow sm:rounded sm:border-gray-300 mb-4",
+                            "id": "u:65e97e052474",
+                            "formFactor": "LARGE"
+                        }
+                    ],
+                    "id": "u:23536bfbc790"
+                },
+                {
+                    "title": "流程映射",
+                    "body": [
+                        {
+                            "type": "steedos-object-listview",
+                            "label": "列表视图",
+                            "objectApiName": "object_workflows",
+                            "listName": "customize",
+                            "showHeader": true,
+                            "className": "sm:border sm:shadow sm:rounded sm:border-gray-300 mb-4",
+                            "id": "u:65e97e052474",
+                            "formFactor": "LARGE",
+                            "crud": {
+                                "footerToolbar": []
+                            }
+                        }
+                    ],
+                    "id": "u:648cb5bbffac"
+                },
+                {
+                    "title": "验证规则",
+                    "body": [
+                        {
+                            "type": "steedos-object-listview",
+                            "label": "列表视图",
+                            "objectApiName": "object_validation_rules",
+                            "listName": "customize",
+                            "showHeader": true,
+                            "className": "sm:border sm:shadow sm:rounded sm:border-gray-300 mb-4",
+                            "id": "u:65e97e052474",
+                            "formFactor": "LARGE"
+                        }
+                    ],
+                    "id": "u:8a66c9a8a31a"
+                },
+                {
+                    "title": "限制规则",
+                    "body": [
+                        {
+                            "type": "steedos-object-listview",
+                            "label": "列表视图",
+                            "objectApiName": "restriction_rules",
+                            "listName": "customize",
+                            "showHeader": true,
+                            "className": "sm:border sm:shadow sm:rounded sm:border-gray-300 mb-4",
+                            "id": "u:65e97e052474",
+                            "formFactor": "LARGE"
+                        }
+                    ]
+                },
+                {
+                    "title": "共享规则",
+                    "body": [
+                        {
+                            "type": "steedos-object-listview",
+                            "label": "列表视图",
+                            "objectApiName": "share_rules",
+                            "listName": "customize",
+                            "showHeader": true,
+                            "className": "sm:border sm:shadow sm:rounded sm:border-gray-300 mb-4",
+                            "id": "u:65e97e052474",
+                            "formFactor": "LARGE"
+                        }
+                    ]
+                },
+                {
+                    "title": "选项卡",
+                    "body": [
+                        {
+                            "type": "steedos-object-listview",
+                            "id": "u:65e97e052474",
+                            "label": "列表视图",
+                            "objectApiName": "tabs",
+                            "listName": "customize",
+                            "showHeader": true,
+                            "className": "sm:border sm:shadow sm:rounded sm:border-gray-300 mb-4",
+                            "formFactor": "LARGE",
+                            "crud": {
+                                "footerToolbar": []
+                            }
+                        }
+                    ],
+                    "id": "u:32b59a9e8fd2"
+                },
+                {
+                    "title": "流程",
+                    "body": [
+                        {
+                            "type": "steedos-object-listview",
+                            "label": "列表视图",
+                            "objectApiName": "flows",
+                            "listName": "customize",
+                            "showHeader": true,
+                            "className": "sm:border sm:shadow sm:rounded sm:border-gray-300 mb-4",
+                            "formFactor": "LARGE",
+                            "id": "u:749d0595fbf8",
+                            "crud": {
+                                "footerToolbar": []
+                            }
+                        }
+                    ],
+                    "id": "u:785fa47d408e"
+                },
+                {
+                    "title": "微页面",
+                    "body": [
+                        {
+                            "type": "steedos-object-listview",
+                            "label": "列表视图",
+                            "objectApiName": "pages",
+                            "listName": "customize",
+                            "showHeader": true,
+                            "className": "sm:border sm:shadow sm:rounded sm:border-gray-300 mb-4",
+                            "id": "u:65e97e052474",
+                            "formFactor": "LARGE"
+                        }
+                    ],
+                    "id": "u:936ab602e2a9"
+                }
+            ],
+            "tabsMode": "vertical"
+        }
+    ],
+    "regions": [
+        "body"
+    ],
+    "data": {
+        "initialValues": {},
+        "appId": "builder",
+        "title": "",
+        "context": {}
+    },
+    "id": "u:dafae0b298ee"
+}

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

@@ -0,0 +1,8 @@
+name: metadata
+allow_anonymous: true
+is_active: true
+label: 元数据微页面
+pageAssignments: []
+render_engine: amis
+type: app
+widgets: []

package/main/default/routers/amis_app_nav_schema_design.router.js

@@ -11,12 +11,21 @@ const fs = require('fs');
 const _ = require('lodash');
 const path = require('path');
 const objectql = require('@steedos/objectql');
-
+const getPublicAssetUrls = function(assetUrls){
+    const values = _.map(_.split(assetUrls), (item)=>{
+        if(_.startsWith(item, '/')){
+            return Meteor.absoluteUrl(item) ;
+        }else{
+            return item;
+        }
+    })
+    return _.join(values, ',')
+}
 router.get('/api/amisAppNavSchemaDesign', core.requireAuthentication, async function (req, res) {
     try {
         res.set('Content-Type', 'text/html');
         const userSession = req.user;
-        let assetUrls = req.query.assetUrls;
+        let assetUrls = getPublicAssetUrls(req.query.assetUrls);
         const assetUrl = `assetUrl=${assetUrls.split(',').join("&assetUrl=")}&`;
         // const dataContext = {
         //     rootUrl: __meteor_runtime_config__.ROOT_URL,

package/main/default/routers/main_head.ejs

@@ -0,0 +1,155 @@
+(function(){
+    const loadJs = (url, callback)=>{
+        let scriptTag = document.createElement("script");
+        scriptTag.type = "text/javascript";
+        scriptTag.src = url;
+        scriptTag.async = false;
+        document.getElementsByTagName("head")[0].appendChild(scriptTag);
+        scriptTag.onload = function(script){
+            if(callback){
+                callback(script)
+            }
+        }
+    }
+
+    const loadCss = (url)=>{
+        let styleTag = document.createElement("link");
+        styleTag.setAttribute("rel", "stylesheet");
+        styleTag.setAttribute("type", "text/css");
+        styleTag.setAttribute("href", src);
+        document.getElementsByTagName("head")[0].appendChild(styleTag);
+    }
+
+    window.loadJs = loadJs;
+    window.loadCss = loadCss;
+
+
+    const STEEDOS_SENTRY_ENABLED = "<%=STEEDOS_SENTRY_ENABLED%>";
+    const NODE_ENV = "<%=NODE_ENV%>";
+    const STEEDOS_SENTRY_DSN = "<%=STEEDOS_SENTRY_DSN%>";
+    const ROOT_URL = "<%=ROOT_URL%>";
+    const STEEDOS_UNPKG_URL = "<%=STEEDOS_UNPKG_URL%>";
+    const STEEDOS_AMIS_URL = "<%=STEEDOS_AMIS_URL%>";
+    const STEEDOS_PUBLIC_SCRIPT_VCONSOLE = "<%=STEEDOS_PUBLIC_SCRIPT_VCONSOLE%>";
+    const STEEDOS_PUBLIC_SCRIPT_PLUGINS = "<%=STEEDOS_PUBLIC_SCRIPT_PLUGINS%>";
+    const STEEDOS_PUBLIC_STYLE_PLUGINS = "<%=STEEDOS_PUBLIC_STYLE_PLUGINS%>";
+    const STEEDOS_VERSION = "<%=STEEDOS_VERSION%>";
+    const STEEDOS_LOCALE = "<%=STEEDOS_LOCALE%>";
+    const STEEDOS_PUBLIC_PAGE_ASSETURLS = "<%=STEEDOS_PUBLIC_PAGE_ASSETURLS%>";
+    const STEEDOS_AMIS_VERSION= "<%=STEEDOS_AMIS_VERSION%>";
+
+    const platform = <%- JSON.stringify(platform) %>;
+
+    if (`${STEEDOS_SENTRY_ENABLED}` != 'false') {
+        loadJs(`${ROOT_URL}/sentry/sentry.min.js`, (script)=>{
+            const nodeEnv = NODE_ENV || 'development';
+            const DEFAULT_DSN_JS = {
+                'development': 'https://7c2b864b83bf4361a030a7df9d2ace0c@sentry.steedos.cn/7',
+                'production': 'https://8f3f63d02e8140718a6123b10d49ae2f@sentry.steedos.cn/6'
+            } 
+            var dsn = STEEDOS_SENTRY_DSN || DEFAULT_DSN_JS[nodeEnv];
+            Sentry.init({
+                dsn: dsn
+            });
+        });
+    };
+
+    loadJs(`${STEEDOS_UNPKG_URL}/lodash@4.17.21/lodash.min.js`, ()=>{
+        // window._ = window.lodash;
+        try {
+            if(platform.hostname){
+                if (!_.includes(platform.hostname.split(','), window.location.hostname)) {
+                    setTimeout(function(){
+                        const banners = document.getElementsByClassName("steedos-banners")[0];
+                        if(banners){
+                            banners.style.display = 'flex';
+                            banners.style.justifyContent = 'center';
+                        }
+                        console.error(`环境变量ROOT_URL中的hostname(${window.location.hostname})与许可证中设置的不一致，请确认。`)
+                    }, 3000)
+                }
+            }
+        } catch (error) {
+            console.error(error)
+        }
+
+    });
+    loadJs(`${STEEDOS_UNPKG_URL}/marked@4.0.17/marked.min.js`);
+    loadJs(`${STEEDOS_UNPKG_URL}/crypto-js@4.1.1/crypto-js.js`);
+
+    loadJs(`${STEEDOS_UNPKG_URL}/@steedos-builder/sdk@0.2.38/dist/index.umd.js`, ()=>{
+        window.Builder = BuilderSDK.Builder;
+        window.builder = BuilderSDK.builder;
+        window.builder.init('steedos');
+
+        let searchParams = new URLSearchParams(location.search);
+        if (searchParams.get('assetUrls')) {
+            sessionStorage.setItem('assetUrls', searchParams.get('assetUrls'))
+        }
+
+        let assetUrls = sessionStorage.getItem('assetUrls')? sessionStorage.getItem('assetUrls') : STEEDOS_PUBLIC_PAGE_ASSETURLS
+        if(typeof "assetUrls" == 'string'){
+            assetUrls = assetUrls.split(',');
+        }
+
+        const getBrowserLocale = function() {
+            var l, locale;
+            l = window.navigator.userLanguage || window.navigator.language || 'en';
+            if (l.indexOf("zh") >= 0) {
+                locale = "zh-cn";
+            } else {
+                locale = "en-us";
+            }
+            return locale;
+        };
+        
+        Builder.set({
+            nodeEnv: NODE_ENV, 
+            rootUrl: ROOT_URL, 
+            unpkgUrl: STEEDOS_UNPKG_URL,
+            steedosVersion: STEEDOS_VERSION,
+            assetUrls,
+            steedosAmisVersion: STEEDOS_AMIS_VERSION,
+            locale: STEEDOS_LOCALE || getBrowserLocale()
+        });
+    });
+
+    loadJs(`${STEEDOS_AMIS_URL}/sdk/sdk.js`, ()=>{
+        window.axios = amisRequire('axios');
+        window.moment = amisRequire('moment');
+        window.React = amisRequire('react');
+        window.ReactDOM = amisRequire('react-dom');  	
+        window.React17 = window.React;
+        window.ReactDOM17 = window.ReactDOM;
+    });
+
+    window.addEventListener('message', function (event) {
+        const { data } = event;
+        if (data.type === 'Builder.loaded') {
+            Builder.registerRemoteAssets(Builder.settings.assetUrls);
+        }
+    });
+
+    if (STEEDOS_PUBLIC_SCRIPT_VCONSOLE) {
+        loadJs(STEEDOS_PUBLIC_SCRIPT_VCONSOLE, ()=>{
+            window.vConsole = new window.VConsole();
+        });
+    }
+
+    if (STEEDOS_PUBLIC_SCRIPT_PLUGINS) {
+        STEEDOS_PUBLIC_SCRIPT_PLUGINS.split(',').forEach(function (src) {
+            loadJs(src)
+        })
+    }
+
+    if (STEEDOS_PUBLIC_STYLE_PLUGINS) {
+        STEEDOS_PUBLIC_STYLE_PLUGINS.split(',').forEach(function (src) {
+            loadCss(src)
+        })
+    }
+
+    if(ROOT_URL){
+        loadJs(`${ROOT_URL}/cordova.i18n.js`)
+    }
+
+})();

package/main/default/routers/main_head.router.js

@@ -0,0 +1,100 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-04-04 16:34:28
+ * @Description: 
+ */
+const express = require("express");
+const router = express.Router();
+const core = require('@steedos/core');
+const ejs = require('ejs');
+const fs = require('fs');
+const _ = require('lodash');
+const path = require('path');
+
+const getConfig = (key, platform)=>{
+    if(platform === 'cordova'){
+        if(key === 'STEEDOS_PUBLIC_PAGE_ASSETURLS'){
+            const values = _.map(_.split(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS), (item)=>{
+                if(_.startsWith(item, '/')){
+                    return Meteor.absoluteUrl(item) ;
+                }else{
+                    return item;
+                }
+            })
+            return _.join(values, ',')
+        }
+        let value = process.env[key];
+        //如果不是以http开头的，就是相对路径, 则加上ROOT_URL
+        if(_.startsWith(value, '/')){
+            return Meteor.absoluteUrl(value) ;
+        }
+        return value;
+    }else{
+        return process.env[key]
+    }
+}
+
+/**
+ * 虽然script 标签的 async = false; 可以解决js之间的依赖顺序问题, 但是它无法做到比 HTML 中其他非动态加载的 script 脚本更早执行
+ * 所以调整了meteor 内核加载 bundledJs、staticJs的方式 (creator/packages/boilerplate-generator)
+ */
+router.get('/main_head.js', async function (req, res) {
+    try {
+        const { platform } = req.query;
+        res.set('Content-Type', 'application/javascript; charset=UTF-8');
+        const filename = path.join(__dirname, 'main_head.ejs');
+        const data = {
+            ROOT_URL: platform === 'cordova' ? __meteor_runtime_config__.ROOT_URL : '',
+            STEEDOS_SENTRY_ENABLED: process.env.STEEDOS_SENTRY_ENABLED,
+            NODE_ENV: process.env.NODE_ENV,
+            STEEDOS_SENTRY_DSN: process.env.STEEDOS_SENTRY_DSN,
+            STEEDOS_UNPKG_URL: getConfig('STEEDOS_UNPKG_URL', platform),
+            STEEDOS_AMIS_URL: getConfig('STEEDOS_AMIS_URL', platform),
+            STEEDOS_PUBLIC_SCRIPT_VCONSOLE: getConfig('STEEDOS_PUBLIC_SCRIPT_VCONSOLE', platform),
+            STEEDOS_PUBLIC_SCRIPT_PLUGINS: getConfig('STEEDOS_PUBLIC_SCRIPT_PLUGINS', platform),
+            STEEDOS_PUBLIC_STYLE_PLUGINS: getConfig('STEEDOS_PUBLIC_STYLE_PLUGINS', platform),
+            STEEDOS_VERSION: process.env.STEEDOS_VERSION,
+            STEEDOS_LOCALE: "",
+            STEEDOS_PUBLIC_PAGE_ASSETURLS: getConfig("STEEDOS_PUBLIC_PAGE_ASSETURLS", platform),
+            STEEDOS_AMIS_VERSION: process.env.STEEDOS_AMIS_VERSION,
+            platform: __meteor_runtime_config__.PUBLIC_SETTINGS && __meteor_runtime_config__.PUBLIC_SETTINGS.platform || {}
+        }
+        const options = {}
+        ejs.renderFile(filename, data, options, function(err, str){
+            // str => Rendered HTML string
+            if(err){
+                res.send(err);
+            }else{
+                res.send(str);
+            }
+        });
+
+    } catch (error) {
+        res.status(500).send({ message: error.message });
+    }
+
+});
+
+
+
+router.get('/main_head.css', async function(req, res){
+    const { platform } = req.query;
+
+    res.set('Content-Type', 'text/css; charset=UTF-8');
+    
+    const STEEDOS_UNPKG_URL = getConfig('STEEDOS_UNPKG_URL', platform);
+    const STEEDOS_AMIS_URL = getConfig('STEEDOS_AMIS_URL', platform);
+    const ROOT_URL = platform === 'cordova' ? __meteor_runtime_config__.ROOT_URL : '';
+
+    res.send(`
+        @import url("${STEEDOS_UNPKG_URL}/@salesforce-ux/design-system@2.19.0/assets/styles/salesforce-lightning-design-system.min.css");
+        @import url("${STEEDOS_AMIS_URL}/lib/themes/antd.css");
+        @import url("${STEEDOS_AMIS_URL}/lib/helper.css");
+        @import url("${STEEDOS_AMIS_URL}/sdk/iconfont.css");
+        @import url("${STEEDOS_UNPKG_URL}/@fortawesome/fontawesome-free@6.2.0/css/all.min.css");
+        @import url("${ROOT_URL}/tailwind/tailwind-steedos.css");
+        @import url("${ROOT_URL}/amis/amis.css");
+    `); 
+})
+
+exports.default = router;

package/main/default/tabs/admin_flow_positions.tab.yml

@@ -0,0 +1,21 @@
+name: admin_flow_positions
+desktop: true
+icon: queue
+is_new_window: false
+label: 审批岗位成员
+mobile: true
+permissions:
+  - permission: 'on'
+    permission_set: admin
+  - permission: 'off'
+    permission_set: user
+  - permission: 'off'
+    permission_set: customer
+  - permission: 'off'
+    permission_set: supplier
+  - permission: 'off'
+    permission_set: organization_admin
+  - permission: 'off'
+    permission_set: workflow_admin
+type: object
+object: flow_positions

package/main/default/tabs/admin_flow_roles.tab.yml

@@ -2,7 +2,7 @@ name: admin_flow_roles
 desktop: true
 icon: queue
 is_new_window: false
-label: 岗位
+label: 审批岗位
 mobile: true
 permissions:
   - permission: 'on'

package/main/default/tabs/admin_metadata.tab.yml

@@ -0,0 +1,22 @@
+name: admin_metadata
+desktop: true
+icon: entity
+is_new_window: false
+is_use_iframe: false
+label: 元数据
+mobile: true
+page: metadata
+type: page
+permissions:
+  - permission: 'on'
+    permission_set: admin
+  - permission: 'off'
+    permission_set: user
+  - permission: 'off'
+    permission_set: customer
+  - permission: 'off'
+    permission_set: supplier
+  - permission: 'off'
+    permission_set: organization_admin
+  - permission: 'off'
+    permission_set: workflow_admin

package/main/default/tabs/admin_personal_information.tab.yml

@@ -0,0 +1,21 @@
+name: admin_personal_information
+desktop: true
+icon: user_role
+is_new_window: false
+label: 个人资料
+mobile: true
+permissions:
+  - permission: 'on'
+    permission_set: admin
+  - permission: 'on'
+    permission_set: user
+  - permission: 'off'
+    permission_set: customer
+  - permission: 'off'
+    permission_set: supplier
+  - permission: 'off'
+    permission_set: organization_admin
+  - permission: 'off'
+    permission_set: workflow_admin
+type: url
+url: /app/admin/space_users/view/${context.user.spaceUserId}

package/main/default/tabs/admin_workflow_notifications.tab.yml

@@ -2,7 +2,7 @@ name: admin_workflow_notifications
 desktop: true
 icon: quick_text
 is_new_window: false
-label: 工作流通知
+label: 消息提醒
 mobile: true
 permissions:
   - permission: 'on'

package/main/default/triggers/apps.trigger.js

@@ -1,8 +1,8 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-08-05 14:17:44
- * @LastEditors: 孙浩林 sunhaolin@steedos.com
- * @LastEditTime: 2023-07-22 11:09:28
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-10-09 15:46:06
  * @Description: 
  */
 const _ = require('underscore');
@@ -81,8 +81,10 @@ module.exports = {
         if(id && _.isEmpty(this.data.values)){
             let lng = await getLng(this.userId);
             let app = await objectql.getAppConfig(id);
-            i18n.translationApp(lng, app._id, app)
-            Object.assign(this.data.values, Object.assign({code: app._id}, clone(app), baseRecord))
+            if(app){
+                i18n.translationApp(lng, app._id, app)
+                Object.assign(this.data.values, Object.assign({code: app._id}, clone(app), baseRecord))
+            }
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-ui",
-    "version": "2.6.1-beta.7",
+    "version": "2.6.2-beta.2",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,5 +12,5 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "b12f271460ef3686face095e875aa38e8ddc4c7f"
+    "gitHead": "ddef9fbc34afc7b57c59a31e9ed4f56818dc4c31"
 }

package/package.service.js

@@ -1,8 +1,8 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-07-29 09:40:31
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2022-12-09 13:41:00
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-09-11 15:45:29
  * @Description: 
  */
 "use strict";
@@ -36,7 +36,30 @@ module.exports = {
 	 * Actions
 	 */
 	actions: {
-
+		getUsersName: {
+			rest: {
+				method: "POST",
+                fullPath: "/service/api/standard-ui/getUsersName"
+			},
+			async handler(ctx) {
+				const { userIds } = ctx.params;
+				if(!userIds || userIds.length == 0){
+					return []
+				}
+				//此查询不带权限, 使用userIds 获取用户姓名
+				return await ctx.broker.call(
+					'objectql.find',
+					{
+						objectName: 'space_users',
+						query: {
+							fields: ['_id', 'user', 'name', 'sort_no'],
+							filters: [["user", "in", userIds]],
+							sort: 'sort_no desc'
+						},
+					}
+				);
+			}
+		}
 	},
 
 	/**