@steedos/standard-ui 3.0.0-beta.159 → 3.0.0-beta.162

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

@@ -9,23 +9,12 @@ const auth = require('@steedos/auth');
 const ejs = require('ejs');
 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', auth.requireAuthentication, async function (req, res) {
     try {
         res.set('Content-Type', 'text/html');
         const userSession = req.user;
-        let assetUrls = getPublicAssetUrls(req.query.assetUrls);
+        let assetUrls = req.query.assetUrls;
         const assetUrl = `assetUrl=${assetUrls.split(',').join("&assetUrl=")}&`;
         // const dataContext = {
         //     rootUrl: process.env.ROOT_URL,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-ui",
-    "version": "3.0.0-beta.159",
+    "version": "3.0.0-beta.162",
     "main": "package.service.js",
     "publishConfig": {
         "access": "public"
@@ -11,7 +11,7 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "02bef4f635aa783ea421dbab0ece4a96421d6357",
+    "gitHead": "824214cba3a8290604d98fb43ca1dc900abf3dd3",
     "dependencies": {
         "clone": "^2.1.2"
     }

package/main/default/routers/main_head.ejs

@@ -1,160 +0,0 @@
-(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", url);
-        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 STEEDOS_PUBLIC_USE_OPEN_API= <%=(STEEDOS_PUBLIC_USE_OPEN_API === "true" || STEEDOS_PUBLIC_USE_OPEN_API === true)%>;
-
-    const platform = <%- JSON.stringify(platform) %>;
-
-    if (`${STEEDOS_SENTRY_ENABLED}` == 'true') {
-        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@1.0.0/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(),
-            useOpenAPI: STEEDOS_PUBLIC_USE_OPEN_API
-        });
-    });
-
-    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.AmisCore = amisRequire("amis-core")
-        window.AmisUI = amisRequire("amis-ui");
-        window.Amis = amisRequire('amis');
-    });
-
-    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

@@ -1,101 +0,0 @@
-/*
- * @Author: baozhoutao@steedos.com
- * @Date: 2022-04-04 16:34:28
- * @Description: 
- */
-const express = require("express");
-const router = express.Router();
-const auth = require('@steedos/auth');
-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' ? process.env.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 || {},
-            STEEDOS_PUBLIC_USE_OPEN_API: process.env.STEEDOS_PUBLIC_USE_OPEN_API
-        }
-        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' ? process.env.ROOT_URL : '';
-
-    res.send(`
-        @import url("${STEEDOS_UNPKG_URL}/@salesforce-ux/design-system@2.22.2/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;