@steedos/service-pages 3.0.0-beta.29 → 3.0.0-beta.32

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

@@ -322,12 +322,9 @@
         this.containerList = [];
         this.pageName = null;
         return this.autorun(function(computation) {
-        //   console.log('autorun=====>computation:', computation)
-            // Session.get("record_id");
           var container, e, lastData, ref, ref1, ref2, regions, schema, updateProps, updatePropsData;
           if(self.data.regions){
             regions = self.data.regions();
-            //   console.log('regions====>', regions, this.lastRegions);
               updateProps = true;
               if (regions.objectName !== ((ref = this.lastRegions) != null ? ref.objectName : void 0)) {
                 updateProps = false;

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

@@ -7,7 +7,6 @@
  */
 module.exports = {
     customPage: function (object_name, record_id) {
-        $(document.body).addClass('loading');
         let url = `/service/api/page/customPage`;
         let options = {
             type: 'post',
@@ -17,15 +16,13 @@ module.exports = {
                 SteedosUI.notification.success({
                     message: '页面已自定义。'
                 });
-                SteedosUI.router.go({}, "/app/" + Session.get("app_id") + "/" + object_name + "/view/" + data._id);
-                $(document.body).removeClass('loading');
+                navigate("/app/admin/pages/view/" + data._id)
             },
             error: function (XMLHttpRequest, textStatus, errorThrown) {
                 SteedosUI.notification.error({
                     message: '操作失败',
                     description: t(XMLHttpRequest.responseJSON.error),
                 });
-                $(document.body).removeClass('loading');
             }
         };
         Steedos.authRequest(url, options);

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

@@ -7,7 +7,6 @@
  */
 module.exports = {
     deploy: function (object_name, record_id) {
-        $(document.body).addClass('loading');
         let url = `/service/api/page/deploy`;
         let options = {
             type: 'post',
@@ -18,15 +17,13 @@ module.exports = {
                     message: '页面已发布。'
                 });
                 SteedosUI.reloadRecord(object_name, record_id);
-                FlowRouter.reload();
-                $(document.body).removeClass('loading');
+                window.location.reload();
             },
             error: function (XMLHttpRequest, textStatus, errorThrown) {
                 SteedosUI.notification.error({
                     message: '操作失败',
                     description: t(XMLHttpRequest.responseJSON.error),
                 });
-                $(document.body).removeClass('loading');
             }
         };
         Steedos.authRequest(url, options);

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

@@ -8,12 +8,6 @@ module.exports = {
         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/viewPage.button.js

@@ -16,7 +16,8 @@ module.exports = {
         }
     },
     viewPageVisible: function (object_name, record_id, permission, data) {
-        var record = data && data.record;
-        return record && record.type === 'app';
+        // var record = data && data.record;
+        // return record && record.type === 'app';
+        return false;
     }
 }

package/main/default/routes/page_design.ejs

@@ -142,13 +142,13 @@
 
             if (objectName && pageType === "record") {
               const record = await axios.get(
-                `${rootUrl}/api/v4/${objectName}?$orderby=modified&$top=1`,
+                `${rootUrl}/api/v1/${objectName}?$sort=modified&$top=1`,
                 {
                   withCredentials: true,
                   headers: { Authorization: `Bearer ${tenantId},${authToken}` },
                 }
               );
-              const value = record?.data?.value;
+              const value = record?.data?.items;
               if (value?.length > 0) {
                 schema.data.recordId = value[0]._id;
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "3.0.0-beta.29",
+  "version": "3.0.0-beta.32",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -8,7 +8,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9a9a8b8bbab234f5d6666ca88063d53ad0cd2c4f",
+  "gitHead": "fcff940305b05294cce7c852009c04a769ae0df7",
   "dependencies": {
     "clone": "^2.1.2",
     "ejs": "^3.1.8"