@steedos/service-pages 2.2.43 → 2.2.46

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

@@ -12,7 +12,7 @@ admin_menus:
     permission_sets:
       - admin
   - _id: pages
-    name: 页面
+    name: 微页面
     object_name: pages
     parent: user_interface
     sort: 300

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

@@ -425,7 +425,12 @@
                 if(objectApiName === 'space_users' && fieldName === 'company_ids'){
                     spaceUsersCompanyIdsExpand = ',name,admins'
                 }
-                const refObject = Creator.getObject(objectFields[fieldName].reference_to)
+                let referenceTo = objectFields[fieldName].reference_to;
+                const refObject = Creator.getObject(referenceTo)
+                if(!refObject){
+                    console.error(`未找到对象“${referenceTo}”，请检查是否该对象依赖的软件包未安装。`);
+                    return;
+                }
                 if(_.includes(fieldsName, fieldName)){
                     fieldsName[_.indexOf(fieldsName, fieldName)] = `${fieldName}:${fieldName}__expand{_id, _NAME_FIELD_VALUE:${refObject.NAME_FIELD_KEY}${spaceUsersCompanyIdsExpand}}`
                 }else{

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

@@ -0,0 +1,36 @@
+/*
+ * @Author: baozhoutaon@hotoa.com
+ * @Date: 2022-03-29 20:33:44
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2022-06-15 17:40:53
+ * @Description: 
+ */
+module.exports = {
+    customPage: function (object_name, record_id) {
+        $(document.body).addClass('loading');
+        let url = `/service/api/page/customPage`;
+        let options = {
+            type: 'post',
+            async: true,
+            data: JSON.stringify({ pageId: record_id }),
+            success: function (data) {
+                SteedosUI.notification.success({
+                    message: '页面已自定义。'
+                });
+                SteedosUI.router.go({}, "/app/" + Session.get("app_id") + "/" + object_name + "/view/" + data._id);
+                $(document.body).removeClass('loading');
+            },
+            error: function (XMLHttpRequest, textStatus, errorThrown) {
+                SteedosUI.notification.error({
+                    message: '操作失败',
+                    description: t(XMLHttpRequest.responseJSON.error),
+                });
+                $(document.body).removeClass('loading');
+            }
+        };
+        Steedos.authRequest(url, options);
+    },
+    customPageVisible: function (object_name, record_id, permission, record) {
+        return record && record.is_system;
+    }
+}

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

@@ -0,0 +1,6 @@
+name: customPage
+is_enable: true
+label: 自定义
+'on': record_only
+visible: true
+sort: 200

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

@@ -1,8 +1,8 @@
 name: label
 index: true
 label: 名称
-required: false
+required: true
 searchable: true
 sort_no: 120
-is_name: false
+is_name: true
 type: text

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

@@ -1,7 +1,7 @@
 name: all
 columns:
-  - field: name
   - field: label
+  - field: name
   - field: render_engine
   - field: type
   - field: is_active

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

@@ -1,7 +1,7 @@
 name: recent
 columns:
-  - field: name
   - field: label
+  - field: name
   - field: render_engine
   - field: type
   - field: is_active

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

@@ -16,7 +16,7 @@ enable_workflow: false
 hidden: true
 icon: contract
 is_enable: true
-label: 页面
+label: 微页面
 version: 2
 form:
  afterView: !!js/function |

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

@@ -9,14 +9,24 @@ const core = require('@steedos/core');
 const ejs = require('ejs');
 const fs = require('fs');
 const _ = require('lodash');
+const path = require('path');
+
 router.get('/api/pageDesign', core.requireAuthentication, async function (req, res) {
     try {
         res.set('Content-Type', 'text/html');
         const userSession = req.user;
         let assetUrl = "";
+        let assetUrls = null;
         if(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS && _.isString(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)){
             assetUrls = process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS.split(',');
             assetUrl = `assetUrl=${assetUrls.join("&assetUrl=")}&`;
+        }else{
+            var fullPath = path.resolve(path.dirname(require.resolve('@steedos-ui/builder-widgets' + '/package.json')));
+            var packageFile = path.join(fullPath,'package.json');
+            var pkg = require(packageFile);
+            moduleVersion = pkg.version;
+            assetUrls = [`https://unpkg.com/@steedos-ui/builder-widgets@${moduleVersion}/dist/assets.json`];
+            assetUrl = `assetUrl=${assetUrls.join("&assetUrl=")}&`;
         }
 
         // const dataContext = {

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

@@ -1,5 +1,5 @@
 const objectql = require('@steedos/objectql');
-
+const metadataAPI = require('@steedos/metadata-api');
 const _ = require('lodash');
 
 module.exports = {
@@ -151,7 +151,57 @@ module.exports = {
 
                 return {}
             }
-        }
+        },
+        customPage: {
+            rest: {
+                method: "POST",
+                path: "/customPage"
+            },
+            params: {
+                pageId: { type: 'string' }
+            },
+            handler: async function (ctx) {
+                const userSession = ctx.meta.user;
+                if(!userSession.is_space_admin){
+                    throw new Error('Permission denied')
+                }
+                const { pageId } = ctx.params;
+                const page = await objectql.getObject('pages').findOne(pageId);
+                const records = await objectql.getObject('pages').find({filters: [['name', '=', page.name]]});
+                const dbManager = new metadataAPI.DbManager(userSession);
+                let result = {};
+                if(records && records.length > 0 && records[0]._id != pageId){
+                    result = {_id: records[0]._id}
+                    return result
+                }
+                try {
+                    await dbManager.connect();
+                    var session = await dbManager.startSession();
+                    const transactionOptions = {
+                        readPreference: 'primary',
+                        readConcern: { level: 'majority' },
+                        writeConcern: { w: 'majority' }
+                    };
+                    try {
+                        await session.withTransaction(async () => {
+                            const pageCollection = new metadataAPI.PageCollection();
+                            delete page.is_system
+                            delete page.record_permissions
+                            const info = await pageCollection.save(dbManager, page);
+                            result._id = info.insertedId;
+                        }, transactionOptions);
+                    } catch(err) {
+                        throw err
+                    }
+                }catch (err) {
+                    throw new Error(err.message)  // 重新整理错误信息,否则会导致 service-api 无法处理错误信息导致接口挂起.
+                }finally{
+                    await dbManager.endSession();
+                    await dbManager.close();
+                }
+                return result;
+            }
+        } 
     },
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.2.43",
+  "version": "2.2.46",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -8,8 +8,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "dependencies": {
-    "@builder.io/react": "^1.1.50"
-  },
-  "gitHead": "4aa9568edad23cdef05ebbee5299c17904a76dde"
+  "gitHead": "480163256639fa1db7fdfcd321afafc288b09095"
 }