@steedos/service-pages 2.2.11 → 2.2.14

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

@@ -1,11 +1,128 @@
-;(function() {
-    try {
-        var hm = document.createElement("script");
-        hm.src = "/requirejs/require.js";
-        var s = document.getElementsByTagName("script")[0]; 
-        s.parentNode.insertBefore(hm, s);
-      } catch (error) {
-        console.log(error);
-      }
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-03-28 09:44:02
+ * @Description: 
+ */
+; (function () {
+    // window.SteedosMonacoEnvironment = window.MonacoEnvironment = {
+    //     getWorkerUrl: function (moduleId, label) {
+    //         console.log(`getWorkerUrl===`, moduleId, label)
+    //         const urlPath = '/unpkg.com/monaco-editor/min/vs';
+    //         let filePath = '/base/worker/workerMain.js';
+    //         if (label === 'json') {
+    //             file = '/language/json/jsonWorker.js';
+    //         }
+    //         if (label === 'css') {
+    //             file = '/language/css/cssWorker.js';
+    //         }
+    //         if (label === 'html') {
+    //             file = '/language/html/htmlWorker.js';
+    //         }
+    //         if (label === 'typescript' || label === 'javascript') {
+    //             file = '/language/typescript/tsWorker.js';
+    //         }
+    //         return `${urlPath}${filePath}`;
+    //     }
+    // }
+    window.SteedosMonacoEnvironment = window.MonacoEnvironment = {
+        getWorkerUrl: function(workerId, label) {
+          return `data:text/javascript;charset=utf-8,${encodeURIComponent(`
+            self.MonacoEnvironment = {
+              baseUrl: '${window.location.origin}/unpkg.com/monaco-editor/min/'
+            };
+            importScripts('${window.location.origin}/unpkg.com/monaco-editor/min/vs/base/worker/workerMain.js');`
+          )}`;
+        }
+    };
+
+    
+
 })();
-Builder.set({rootUrl: __meteor_runtime_config__.ROOT_URL})
+
+function injectScript(src) {
+    return new Promise((resolve, reject) => {
+        const script = document.createElement('script');
+        script.src = src;
+        script.addEventListener('load', resolve);
+        script.addEventListener('error', e => reject(e.error));
+        document.head.appendChild(script);
+    });
+}
+
+injectScript('/unpkg.com/@steedos-builder/react/dist/builder-react.unpkg.js')
+    .then(() => {
+        console.log('Builder loaded!');
+        const BuilderSDK = BuilderReact;
+
+        window.BuilderReact = BuilderReact;
+        window.BuilderSDK = BuilderSDK;
+
+        window.Builder = BuilderReact.Builder;
+        window.BuilderComponent = BuilderReact.BuilderComponent;
+        window.builder = BuilderReact.builder;
+
+        Builder.set({rootUrl: __meteor_runtime_config__.ROOT_URL, unpkgUrl: Meteor.settings.public.unpkgUrl || 'https://npm.elemecdn.com'})
+        window['React'] = require('react'); 
+        window['ReactDOM'] = require('react-dom'); 
+        // window['lodash'] = require('lodash'); 
+
+        Builder.registerImportMap({
+            "lodash": '/js/requirejs/lodash',
+            "react": '/js/requirejs/react',
+            "react-dom": '/js/requirejs/react-dom',
+            "@steedos-builder/sdk": '/js/requirejs/builder-sdk',
+            "@steedos-builder/react": '/js/requirejs/builder-react',
+        })
+        Builder.require(['lodash',"react", "react-dom"])
+
+        Builder.requirejs.config(
+            { 
+              waitSeconds: 60,
+              baseUrl: '',
+              paths: { 
+                'vs': '/unpkg.com/monaco-editor/min/vs',
+                "vs/language/css/cssMode":"/unpkg.com/monaco-editor/min/vs/language/css/cssMode",
+                "vs/language/html/htmlMode":"/unpkg.com/monaco-editor/min/vs/language/html/htmlMode",
+                "vs/language/typescript/tsMode":"/unpkg.com/monaco-editor/min/vs/language/typescript/tsMode",
+                "vs/language/json/jsonMode":"/unpkg.com/monaco-editor/min/vs/language/json/jsonMode"
+              } 
+            }
+          );
+        Builder.requirejs(['vs/editor/editor.main'], () => {
+           return monaco = window['monaco'];
+        });
+
+        
+
+    }).catch(error => {
+        console.error(error);
+    });
+
+// import("https://unpkg.com/@steedos-builder/react@0.2.11/dist/builder-react.umd.js").then(function(BuilderReact) {
+
+//     console.log('Builder loaded!');
+//     const BuilderSDK = BuilderReact;
+    
+//     window.BuilderReact = BuilderReact;
+//     window.BuilderSDK = BuilderSDK;
+    
+//     window.Builder = BuilderReact.Builder;
+//     window.BuilderComponent = BuilderReact.BuilderComponent;
+//     window.builder = BuilderReact.builder;
+    
+//     Builder.set({rootUrl: __meteor_runtime_config__.ROOT_URL})
+//     window['React'] = require('react'); 
+//     window['ReactDOM'] = require('react-dom'); 
+//     // window['lodash'] = require('lodash'); 
+    
+//     Builder.registerImportMap({
+//         // "lodash": '/requirejs/lodash',
+//         "react": '/requirejs/react',
+//         "react-dom": '/requirejs/react-dom',
+//         "@steedos-builder/sdk": '/requirejs/builder-sdk',
+//         "@steedos-builder/react": '/requirejs/builder-react',
+//     })
+//     Builder.require(['lodash',"react", "react-dom"])
+    
+// });
+

package/main/default/objects/page_versions/fields/description.field.yml

@@ -0,0 +1,5 @@
+name: description
+label: 描述
+type: textarea
+is_wide: true
+sort_no: 480

package/main/default/objects/page_versions/fields/is_active.field.yml

@@ -1,4 +1,6 @@
 name: is_active
 label: 已发布
 sort_no: 130
-type: toggle
+readonly: true
+omit: true
+type: boolean

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

@@ -3,6 +3,7 @@ columns:
   - field: page
   - field: version
   - field: is_active
+  - field: description
   - field: created
   - field: modified
   - field: is_system

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

@@ -0,0 +1,25 @@
+module.exports = {
+    deploy: function (object_name, record_id) {
+        $(document.body).addClass('loading');
+        let url = `/service/api/page/deploy`;
+        let options = {
+            type: 'post',
+            async: true,
+            data: JSON.stringify({ pageId: record_id }),
+            success: function (data) {
+                toastr.success('页面已发布。');
+                SteedosUI.reloadRecord(object_name, record_id);
+                FlowRouter.reload();
+                $(document.body).removeClass('loading');
+            },
+            error: function (XMLHttpRequest, textStatus, errorThrown) {
+                toastr.error(t(XMLHttpRequest.responseJSON.error))
+                $(document.body).removeClass('loading');
+            }
+        };
+        Steedos.authRequest(url, options);
+    },
+    deployVisible: function () {
+        return true
+    }
+}

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

@@ -0,0 +1,5 @@
+name: deploy
+is_enable: true
+label: 发布
+'on': record_only
+visible: true

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

@@ -0,0 +1,30 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-03-29 19:19:01
+ * @Description: 
+ */
+module.exports = {
+    disable: function (object_name, record_id) {
+        $(document.body).addClass('loading');
+        let url = `/service/api/page/disable`;
+        let options = {
+            type: 'post',
+            async: true,
+            data: JSON.stringify({ pageId: record_id }),
+            success: function (data) {
+                toastr.success('页面已禁用。');
+                SteedosUI.reloadRecord(object_name, record_id);
+                FlowRouter.reload();
+                $(document.body).removeClass('loading');
+            },
+            error: function (XMLHttpRequest, textStatus, errorThrown) {
+                toastr.error(t(XMLHttpRequest.responseJSON.error))
+                $(document.body).removeClass('loading');
+            }
+        };
+        Steedos.authRequest(url, options);
+    },
+    disableVisible: function (object_name, record_id, permission, record) {
+        return record && record.is_active
+    }
+}

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

@@ -0,0 +1,5 @@
+name: disable
+is_enable: true
+label: 禁用
+'on': record_only
+visible: true

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

@@ -0,0 +1,30 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-03-29 19:19:01
+ * @Description: 
+ */
+module.exports = {
+    enable: function (object_name, record_id) {
+        $(document.body).addClass('loading');
+        let url = `/service/api/page/enable`;
+        let options = {
+            type: 'post',
+            async: true,
+            data: JSON.stringify({ pageId: record_id }),
+            success: function (data) {
+                toastr.success('页面已启用。');
+                SteedosUI.reloadRecord(object_name, record_id);
+                FlowRouter.reload();
+                $(document.body).removeClass('loading');
+            },
+            error: function (XMLHttpRequest, textStatus, errorThrown) {
+                toastr.error(t(XMLHttpRequest.responseJSON.error))
+                $(document.body).removeClass('loading');
+            }
+        };
+        Steedos.authRequest(url, options);
+    },
+    enableVisible: function (object_name, record_id, permission, record) {
+        return record && !record.is_active
+    }
+}

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

@@ -0,0 +1,5 @@
+name: enable
+is_enable: true
+label: 启用
+'on': record_only
+visible: true

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

@@ -0,0 +1,5 @@
+name: description
+label: 描述
+type: textarea
+is_wide: true
+sort_no: 480

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

@@ -1,5 +1,6 @@
 name: is_active
-label: 启用
+label: 状态
 sort_no: 130
 type: toggle
+defaultValue: true
 visible_on: "{{'redash' != formData.render_engine ? true: false}}"

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

@@ -1,6 +1,6 @@
 name: is_system
 type: boolean
-label: System
+label: 系统
 omit: true
 hidden: true
 disabled: true

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

@@ -1,7 +1,6 @@
 name: version
-label: version
-precision: 18
-scale: 0
-sort_no: 170
 type: number
-hidden: true
+label: 版本号
+scale: 0
+omit: true
+readonly: true

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

@@ -4,6 +4,8 @@ columns:
   - field: label
   - field: render_engine
   - field: type
+  - field: is_active
+  - field: version
   - field: is_system
     wrap: false
 filter_scope: space

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

@@ -2,8 +2,10 @@ name: recent
 columns:
   - field: name
   - field: label
-  - field: type
   - field: render_engine
+  - field: type
+  - field: is_active
+  - field: version
   - field: is_system
     wrap: false
 filter_scope: space

package/main/default/routes/design.html

@@ -15,8 +15,8 @@
         var pageId = params.get("pageId");
         // /pageVersion/:pageId/latest
 
-        axios.get(`/service/api/page/pageVersion/${params.get("pageId")}/latest/`).then(function (response) {
-            let schema = response.data.schema;
+        axios.get(`/service/api/page/pageVersion/${params.get("pageId")}/latest`).then(function (response) {
+            let schema = response.data?.schema;
             if (typeof schema === "string") {
                 schema = JSON.parse(schema)
             }
@@ -37,7 +37,7 @@
             if (data) {
                 if (data.type === 'builder.saveContent') {
                     axios.put(`/service/api/page/pageVersion/${params.get("pageId")}`, {
-                        schema: JSON.stringify(data.data.AmisSchema) //直接存储json格式会导致react form异常。
+                        schema: JSON.stringify(data.data.AmisSchema, null, 4) //直接存储json格式会导致react form异常。
                     }).then(function (response) {
                         window.postMessage(
                         {

package/main/default/services/page.service.js

@@ -28,20 +28,54 @@ module.exports = {
                 return await this.getMeSchema(type, app, objectApiName, recordId, pageId, formFactor, userSession);
             }
         },
-        // enablePageVersion:{
-        //     rest: {
-        //         method: "GET",
-        //         path: "/pageSchema/enable/:pageVersionId"
-        //     },
-        //     params: {
-        //         pageVersionId: { type: "any" }
-        //     },
-        //     async handler(ctx) {
-        //         const userSession = ctx.meta.user;
-        //         const { pageVersionId } = ctx.params;
-        //         return await this.enablePageVersion(pageVersionId, userSession);
-        //     }
-        // },
+        //发布最新版
+        deploy: {
+            rest: {
+                method: "POST",
+                path: "/deploy"
+            },
+            params: {
+                pageId: { type: 'string' }
+            },
+            handler: async function (ctx) {
+                const { pageId } = ctx.params;
+                const userSession = ctx.meta.user;
+                const lastVersion = await this.getLatestPageVersion(pageId);
+                return await objectql.getObject('page_versions').update(lastVersion._id, { is_active: true }, userSession);
+            }
+        },
+
+        // 启用Page
+        enable: {
+            rest: {
+                method: "POST",
+                path: "/enable"
+            },
+            params: {
+                pageId: { type: 'string' }
+            },
+            handler: async function (ctx) {
+                const { pageId } = ctx.params;
+                const userSession = ctx.meta.user;
+                return await objectql.getObject('pages').update(pageId, { is_active: true }, userSession)
+            }
+        },
+
+        // 禁用Page
+        disable: {
+            rest: {
+                method: "POST",
+                path: "/disable"
+            },
+            params: {
+                pageId: { type: 'string' }
+            },
+            handler: async function (ctx) {
+                const { pageId } = ctx.params;
+                const userSession = ctx.meta.user;
+                return await objectql.getObject('pages').update(pageId, { is_active: false }, userSession)
+            }
+        },
         getLatestPageVersion:{
             rest: {
                 method: "GET",
@@ -233,6 +267,8 @@ module.exports = {
                 const pageVersions = await objectql.getObject('page_versions').find({filters: filters, sort: 'version desc', top: 1});
                 if(pageVersions.length === 1){
                     return pageVersions[0]
+                }else{
+                    return {}
                 }
             }
         },

package/main/default/triggers/page_versions.enable.trigger.js

@@ -5,10 +5,11 @@ module.exports = {
     listenTo: 'page_versions',
     afterUpdate: async function(){
         const {id, doc, previousDoc} = this;
-        if(_.has(doc, 'is_archived') && doc.is_archived && previousDoc.is_archived != doc.is_archived ){
+        if(_.has(doc, 'is_active') && doc.is_active && previousDoc.is_active != doc.is_active ){
             const record = await objectql.getObject('page_versions').findOne(id)
             await objectql.getObject('pages').directUpdate(record.page, {
-                is_archived: true
+                is_active: true,
+                version: record.version,
             })
         }
     }

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

@@ -1,3 +1,8 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-03-28 09:44:02
+ * @Description: 
+ */
 const objectql = require('@steedos/objectql');
 const _ = require('underscore');
 
@@ -14,8 +19,5 @@ module.exports = {
                 throw new Error('禁止修改非最新版');
             }
         }
-        // if(_.has(doc, 'is_archived') && !doc.is_archived){
-            
-        // }
     }
 }

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

@@ -14,7 +14,7 @@ module.exports = {
             }
         }
         
-        if(_.has(doc, 'is_archived') && !doc.is_archived){
+        if(_.has(doc, 'is_active') && !doc.is_active){
             let type = null;
             if(_.has(doc, 'type')){
                 type = doc.type

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.2.11",
+  "version": "2.2.14",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -11,5 +11,5 @@
   "dependencies": {
     "@builder.io/react": "^1.1.50"
   },
-  "gitHead": "0eaf63bc2efddbc85f98eb5091c0545f3304ae9d"
+  "gitHead": "de074b6e2d790b7e63edd8cf2917664dd13bbade"
 }

package/public/js/requirejs/@steedos-builder/react.js

@@ -0,0 +1,8 @@
+/*
+ * @Author: steedos
+ * @Date: 2022-03-25 16:15:21
+ * @Description: 
+ */
+define(function () {
+  return BuilderReact
+});

package/public/js/requirejs/@steedos-builder/sdk.js

@@ -0,0 +1,8 @@
+/*
+ * @Author: steedos
+ * @Date: 2022-03-26 16:16:01
+ * @Description: 
+ */
+define(function () {
+  return BuilderSDK
+});

package/public/js/requirejs/builder-react.js

@@ -0,0 +1,4 @@
+define("@steedos-builder/react", [], function () {
+  //Do setup work here
+  return BuilderReact
+});

package/public/js/requirejs/builder-sdk.js

@@ -0,0 +1,3 @@
+define("@steedos-builder/sdk", [], function () {
+  return BuilderSDK
+});

package/public/js/requirejs/lodash.js

@@ -0,0 +1,3 @@
+define("lodash", [], function () {
+  return lodash
+});

package/public/js/requirejs/react-dom.js

@@ -0,0 +1,3 @@
+define("react-dom", [], function () {
+  return ReactDOM
+});

package/public/js/requirejs/react.js

@@ -0,0 +1,3 @@
+define("react", [], function () {
+  return React
+});