@steedos/standard-ui 2.5.12 → 2.5.13-beta.10

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

@@ -56,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
@@ -143,6 +140,9 @@ tab_items:
   admin_autonumber:
     group: advanced_settings
     index: 37
+  admin_queue_import:
+    group: advanced_settings
+    index: 38
   # admin_web_forms:
   #   group: 高级设置
   #   index: 38

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

@@ -2,19 +2,32 @@
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-05-16 17:00:38
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-08-24 16:25:28
+ * @LastEditTime: 2023-09-11 17:44:01
  */
 var buttonTriggerHistoryPathsChange;
 
 let historyPathsStoreKey = "history_paths";
 
 // 切换应用、对象、列表视图时清除本地存储中的过滤条件
-function clearHistoryFilters(context, lastPath) {
+function clearHistoryFilters(context, lastPath, paths) {
     const path = context.path;
     const params = context.params || {};
     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 + "/crud";
         }
         else {
@@ -229,7 +242,7 @@ FlowRouter.triggers.enter(debounce(function (context, redirect, stop) {
         } 
     }
     else {
-        clearHistoryFilters(context, lastPath);
+        clearHistoryFilters(context, lastPath, paths);
         // 触发广播事件前重置amis变量historyPaths值为空数组，并把当前path和params存入amis变量historyPaths中
         resetHistoryPath(path, params);
     }

package/main/default/routers/main_head.ejs

@@ -0,0 +1,148 @@
+(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: STEEDOS_SENTRY_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(){
+                        document.getElementsByClassName("steedos-banners")[0].style.display = 'flex';
+                        document.getElementsByClassName("steedos-banners")[0].style.justifyContent = 'center';
+                        console.error(`环境变量ROOT_URL中的hostname(${window.location.hostname})与许可证中设置的不一致，请确认。`)
+                    }, 1000)
+                }
+            }
+        } 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)
+        })
+    }
+
+})();

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

@@ -0,0 +1,90 @@
+/*
+ * @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'){
+        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: process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS,
+            STEEDOS_AMIS_VERSION: process.env.STEEDOS_AMIS_VERSION,
+            platform: __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/package.json

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

package/package.service.js

@@ -1,8 +1,8 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-07-29 09:40:31
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-08-19 19:56:00
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-09-11 15:45:29
  * @Description: 
  */
 "use strict";
@@ -52,8 +52,9 @@ module.exports = {
 					{
 						objectName: 'space_users',
 						query: {
-							fields: ['_id', 'user', 'name'],
-							filters: [["user", "in", userIds]]
+							fields: ['_id', 'user', 'name', 'sort_no'],
+							filters: [["user", "in", userIds]],
+							sort: 'sort_no desc'
 						},
 					}
 				);