@steedos/service-pages 2.4.0-beta.9 → 2.4.1

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

@@ -24,7 +24,8 @@ module.exports = {
         };
         Steedos.authRequest(url, options);
     },
-    enableVisible: function (object_name, record_id, permission, record) {
+    enableVisible: function (object_name, record_id, permission, data) {
+        var record = data && data.record;
         return record && !record.is_active && !record.is_system
     }
 }

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

@@ -41,7 +41,8 @@ module.exports = {
             }
         });
     },
-    resetSchemaVisible: function (object_name, record_id, permission, record) {
+    resetSchemaVisible: function (object_name, record_id, permission, data) {
+        var record = data && data.record;
         return record && !record.is_system && record.type === 'form';
     }
 }

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

@@ -1,7 +1,7 @@
 module.exports = {
     showDesign: function (object_name, record_id) {
         // Steedos.openWindow();
-        document.location = Steedos.absoluteUrl(`/api/pageDesign?pageId=${record_id}`);
+        document.location = Steedos.absoluteUrl(`/api/pageDesign?pageId=${record_id}&assetUrls=${Builder.settings.assetUrls}`);
     },
     showDesignVisible: function (object_name, record_id, record_permissions) {
         var perms, record;

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

@@ -4,9 +4,9 @@ type: lookup
 sort_no: 135
 reference_to: objects
 reference_to_field: name
-optionsFunction: !!js/function |
-  function () {
-    return Steedos.getObjectsOptions()
+filtersFunction: !!js/function |
+  function(filters, values){
+    return ['name', '!=', 'cfs_instances_filerecord']
   }
 filterable: true
 required: "{{'record' == formData.type || 'list' == formData.type || 'form' == formData.type ? true: false}}"

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

@@ -5,7 +5,7 @@ defaultValue: amis
 options:
   - label: Amis
     value: amis
-  - label: Redash
-    value: redash
+  # - label: Redash
+  #   value: redash
 required: true
 sort_no: 125

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

@@ -15,19 +15,8 @@ router.get('/api/pageDesign', core.requireAuthentication, async function (req, r
     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=")}&`;
-        }
+        let assetUrls = req.query.assetUrls;
+        const assetUrl = `assetUrl=${assetUrls.split(',').join("&assetUrl=")}&`;
 
         // const dataContext = {
         //     rootUrl: __meteor_runtime_config__.ROOT_URL,
@@ -38,7 +27,7 @@ router.get('/api/pageDesign', core.requireAuthentication, async function (req, r
         const page = await objectql.broker.call(`page.getLatestPageVersion`, {pageId: req.query.pageId});
         const retUrl = __meteor_runtime_config__.ROOT_URL + '/app/admin/pages/view/' + req.query.pageId
         const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn';
-        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}&retUrl=${retUrl}&pageType=${page.type}`;
+        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}retUrl=${retUrl}&pageType=${page.type}`;
 
         // let data = fs.readFileSync(__dirname+'/design.html', 'utf8');
         // res.send(data.replace('SteedosBuilderHost',steedosBuilderHost).replace('DataContext', JSON.stringify(dataContext)));

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

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-23 10:02:16
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-05-28 11:15:32
+ * @LastEditTime: 2023-02-06 10:50:08
  * @Description: 
  */
 const auth = require('@steedos/auth');
@@ -24,6 +24,22 @@ module.exports = {
             }
         });
 
+        // 默认添加 全组织 全设备授权
+        if(page.type != 'app'){
+            await objectql.getObject('page_assignments').insert({
+                type: "orgDefault",
+                page: id,
+                desktop: true,
+                mobile: true,
+                space: page.space,
+                owner: page.owner,
+                created_by: page.created_by,
+                modified_by: page.modified_by,
+                company_id: page.company_id,
+                company_ids: page.company_ids
+            })
+        }
+
         // const actions = broker.registry.getActionList({
         //     onlyLocal: false
         // });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.4.0-beta.9",
+  "version": "2.4.1",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -8,7 +8,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7f75a50d8d5ac875eb577d586981ba654a5180ff",
+  "gitHead": "ae77c1ed63399245141bf7237cd3966bfc4dc6b1",
   "dependencies": {
     "ejs": "^3.1.8"
   }

package/public/js/requirejs/@steedos/filters.js

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

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

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

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

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

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

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

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

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

package/public/js/requirejs/filters.js

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

package/public/js/requirejs/lodash.js

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

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

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

package/public/js/requirejs/react.js

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