pome-ui 2.0.0-preview2 → 2.0.0-preview4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pome-ui",
-  "version": "2.0.0-preview2",
+  "version": "2.0.0-preview4",
   "description": "Front-end MVC library",
   "main": "pome-ui.js",
   "bin": {

package/pome-cache-query.js

@@ -40,7 +40,6 @@
         batchInterval: null,
         batchTimeout: 10
     };
-    _combineObject(window.CQOptions || {}, _options);
 
     var _batchRequests = [];
 
@@ -81,8 +80,6 @@
     var __cache = {};
     var __cacheDictionary = {};
     var __cacheExpire = {};
-    var __cacheFilters = {};
-    var __cacheSubscribe = {};
 
     function randomString(length, chars = null) {
         chars = chars || '1234567890qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM';
@@ -93,7 +90,7 @@
         return result;
     }
 
-    function SetOptions(options) {
+    function UseConfig(options) {
         _combineObject(options, _options);
     }
 
@@ -319,7 +316,7 @@
     exports.put = put;
     exports.patch = patch;
     exports.delete = _delete;
-    exports.setOptions = SetOptions;
+    exports.useConfig = UseConfig;
 
     return exports;
 

package/pome-cache-query.min.js

@@ -1 +1 @@
-(function(e){if(typeof e!="undefined"&&e.get){return e}function n(e,n){if(!e){return}var t=Object.getOwnPropertyNames(e);for(var r=0;r<t.length;++r){n[t[r]]=e[t[r]]}}var f={isPagedResult(e){if(e.totalRecords==undefined||e.totalPages===undefined||e.currentPage===undefined||e.pageSize===undefined)return false;else return true},beforeSend:function(e){},onError:function(e,n){return Promise.resolve(e)},onSucceeded:function(e,n){return Promise.resolve(e)},baseUrl:null,batch:null,batchInterval:null,batchTimeout:10};n(window.CQOptions||{},f);var t=[];var r=function(e){var n=[];for(var t=0;t<e.length;++t){n.push(e[t])}return n};if(f.batch){setInterval(function(){if(!t.length){return}f.batch(t,y,f);t=[]},f.batchInterval||50)}function o(e){var n=JSON.stringify(e);return JSON.parse(n)}function a(e){var n=[];if(!e||typeof e!=="object")return n;for(var t in e){if(e[t])n.push(t)}return n}var i={};var u={};var s={};var c={};var l={};function d(e,n=null){n=n||"1234567890qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM";var t="";for(var r=e;r>0;--r){t+=n[Math.floor(Math.random()*n.length)]}return t}function p(e){n(e,f)}function v(e,n=true,t=null){var r=Object.keys(e).sort();if(!r.length)return"";var o=n?"?":"";for(var a=0;a<r.length;a++){if(t){if(t.some(e=>e==r[a])){continue}}o+=r[a]+"="+encodeURI(e[r[a]])+"&"}return o.substr(0,o.length-1)}function g(e){e=e.substr(e.indexOf("?")+1);var n=e.split("&");var t={};for(var r=0;r<n.length;r++){var o=n[r].split("=");t[o[0]]=decodeURI(o[1])}return t}function h(e,n,t){var r=o(n);if(t&&r.page)delete r.page;return e+v(r)}function b(e){return f.isPagedResult(e)}function y(n){var t=new XMLHttpRequest;t.open(n.type,n.url);t.setRequestHeader("Content-Type",n.contentType);if(n.beforeSend){n.beforeSend(t)}if(typeof n.data!=="string"){if(n.contentType.toLocaleLowerCase()=="application/json"){n.data=JSON.stringify(n.data)}else if(n.contentType.toLocaleLowerCase()=="application/octet-stream"){}else{n.data=v(n.data,false)}}t.send(n.data);t.onreadystatechange=function(){if(t.readyState==4){var e=n.dataType=="json"?JSON.parse(t.responseText):t.responseText;if(t.status>=200&&t.status<300){n.success(e,t)}else{n.error(e,t)}}};return t}function m(e){if(e.indexOf("//")>=0){return e}else if(f.baseUrl){return f.baseUrl+e}else{return e}}function O(o,a,i,e,u){e=e||"json";u=u||"application/json";i=a=="GET"?null:i;o=m(o);if(!f.batch||e!="json"||u!="application/json"){var n=this;return new Promise(function(n,t){var r=y({url:o,type:a,dataType:e,contentType:u||"application/json",data:a=="GET"?null:i,success:function(e){f.onSucceeded(e,r).then(function(e){n(e)})},error:function(e){return f.onError(e,r).then(function(e){t(e)})},beforeSend:function(e){f.beforeSend(e)}})})}else{return new Promise(function(e,n){t.push({resolve:e,reject:n,request:{requestId:d(32),url:o,method:a,body:i?JSON.stringify(i):null,contentType:"application/json",timeout:f.batchTimeout}})})}}function T(e,n,t,r){var o=Object.getOwnPropertyNames(n||{});if(o.length){if(e.indexOf("?")>=0){e+="&"}else{e+="?"}}for(var a=0;a<o.length;++a){var i=o[a];e+=encodeURIComponent(i)+"="+encodeURIComponent(n[i]||"")+"&"}if(o.length){e=e.substr(0,e.length-1)}return O(e,"GET",n,t,r)}function j(e,n,t,r){return O(e,"POST",n,t,r)}function S(e,n,t,r){return O(e,"PATCH",n,t,r)}function w(e,n,t,r){return O(e,"PUT",n,t,r)}function P(e,n,t){var r=Object.getOwnPropertyNames(n||{});if(r.length){if(e.indexOf("?")>=0){e+="&"}else{e+="?"}}for(var o=0;o<r.length;++o){var a=r[o];e+=encodeURIComponent(a)+"="+encodeURIComponent(n[a]||"")+"&"}if(r.length){e=e.substr(0,e.length-1)}return O(e,"DELETE",n,t)}function R(e,n){var t=a(n);var r=h(e,n,t.some(e=>e==="page"));if(i[r]){delete i[r]}}function I(e,n,t,r){var o;if(!u[e])u[e]=[];var a=b(t);if(!a){o=h(e,n);i[o]=t}else{o=h(e,n,true);if(!i[o])i[o]={isPaged:true};i[o][t.data.current]=t}if(!u[e].some(e=>e==o))u[e].push(o);if(r)s[o]=(new Date).getTime()+r}e.generateQueryStringFromObject=v;e.generateObjectFromQueryString=g;e.xhrRequest=y;e.request=O;e.get=T;e.post=j;e.put=w;e.patch=S;e.delete=P;e.setOptions=p;return e})(typeof exports==="object"&&typeof module!=="undefined"?exports:function(){window.cq={};return window.cq}());
+(function(e){if(typeof e!="undefined"&&e.get){return e}function n(e,n){if(!e){return}var t=Object.getOwnPropertyNames(e);for(var r=0;r<t.length;++r){n[t[r]]=e[t[r]]}}var f={isPagedResult(e){if(e.totalRecords==undefined||e.totalPages===undefined||e.currentPage===undefined||e.pageSize===undefined)return false;else return true},beforeSend:function(e){},onError:function(e,n){return Promise.resolve(e)},onSucceeded:function(e,n){return Promise.resolve(e)},baseUrl:null,batch:null,batchInterval:null,batchTimeout:10};var t=[];var r=function(e){var n=[];for(var t=0;t<e.length;++t){n.push(e[t])}return n};if(f.batch){setInterval(function(){if(!t.length){return}f.batch(t,h,f);t=[]},f.batchInterval||50)}function o(e){var n=JSON.stringify(e);return JSON.parse(n)}function a(e){var n=[];if(!e||typeof e!=="object")return n;for(var t in e){if(e[t])n.push(t)}return n}var u={};var i={};var s={};function c(e,n=null){n=n||"1234567890qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM";var t="";for(var r=e;r>0;--r){t+=n[Math.floor(Math.random()*n.length)]}return t}function l(e){n(e,f)}function d(e,n=true,t=null){var r=Object.keys(e).sort();if(!r.length)return"";var o=n?"?":"";for(var a=0;a<r.length;a++){if(t){if(t.some(e=>e==r[a])){continue}}o+=r[a]+"="+encodeURI(e[r[a]])+"&"}return o.substr(0,o.length-1)}function p(e){e=e.substr(e.indexOf("?")+1);var n=e.split("&");var t={};for(var r=0;r<n.length;r++){var o=n[r].split("=");t[o[0]]=decodeURI(o[1])}return t}function v(e,n,t){var r=o(n);if(t&&r.page)delete r.page;return e+d(r)}function g(e){return f.isPagedResult(e)}function h(n){var t=new XMLHttpRequest;t.open(n.type,n.url);t.setRequestHeader("Content-Type",n.contentType);if(n.beforeSend){n.beforeSend(t)}if(typeof n.data!=="string"){if(n.contentType.toLocaleLowerCase()=="application/json"){n.data=JSON.stringify(n.data)}else if(n.contentType.toLocaleLowerCase()=="application/octet-stream"){}else{n.data=d(n.data,false)}}t.send(n.data);t.onreadystatechange=function(){if(t.readyState==4){var e=n.dataType=="json"?JSON.parse(t.responseText):t.responseText;if(t.status>=200&&t.status<300){n.success(e,t)}else{n.error(e,t)}}};return t}function b(e){if(e.indexOf("//")>=0){return e}else if(f.baseUrl){return f.baseUrl+e}else{return e}}function y(o,a,u,e,i){e=e||"json";i=i||"application/json";u=a=="GET"?null:u;o=b(o);if(!f.batch||e!="json"||i!="application/json"){var n=this;return new Promise(function(n,t){var r=h({url:o,type:a,dataType:e,contentType:i||"application/json",data:a=="GET"?null:u,success:function(e){f.onSucceeded(e,r).then(function(e){n(e)})},error:function(e){return f.onError(e,r).then(function(e){t(e)})},beforeSend:function(e){f.beforeSend(e)}})})}else{return new Promise(function(e,n){t.push({resolve:e,reject:n,request:{requestId:c(32),url:o,method:a,body:u?JSON.stringify(u):null,contentType:"application/json",timeout:f.batchTimeout}})})}}function m(e,n,t,r){var o=Object.getOwnPropertyNames(n||{});if(o.length){if(e.indexOf("?")>=0){e+="&"}else{e+="?"}}for(var a=0;a<o.length;++a){var u=o[a];e+=encodeURIComponent(u)+"="+encodeURIComponent(n[u]||"")+"&"}if(o.length){e=e.substr(0,e.length-1)}return y(e,"GET",n,t,r)}function T(e,n,t,r){return y(e,"POST",n,t,r)}function O(e,n,t,r){return y(e,"PATCH",n,t,r)}function j(e,n,t,r){return y(e,"PUT",n,t,r)}function S(e,n,t){var r=Object.getOwnPropertyNames(n||{});if(r.length){if(e.indexOf("?")>=0){e+="&"}else{e+="?"}}for(var o=0;o<r.length;++o){var a=r[o];e+=encodeURIComponent(a)+"="+encodeURIComponent(n[a]||"")+"&"}if(r.length){e=e.substr(0,e.length-1)}return y(e,"DELETE",n,t)}function P(e,n){var t=a(n);var r=v(e,n,t.some(e=>e==="page"));if(u[r]){delete u[r]}}function w(e,n,t,r){var o;if(!i[e])i[e]=[];var a=g(t);if(!a){o=v(e,n);u[o]=t}else{o=v(e,n,true);if(!u[o])u[o]={isPaged:true};u[o][t.data.current]=t}if(!i[e].some(e=>e==o))i[e].push(o);if(r)s[o]=(new Date).getTime()+r}e.generateQueryStringFromObject=d;e.generateObjectFromQueryString=p;e.xhrRequest=h;e.request=y;e.get=m;e.post=T;e.put=j;e.patch=O;e.delete=S;e.useConfig=l;return e})(typeof exports==="object"&&typeof module!=="undefined"?exports:function(){window.cq={};return window.cq}());

package/pome-ui.dev.js

@@ -4585,6 +4585,7 @@ var Vue = (function (exports) {
       $unmounted: i => i.$unmounted,
       $mounted: i => i.$mounted,
       $layout: i => i.$layout,
+      $app: i => i.$app,
       $view: i => i.$view
 
   });
@@ -15942,7 +15943,9 @@ var Vue = (function (exports) {
 // Copyright (c) Yuko(Yisheng) Zheng. All rights reserved.
 // Licensed under the GPL v3. See LICENSE in the project root for license information.
 
-function buildPomeloUI(options, exports) {
+window.Vue = Vue;
+
+function build(options, exports) {
     if (typeof exports == 'undefined') {
         exports = {};
     }
@@ -15957,6 +15960,17 @@ function buildPomeloUI(options, exports) {
         httpGet: function (url) {
             return fetch(url);
         },
+        httpGetSync: function (url) {
+            if (useRelativePath) {
+                if (url.length && url[0] == '/') {
+                    url = url.substr(1);
+                }
+            }
+            var xhr = new XMLHttpRequest();
+            xhr.open('get', url, false);
+            xhr.send();
+            return xhr.responseText;
+        },
         onNotFound: function (url, options) {
             if (url.indexOf('/404') == 0) {
                 throw 'No not-found template found';
@@ -15981,9 +15995,6 @@ function buildPomeloUI(options, exports) {
         },
         resetDataWhenReuseContainerActiveView(viewName) {
             return true;
-        },
-        getRoutePath() {
-            return '/shared/_routes.json';
         }
     };
 
@@ -16054,18 +16065,17 @@ function buildPomeloUI(options, exports) {
     function root() {
         return _root;
     };
-    window._rules = {};
-    // Fetch route rules
-    var _loadRoutePromise = _httpGet(_options.getRoutePath()).then(function (rules) {
-        var rules = JSON.parse(rules);
-        if (!window._rules) {
-            window._rules = {};
-        }
-        _combineObject(rules, window._rules);
-    }).catch(err => {
-        console.error('No route provided. Please prepare /shared/_routes.json file and try again.');
-    });
 
+    exports._rules = [];
+
+    function useRoutes(url) {
+        var rules = _options.httpGetSync(url);
+        rules = JSON.parse(rules);
+        if (!exports._rules) {
+            exports._rules = {};
+        }
+        _combineObject(rules, exports._rules);
+    }
 
     // Internal
     function _combineObject(src, dest) {
@@ -16173,6 +16183,7 @@ function buildPomeloUI(options, exports) {
                     instance.$parent = parent || exports.root();
                     instance.$root = exports.root() || parent;
                     instance.$view = url;
+                    instance.$app = exports;
                     instance.$data = component.data || function () { return {}; };
                     instance.$created = component.created || function () { };
                     instance.$mounted = component.mounted || function () { };
@@ -16185,7 +16196,7 @@ function buildPomeloUI(options, exports) {
                     return {};
                 };
                 component.data = function () {
-                    var data = originalDataFunc();
+                    var data = originalDataFunc.call(this, exports);
                     _combineObject(params, data);
                     _parseQueryString(data);
                     return data;
@@ -16391,6 +16402,7 @@ function buildPomeloUI(options, exports) {
             instance.$parent = parent || exports.root();
             instance.$root = exports.root() || parent;
             instance.$onUpdating = options.onUpdating;
+            instance.$app = exports;
             if (layout) {
                 instance.$layout = layout;
                 instance.$view = layout;
@@ -16447,22 +16459,19 @@ function buildPomeloUI(options, exports) {
             UpdateLayout();
         };
 
-        _loadRoutePromise.then(function () {
-            return UpdateLayout();
-        });
-
+        return UpdateLayout();
     }
 
-    function SetOptions(options) {
+    function UseConfig(options) {
         _combineObject(options, _options);
     }
 
-    function Route(rule, view) {
-        if (!window._rules) {
-            window._rules = {};
+    function MapRoute(rule, view) {
+        if (!exports._rules) {
+            exports._rules = {};
         }
 
-        window._rules[rule] = view;
+        exports._rules[rule] = view;
     }
 
     function ForceUpdate(proxy = exports.root()) {
@@ -16533,11 +16542,11 @@ function buildPomeloUI(options, exports) {
             return cnt;
         }
 
-        var keys = Object.getOwnPropertyNames(window._rules);
+        var keys = Object.getOwnPropertyNames(exports._rules);
         for (var i = 0; i < keys.length; ++i) {
             var rule = keys[i];
             var isHash = rule[0] == '#';
-            var view = window._rules[keys[i]];
+            var view = exports._rules[keys[i]];
             var matches = matchAll(rule);
             var params = [];
             var patterns = [];
@@ -16902,9 +16911,16 @@ function buildPomeloUI(options, exports) {
                             };
                         }
 
+                        var setupFunc = options.setup || function (props, context) { };
+                        options.setup = function (props, context) {
+                            setupFunc(props, context);
+                            var instance = Vue.getCurrentInstance();
+                            instance.$app = exports;
+                        }
+
                         var dataFunc = options.data;
                         options.data = function () {
-                            var data = dataFunc.call(this);
+                            var data = dataFunc.call(this, exports);
                             _combineObject(params, data);
                             _parseQueryString(data);
                             return data;
@@ -16978,7 +16994,7 @@ function buildPomeloUI(options, exports) {
                     }
                     var dataFunc = _opt.data;
                     _opt.data = function () {
-                        var data = dataFunc.call(this);
+                        var data = dataFunc.call(this, exports);
                         _combineObject(params, data);
                         _parseQueryString(data);
                         return data;
@@ -16986,7 +17002,7 @@ function buildPomeloUI(options, exports) {
                     hookMountedAndUnmounted(_opt, viewName);
                     return _resolveModules(_opt.modules, viewName).then(function () {
                         PageNext(_opt);
-                        return Promise.resolve();
+                        return Promise.resolve();P
                     });
                 });
             }
@@ -17120,6 +17136,21 @@ function buildPomeloUI(options, exports) {
                 if (!_opt.template) {
                     _opt.template = _html;
                 }
+                if (!_opt.setup) {
+                    _opt.setup = function () { };
+                }
+                var originSetup = _opt.setup;
+                _opt.setup = function (props, context) {
+                    originSetup(props, context);
+                    var instance = Vue.getCurrentInstance();
+                    instance.$app = exports;
+                }
+                var originData = _opt.data || function () {
+                    return {};
+                };
+                _opt.data = function () {
+                    return originData.call(this, exports);
+                };
                 return _resolveModules(_opt.modules, c);
             }).then(function () {
                 ret.push({ name: _name, options: _opt });
@@ -17140,16 +17171,17 @@ function buildPomeloUI(options, exports) {
     }
 
     exports.root = root;
-    exports.setOptions = SetOptions;
-    exports.route = Route;
+    exports.useConfig = UseConfig;
+    exports.mapRoute = MapRoute;
     exports.matchRoute = MatchRoute;
     exports.updateLayout = UpdateLayout;
     exports.redirect = Redirect;
     exports.loadScript = LoadScript;
     exports.forceUpdate = ForceUpdate;
     exports.mount = mount;
+    exports.useRoutes = useRoutes;
 
     return exports;
 };
 
-exports.buildPomeloUI = buildPomeloUI;
+exports.build = build;