@steedos/standard-ui 2.5.12-beta.9 → 2.5.12

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

@@ -159,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/history_paths.client.js

@@ -2,118 +2,12 @@
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-05-16 17:00:38
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-08-11 16:19:45
+ * @LastEditTime: 2023-08-24 16:25:28
  */
 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);
-    }
-    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
-        if(path.split('?')[0] != lastPath?.path?.split('?')[0]){
-            // 触发广播事件前，把当前path和params累加存入amis变量historyPaths中
-            pushHistoryPath(path, params);
-        } 
-    }
-    else {
-        clearHistoryFilters(context, lastPath);
-        // 触发广播事件前重置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);
-    }
-}
-
 // 切换应用、对象、列表视图时清除本地存储中的过滤条件
 function clearHistoryFilters(context, lastPath) {
     const path = context.path;
@@ -212,10 +106,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);
+        // 触发广播事件前重置amis变量historyPaths值为空数组，并把当前path和params存入amis变量historyPaths中
+        resetHistoryPath(path, params);
+    }
+    triggerBroadcastHistoryPathsChanged(buttonTriggerHistoryPathsChange);
+}, 200));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-ui",
-    "version": "2.5.12-beta.9",
+    "version": "2.5.12",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,5 +12,5 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "eed1149008c250335088c8e342d47c6fbde77ed5"
+    "gitHead": "cdf06aa70a7b55d8dae3fdd62bb24d8fe004b5c9"
 }

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: baozhoutao@steedos.com
+ * @LastEditTime: 2023-08-19 19:56:00
  * @Description: 
  */
 "use strict";
@@ -36,7 +36,29 @@ 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'],
+							filters: [["user", "in", userIds]]
+						},
+					}
+				);
+			}
+		}
 	},
 
 	/**