@steedos/service-pages 2.1.90 → 2.2.3

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

@@ -6,13 +6,25 @@ admin_menus:
   #   sort: 450
   #   permission_sets:
   #     - admin
+  - _id: user_interface
+    name: 用户页面
+    sort: 350
+    permission_sets:
+      - admin
   - _id: pages
     name: 页面
     object_name: pages
-    parent: analysis
+    parent: user_interface
     sort: 300
     permission_sets:
       - admin
+  - _id: tabs
+    name: Tabs
+    object_name: tabs
+    parent: user_interface
+    sort: 500
+    permission_sets:
+      - admin
   # - _id: word_templates
   #   name: Word Templates
   #   permission_sets:

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

@@ -0,0 +1,47 @@
+; (function () {
+    try {
+        let amisStyle = document.createElement("link");
+        amisStyle.setAttribute("rel", "stylesheet");
+        amisStyle.setAttribute("type", "text/css");
+        amisStyle.setAttribute("href", "/amis/amis.css");
+        document.getElementsByTagName("head")[0].appendChild(amisStyle);
+    } catch (error) {
+        console.error(error)
+    }
+    import('/amis/sdk/sdk.js').then(() => {
+        //处理mobx多个实例问题
+        try {
+            let mobx = amisRequire('mobx');
+            mobx.configure({ isolateGlobalState: true })
+        } catch (error) {
+
+        }
+
+        var __importDefault = (this && this.__importDefault) || function (mod) {
+            return (mod && mod.__esModule) ? mod : { "default": mod };
+        };
+        var react_1 = __importDefault(require("react"));
+        // Register amis render 
+        var Amis = function (props) {
+            var schema = props.schema, data = props.data;
+            return react_1.default.createElement(react_1.default.Fragment, null,
+                react_1.default.createElement("div", { id: "amis-root" }),
+                // amisRequire('amis').render(schema, data),
+                function () {
+                    setTimeout(function () {
+                        amisRequire('amis/embed').embed('#amis-root', schema, data)
+                    }, 100)
+                }()
+            );
+
+        };
+
+        BuilderReact.Builder.registerComponent(Amis, {
+            name: 'Amis',
+            inputs: [
+                { name: 'schema', type: 'object' },
+                { name: 'data', type: 'object' }
+            ]
+        })
+    });
+})();

package/main/default/client/builder.client.js

@@ -0,0 +1,5 @@
+;(function() {
+    import("/builder.io/react/dist/builder-react.browser.js").then(()=>{
+        BuilderReact.builder.init("builder-token");
+    });
+})();

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

@@ -0,0 +1,52 @@
+Steedos.Pages = {};
+
+function upperFirst(str) {
+	return str.toLowerCase().replace(/( |^)[a-z]/g, (L) => L.toUpperCase());
+};
+
+Steedos.Pages.Render = function (pageName) {
+    if(!pageName){
+        return ;
+    }
+    var rootId = "steedosPageRoot";
+    var modalRoot = document.getElementById(rootId);
+    // if(modalRoot){
+    //     modalRoot.remove();
+    // }
+    if (!modalRoot) {
+        modalRoot = document.createElement('div');
+        modalRoot.setAttribute('id', rootId);
+        $(".page-template-root")[0].appendChild(modalRoot);
+    }
+
+    const pages = Creator.odata.query("pages", {$filter:`(name eq '${pageName}')`}, true);
+    if(pages.length > 0){
+        const page = pages[0];
+        if(page.render_engine && page.render_engine != 'redash'){
+            return SteedosUI.render(BuilderReact.BuilderComponent, {model:"page",content:{
+                "data":{
+                   "blocks":[
+                      {
+                         "@type":"@builder.io/sdk:Element",
+                         "@version":2,
+                         "id":"builder-2b290abc4e4042498645863f53ee6815",
+                         "component":{
+                            "name": upperFirst(page.render_engine), //_.upperFirst
+                            "options":{
+                               "schema": typeof page.schema === 'string' ? JSON.parse(page.schema) : page.schema
+                            }
+                         },
+                      }
+                   ],
+                   "inputs":[
+                      
+                   ]
+                }
+             }}, $("#" + rootId)[0]);
+        }
+    }
+
+    SteedosUI.render(stores.ComponentRegistry.components.PublicPage, {
+        token: pageName
+    }, $("#" + rootId)[0]);
+};

package/main/default/objects/pages/buttons/showDesign.button.js

@@ -0,0 +1,19 @@
+module.exports = {
+    showDesign: function (object_name, record_id) {
+        Steedos.openWindow(Steedos.absoluteUrl(`/api/pageDesign?pageId=${record_id}`));
+    },
+    showDesignVisible: function (object_name, record_id, record_permissions) {
+        var perms, record;
+        perms = {};
+        if (record_permissions) {
+            perms = record_permissions;
+        } else {
+            record = Creator.getObjectRecord(object_name, record_id);
+            record_permissions = Creator.getRecordPermissions(object_name, record, Meteor.userId());
+            if (record_permissions) {
+                perms = record_permissions;
+            }
+        }
+        return perms["allowEdit"];
+    }
+}

package/main/default/objects/pages/buttons/showDesign.button.yml

@@ -0,0 +1,5 @@
+name: showDesign
+is_enable: true
+label: 设计器
+'on': record_only
+visible: true

package/main/default/objects/pages/fields/is_default.field.yml

@@ -0,0 +1,5 @@
+name: is_default
+type: toggle
+label: 默认
+sort_no: 200
+hidden: true

package/main/default/objects/pages/fields/object_name.field.yml

@@ -0,0 +1,13 @@
+name: object_name
+label: 对象
+type: lookup
+sort_no: 135
+reference_to: objects
+reference_to_field: name
+optionsFunction: !!js/function |
+  function () {
+    return Steedos.getObjectsOptions()
+  }
+filterable: true
+required: "{{'record' == formData.type && 'list' == formData.type && 'form' == formData.type ? true: false}}"
+visible_on: "{{'record' == formData.type && 'list' == formData.type && 'form' == formData.type ? true: false}}"

package/main/default/objects/pages/fields/render_engine.field.yml

@@ -0,0 +1,11 @@
+name: render_engine
+type: select
+label: 渲染器
+defaultValue: amis
+options:
+  - label: Amis
+    value: amis
+  - label: Redash
+    value: redash
+required: true
+sort_no: 125

package/main/default/objects/pages/fields/schema.field.yml

@@ -0,0 +1,7 @@
+name: schema
+type: code
+language: json
+is_wide: true
+sort_no: 300
+omit: true
+hidden: true

package/main/default/objects/pages/fields/type.field.yml

@@ -0,0 +1,16 @@
+name: type
+label: 类型
+type: select
+defaultValue: app
+required: true
+options:
+  - label: 自定义页面 
+    value: app
+  - label: 记录详细
+    value: record
+  - label: 自定义列表
+    value: list
+  - label: 新建、编辑页面
+    value: form
+sort_no: 130
+visible_on: "{{'redash' != formData.render_engine ? true: false}}"

package/main/default/objects/pages/listviews/all.listview.yml

@@ -2,6 +2,7 @@ name: all
 columns:
   - field: name
   - field: label
+  - field: type
   - field: is_system
     wrap: false
 filter_scope: space

package/main/default/objects/pages/listviews/recent.listview.yml

@@ -2,6 +2,7 @@ name: recent
 columns:
   - field: name
   - field: label
+  - field: type
   - field: is_system
     wrap: false
 filter_scope: space

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

@@ -21,7 +21,7 @@ version: 2
 form:
  afterView: !!js/function |
       function(){
-        if(this.doc.name){
+        if(this.doc.name && (this.doc.render_engine === 'redash' || !this.doc.render_engine)){
           SteedosUI.render(stores.ComponentRegistry.components.Page, { pageId: this.doc.name }, $(".slds-template__container")[0])
         }
       }

package/main/default/routes/design.html

@@ -0,0 +1,63 @@
+<html>
+
+<head>
+    <script src="https://builder.steedos.com/js/axios/axios.min.js"></script>
+    <script src="https://builder.steedos.com/js/builder-fiddle/builder-fiddle.umd.js"></script>
+</head>
+
+<body>
+
+    <builder-fiddle host="https://builder.steedos.com/amis"></builder-fiddle>
+
+    <script>
+        let comp = document.querySelector('builder-fiddle')
+        var params = new URLSearchParams(location.search);
+        var pageId = params.get("pageId");
+        axios.get("/api/v4/pages/" + params.get("pageId")).then(function (response) {
+            let schema = response.data.schema;
+            if (typeof schema === "string") {
+                schema = JSON.parse(schema)
+            }
+            const data = {
+                AmisSchema: schema || {}
+            };
+            console.log("record data", data)
+            comp.data = data;
+        }).catch(function (error) {
+            // handle error
+            console.log(error);
+        }).then(function () {
+            // always executed
+        });
+
+        const onWindowMessage = function (event) {
+            const { data } = event;
+            if (data) {
+                if (data.type === 'builder.saveContent') {
+                    axios.put("/api/v4/pages/" + params.get("pageId"), {
+                        schema: JSON.stringify(data.data.AmisSchema) //直接存储json格式会导致react form异常。
+                    }).then(function (response) {
+                        window.postMessage(
+                        {
+                            type: 'builder.contentSaved',
+                        },
+                        '*'
+                        );
+                    }).catch(function (error) {
+                        // handle error
+                        console.log(error);
+                    }).then(function () {
+                        // always executed
+                    })
+                }
+            }
+        }
+
+        window.addEventListener('message', onWindowMessage);
+
+
+
+    </script>
+</body>
+
+</html>

package/main/default/routes/page_design.router.js

@@ -0,0 +1,13 @@
+const express = require("express");
+const router = express.Router();
+
+router.get('/api/pageDesign', async function (req, res) {
+    try {
+        res.set('Content-Type', 'text/html');
+        res.sendFile(__dirname+'/design.html') 
+    } catch (error) {
+        res.status(500).send({ message: error.message });
+    }
+
+});
+exports.default = router;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.1.90",
+  "version": "2.2.3",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -8,5 +8,8 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e8c455a1554306a51ebe4980624ba9d84300c07d"
+  "dependencies": {
+    "@builder.io/react": "^1.1.50"
+  },
+  "gitHead": "57dfca5cd66528b2fbe6878f73f2e84b915d5e32"
 }

package/package.service.js

@@ -4,6 +4,8 @@ const packageName = project.name;
 const packageLoader = require('@steedos/service-package-loader');
 const objectql = require('@steedos/objectql');
 const _ = require(`lodash`);
+const express = require('express');
+const path = require('path');
 
 const getCharts = async(apiName)=>{
 	const charts = await objectql.getObject('charts').find({ filters: [['name', '=', apiName]] });
@@ -35,7 +37,8 @@ module.exports = {
 			path: __dirname,
 			name: this.name,
 			isPackage: false
-		}
+		},
+		initBuilderRouter: false
 	},
 
 	/**
@@ -144,14 +147,37 @@ module.exports = {
 	 * Events
 	 */
 	events: {
-
+		'steedos-server.started': async function (ctx) {
+			this.initBuilderRouter();
+		}
 	},
 
 	/**
 	 * Methods
 	 */
 	methods: {
-
+		initBuilderRouter: {
+			handler() {
+				if (this.settings.initBuilderRouter) {
+					return;
+				}
+				this.settings.initBuilderRouter = true;
+				try {
+					const router = express.Router();
+					let publicPath = path.join(__dirname, 'public');
+					let routerPath = "";
+					if (__meteor_runtime_config__.ROOT_URL_PATH_PREFIX) {
+						routerPath = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
+					}
+					const cacheTime = 86400000 * 1; // one day
+					router.use(routerPath, express.static(publicPath, { maxAge: cacheTime }));
+					WebApp.rawConnectHandlers.use(router);
+				} catch (error) {
+					console.error(error)
+					this.settings.initBuilderRouter = false;
+				}
+			}
+		},
 	},
 
 	/**
@@ -165,7 +191,7 @@ module.exports = {
 	 * Service started lifecycle event handler
 	 */
 	async started() {
-
+		this.initBuilderRouter();
 	},
 
 	/**

package/public/amis/amis.css

@@ -0,0 +1,29 @@
+@import '/amis/sdk/sdk.css';
+
+
+/* .amis-routes-wrapper{
+    width: 100%;
+} */
+
+.amis-scope{
+    background: none;
+}
+
+.amis-scope svg {
+    display: inline !important;
+    vertical-align: initial !important;
+}
+
+/* .row-main{
+    border-radius: 0.25rem
+} */
+
+.amis-scope .a-Form-item--horizontal.col-span-2 .a-Form-itemColumn--2 {
+    flex: 0 0 calc(8.33333333335% - 2px);
+    max-width: calc(8.33333333335% - 2px);
+}
+
+.a-Table svg {
+    display: inline !important;
+    vertical-align: initial !important;
+}