@steedos/service-pages 3.0.0-beta.9 → 3.0.0-beta.90

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/objectTranslations/pages.en/pages.en.objectTranslation.yml

@@ -105,4 +105,14 @@ actions:
   showDesign:
     label: Show Design
   viewPage:
-    label: View
+    label: View
+CustomLabels:
+  pages_action_disable_success: The page has been disabled.
+  pages_action_disable_failed: Operation failed
+  pages_action_enable_success: The page has been enabled.
+  pages_action_enable_failed: Operation failed
+  pages_action_resetSchema_dialog_title: Reset Page Schema
+  pages_action_resetSchema_dialog_content: After resetting the page, a new page version will be generated based on the latest object field configuration.
+  pages_action_resetSchema_success_message: Operation successful
+  pages_action_resetSchema_success_description: The page has been reset.
+  pages_action_resetSchema_failed_message: Operation failed

package/main/default/objectTranslations/pages.zh-CN/pages.zh-CN.objectTranslation.yml

@@ -106,3 +106,13 @@ actions:
     label: 设计器
   viewPage:
     label: 查看
+CustomLabels:
+  pages_action_disable_success: 页面已禁用。
+  pages_action_disable_failed: 操作失败
+  pages_action_enable_success: 页面已启用。
+  pages_action_enable_failed: 操作失败
+  pages_action_resetSchema_dialog_title: 重置页面
+  pages_action_resetSchema_dialog_content: 重置页面后,会根据最新的对象字段配置生成一个新的页面版本.
+  pages_action_resetSchema_success_message: 操作成功
+  pages_action_resetSchema_success_description: 页面已重置。
+  pages_action_resetSchema_failed_message: 操作失败

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/disable.button.yml

@@ -1,6 +1,48 @@
 name: disable
+amis_schema: |-
+  {
+      "type": "service",
+      "body": [
+          {
+              "type": "button",
+              "label": "${'CustomAction.pages.disable' | t}",
+              "id": "u:disable",
+              "visibleOn": "${is_active && !is_system}",
+              "actionType": "ajax",
+              "api": {
+                  "url": "${context.rootUrl}/service/api/page/disable",
+                  "method": "post",
+                  "requestAdaptor": "var recordId = context.recordId;\napi.data = {\n  pageId: recordId\n}",
+                  "adaptor": "",
+                  "messages": {
+                      "success": "${'CustomLabels.pages_action_disable_success' | t}",
+                      "failed": "${'CustomLabels.pages_action_disable_failed' | t}"
+                  }
+              },
+              "editorState": "default"
+          }
+      ],
+      "regions": [
+          "body"
+      ],
+      "data": {
+          "context": {},
+          "dataComponentId": "",
+          "record_id": "",
+          "record": {},
+          "permissions": {}
+      },
+      "bodyClassName": "p-0",
+      "dsType": "api",
+      "asideResizor": false,
+      "editorState": "default",
+      "pullRefresh": {
+          "disabled": true
+      }
+  }
 is_enable: true
 label: 禁用
 'on': record_only
+type: amis_button
 visible: true
 sort: 100

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

@@ -1,6 +1,48 @@
 name: enable
+amis_schema: |-
+  {
+      "type": "service",
+      "body": [
+          {
+              "type": "button",
+              "label": "${'CustomAction.pages.enable' | t}",
+              "id": "u:enable",
+              "visibleOn": "${!is_active && !record.is_system}",
+              "actionType": "ajax",
+              "api": {
+                  "url": "${context.rootUrl}/service/api/page/enable",
+                  "method": "post",
+                  "requestAdaptor": "var recordId = context.recordId;\napi.data = {\n  pageId: recordId\n}",
+                  "adaptor": "",
+                  "messages": {
+                      "success": "${'CustomLabels.pages_action_enable_success' | t}",
+                      "failed": "${'CustomLabels.pages_action_enable_failed' | t}"
+                  }
+              },
+              "editorState": "default"
+          }
+      ],
+      "regions": [
+          "body"
+      ],
+      "data": {
+          "context": {},
+          "dataComponentId": "",
+          "record_id": "",
+          "record": {},
+          "permissions": {}
+      },
+      "bodyClassName": "p-0",
+      "dsType": "api",
+      "asideResizor": false,
+      "editorState": "default",
+      "pullRefresh": {
+          "disabled": true
+      }
+  }
 is_enable: true
 label: 启用
 'on': record_only
+type: amis_button
 visible: true
 sort: 100

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

@@ -1,15 +1,15 @@
 /*
  * @Author: baozhoutaon@hotoa.com
  * @Date: 2022-03-29 20:33:44
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-05-27 18:08:21
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-08-26 13:58:13
  * @Description: 
  */
 module.exports = {
     resetSchema: function (object_name, record_id) {
         SteedosUI.Modal.confirm({
-            title: "重置页面", 
-            content: "重置页面后,会根据最新的对象字段配置生成一个新的页面版本.", 
+            title: t("CustomLabels.pages_action_resetSchema_dialog_title"), 
+            content: t("CustomLabels.pages_action_resetSchema_dialog_title"), 
             onOk: function(){
                 $(document.body).addClass('loading');
                 let url = `/service/api/page/resetDefaultSchema`;
@@ -19,8 +19,8 @@ module.exports = {
                     data: JSON.stringify({ pageId: record_id }),
                     success: function (data) {
                         SteedosUI.notification.success({
-                            message: '操作成功',
-                            description: `页面已重置.`,
+                            message: t("CustomLabels.pages_action_resetSchema_success_message"),
+                            description: t("CustomLabels.pages_action_resetSchema_success_description"),
                         });
                         SteedosUI.router.go({
                             type: 'new',
@@ -31,7 +31,7 @@ module.exports = {
                     },
                     error: function (XMLHttpRequest, textStatus, errorThrown) {
                         SteedosUI.notification.error({
-                            message: '操作失败',
+                            message: t("CustomLabels.pages_action_resetSchema_failed_message"),
                             description: t(XMLHttpRequest.responseJSON.error),
                         });
                         $(document.body).removeClass('loading');

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

@@ -1,19 +1,23 @@
+/*
+ * @Author: 殷亮辉 yinlianghui@hotoa.com
+ * @Date: 2025-07-07 16:57:38
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-08-25 11:24:10
+ */
 module.exports = {
     showDesign: function (object_name, record_id) {
         // Steedos.openWindow();
-        document.location = Steedos.absoluteUrl(`/api/pageDesign?pageId=${record_id}&assetUrls=${Builder.settings.assetUrls}&locale=${Builder.settings.locale}`);
+        var locale = Builder.settings.context?.user?.language || window.navigator.language;
+        if(locale === 'en' || locale.startsWith('en-')){
+            locale = 'en-us'
+        }
+        document.location = Steedos.absoluteUrl(`/api/pageDesign?pageId=${record_id}&assetUrls=${Builder.settings.assetUrls}&locale=${locale}`);
     },
     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/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/main/default/services/page.service.js

@@ -3,7 +3,9 @@ const metadataAPI = require('@steedos/metadata-api');
 const _ = require('lodash');
 // 使用变量,存储所有资产
 const ASSETS = {};
-const ENV_ASSETS = process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS.split(',')
+const ENV_ASSETS = process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS
+? process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS.split(",")
+: []
 module.exports = {
     name: "page",
     mixins: [],

package/main/default/triggers/api_name.js

@@ -1,12 +1,16 @@
 const objectql = require('@steedos/objectql');
 async function isSpaceUnique(spaceId, object_name, doc, name, _id){
-    const filters = [];
-    filters.push(['space', '=', spaceId])
-    filters.push(['name', '=', name || doc.name])
+    const query = {space: spaceId, name: name || doc.name};
     if(_id){
-        filters.push(['_id', '!=', _id])
+        query._id = {
+            '$ne': _id
+        }
     }
-    const count = await objectql.getObject(object_name).count({filters: filters})
+    const datasource = objectql.getDataSource('default');
+    const adapter = datasource.adapter
+    await adapter.connect()
+    const collection = adapter.collection(object_name);
+    const count = await collection.countDocuments(query)
     if(count > 0)
         return false
     return true

package/package.json

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

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

@@ -1,36 +0,0 @@
-/*
- * @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) {
-                SteedosUI.notification.success({
-                    message: '页面已禁用。'
-                });
-                SteedosUI.reloadRecord(object_name, record_id);
-                FlowRouter.reload();
-                $(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);
-    },
-    disableVisible: 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/enable.button.js

@@ -1,31 +0,0 @@
-/*
- * @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, data) {
-        var record = data && data.record;
-        return record && !record.is_active && !record.is_system
-    }
-}