@steedos/service-ui 2.6.1-beta.7 → 2.6.2-beta.2

package/main/default/client/cordova.push.client.js

@@ -0,0 +1,112 @@
+if (Meteor.isCordova) {
+  Meteor.startup(function () {
+    const hasRegister = function () {
+      let has = false;
+      if (Push.push.handlers.notification && Push.push.handlers.notification.length > 0) {
+        Push.push.handlers.notification.forEach(function (handler) {
+          if (handler.toString().indexOf('push.setApplicationIconBadgeNumber') > 0) {
+            has = true
+          }
+        })
+      }
+      return has;
+    }
+    document.addEventListener("deviceready", function () {
+      return window.setTimeout(function () {
+        var ref, ref1;
+
+        if (hasRegister() == true) {
+          return;
+        }
+        console.log('app注册push失败, 由client js注册push')
+        Push.push.on("notification", function (data) {
+          var host, path;
+          if (data.additionalData.foreground === true) {
+            if (data.count > -1) {
+              push.setApplicationIconBadgeNumber(
+                function () { },
+                function () { },
+                data.count
+              );
+            }
+            return;
+          }
+          if (typeof data.additionalData.ejson === "string") {
+            data.additionalData.ejson = JSON.parse(data.additionalData.ejson);
+          }
+          host = data.additionalData.ejson.host;
+          if (host == null) {
+            return;
+          }
+          host = host.replace(/\/$/, "");
+          if (Servers.serverExists(host) !== true) {
+            return;
+          }
+          window.AUTOLOAD = false;
+          if (data.additionalData.ejson.url) {
+            return FlowRouter.go(data.additionalData.ejson.url);
+          } else {
+            path = "";
+            if (
+              data.additionalData.ejson.space &&
+              data.additionalData.ejson.instance
+            ) {
+              path =
+                "workflow/space/" +
+                data.additionalData.ejson.space +
+                "/inbox/" +
+                data.additionalData.ejson.instance;
+            }
+            navigator.splashscreen.hide();
+            if (window.Session && window.Session.get("spaceId")) {
+              return FlowRouter.go("/" + path);
+            } else {
+              return Servers.startServer(host, path, function (err, url) {
+                if (err != null) {
+                  return console.log(err);
+                }
+              });
+            }
+          }
+        });
+        if (
+          ((ref = device.manufacturer) != null ? ref.toLowerCase() : void 0) ===
+          "huawei" &&
+          cordova.plugins.huaweipush
+        ) {
+          cordova.plugins.huaweipush.init();
+          return document.addEventListener(
+            "huaweipush.receiveRegisterResult",
+            function (event) {
+              var registrationId;
+              console.log(event);
+              registrationId = "huawei:" + event.token;
+              Push.push.emit("registration", {
+                registrationId: registrationId,
+              });
+            }.bind(this),
+            false
+          );
+        } else if (
+          ((ref1 = device.manufacturer) != null ? ref1.toLowerCase() : void 0) ===
+          "xiaomi" &&
+          window.plugins.MiPushPlugin
+        ) {
+          window.plugins.MiPushPlugin.init();
+          return document.addEventListener(
+            "mipush.receiveRegisterResult",
+            function (data) {
+              var registrationId;
+              console.log(data);
+              registrationId = "mi:" + data.regId;
+              Push.push.emit("registration", {
+                registrationId: registrationId,
+              });
+            },
+            false
+          );
+        }
+      }, 1000);
+    });
+  })
+}

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

@@ -64,7 +64,7 @@ router.get('/service/api/:objectServiceName/uiSchema', core.requireAuthenticatio
             const objectName = objectServiceName.substring(1);
             const [result, hasImportTemplates] = yield Promise.all([
                 callObjectServiceAction(`objectql.getRecordView`, userSession, { objectName }),
-                callObjectServiceAction(`~packages-@steedos/data-import.hasImportTemplates`, userSession, {
+                callObjectServiceAction(`@steedos/data-import.hasImportTemplates`, userSession, {
                     objectName: objectName
                 })
             ]);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/service-ui",
-    "version": "2.6.1-beta.7",
+    "version": "2.6.2-beta.2",
     "main": "package.service.js",
     "keywords": [
         "steedos"
@@ -11,9 +11,9 @@
     "description": "steedos package",
     "repository": {},
     "dependencies": {
-        "@steedos/core": "2.6.1-beta.7",
-        "@steedos/i18n": "2.6.1-beta.7",
-        "@steedos/objectql": "2.6.1-beta.7",
+        "@steedos/core": "2.6.2-beta.2",
+        "@steedos/i18n": "2.6.2-beta.2",
+        "@steedos/objectql": "2.6.2-beta.2",
         "express": "4.18.1"
     },
     "license": "MIT",
@@ -21,5 +21,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "b12f271460ef3686face095e875aa38e8ddc4c7f"
+    "gitHead": "ddef9fbc34afc7b57c59a31e9ed4f56818dc4c31"
 }

package/package.service.js

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-06-11 18:09:20
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-06-06 10:19:04
+ * @LastEditTime: 2022-06-15 18:08:40
  * @Description: 
  */
 "use strict";
@@ -65,7 +65,7 @@ module.exports = {
 	 * Service started lifecycle event handler
 	 */
 	async started() {
-		this.broker.broadcastLocal('service-ui.started', { name: this.name })
+
 	},
 
 	/**

package/public/cordova.i18n.js

@@ -0,0 +1,28 @@
+window._languages = {};
+axios.get("/shared/i18n/en.i18n.json").then(function(result){
+  window._languages['en'] = result.data;
+  if(!window.languages){
+    var sId = setInterval(function(){
+      if(window.languages){
+        window.languages['en'] = result.data;
+        clearInterval(sId)
+      }
+    }, 10)
+  }else{
+    window.languages['en'] = result.data;
+  }
+})
+
+axios.get("/shared/i18n/zh.i18n.json").then(function(result){
+  window._languages['zh'] = result.data;
+  if(!window.languages){
+    var sId = setInterval(function(){
+      if(window.languages){
+        window.languages['zh'] = result.data;
+        clearInterval(sId)
+      }
+    }, 10)
+  }else{
+    window.languages['zh'] = result.data;
+  }
+})

package/public/steedos-init.js

@@ -2,46 +2,10 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-02-26 15:22:12
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-06-06 16:55:36
+ * @LastEditTime: 2023-04-27 13:22:22
  * @Description:
  */
 try {
-
-  function _innerWaitForThing(obj, path, func){
-    const timeGap = 100;
-    return new Promise((resolve, reject) => {
-    setTimeout(() => {
-        let thing = null;
-        if(lodash.isFunction(func)){
-            thing = func(obj, path);
-        }else{
-            thing = lodash.get(obj, path);
-        }
-        // console.log(`_innerWaitForThing`, path)
-        if (thing) {
-            return resolve(thing);
-        }
-        reject();
-    }, timeGap);
-    }).catch(() => {
-        return _innerWaitForThing(obj, path, func);
-    });
-  }
-
-  window.waitForThing=(obj, path, func)=>{
-      let thing = null;
-      if(lodash.isFunction(func)){
-          thing = func(obj, path);
-      }else{
-          thing = lodash.get(obj, path);
-      }
-      if (thing) {
-          return Promise.resolve(thing);
-      }
-      return _innerWaitForThing(obj, path, func);
-  };
-
-
   Steedos.authRequest = function (url, options) {
     var userSession = Creator.USER_CONTEXT;
     var spaceId = userSession.spaceId;

package/src/routes/objects.router.ts

@@ -1,8 +1,8 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-06-09 10:19:47
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2023-03-28 20:59:08
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2023-11-14 11:11:06
  * @Description: 
  */
 import { getSteedosSchema } from "@steedos/objectql";
@@ -63,7 +63,7 @@ router.get('/service/api/:objectServiceName/uiSchema', core.requireAuthenticatio
         const objectName = objectServiceName.substring(1);
         const [ result, hasImportTemplates ] = await Promise.all([
             callObjectServiceAction(`objectql.getRecordView`, userSession, { objectName }),
-            callObjectServiceAction(`~packages-@steedos/data-import.hasImportTemplates`, userSession, {
+            callObjectServiceAction(`@steedos/data-import.hasImportTemplates`, userSession, {
                 objectName: objectName
             })
         ])