efront 4.22.7 → 4.22.9

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -1,3 +1,39 @@
+- zh-CN: 此数据不可查询！
+  en:    This data is not searchable!
+
+- zh-CN: 不可查询私有数据！
+  en:    Cannot query private data!
+
+- zh-CN: 此数据不可枚举
+  en:    This data cannot be enumerated
+
+- zh-CN: 您无权访问此数据！
+  en:    You do not have access to this data!
+
+- zh-CN: 商品id
+  en:    Product ID
+
+- zh-CN: 商品名称
+  en:    Product name
+
+- zh-CN: 包含
+  en:    contain
+
+- zh-CN: 商品简述
+  en:    Product Description
+
+- zh-CN: 商品展示
+  en:    Product Display
+
+- zh-CN: 允许所有人检索全部内容
+  en:    Allow everyone to retrieve all content
+
+- zh-CN: 用户互访
+  en:    User mutual visits
+
+- zh-CN: 不公开时检查此项
+  en:    Check this item when not publicly available
+
 - zh-CN: 退出登录
   en:    Log Out
 

package/apps/kugou/home.less

@@ -14,6 +14,7 @@
     padding-right: 60px;
     cursor: default;
     white-space: nowrap;
+    width: auto;
 
     >tag {
         width: 25%;
@@ -94,6 +95,17 @@
     font-size: 16px;
     width: auto;
     background: inherit;
+
+    &:before {
+        content: "";
+        z-index: 1;
+        position: absolute;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        width: 16px;
+        display: block;
+    }
 }
 
 .search-box {

package/apps/pivot/api.yml

@@ -34,8 +34,12 @@
   unique-save: options ::unique-:data
   recert: options ::recert
   upload: put :path
-https://www.ip.cn/ referer=https://www.ip.cn/api/index/&Cookie=:empty:
-  iplocation: get /api/index/?ip=:ip&type=1
+https://api.map.baidu.com/:
+  ipbaidu: get location/ip
+https://restapi.amap.com/:
+  ipgaode: get v3/ip
+https://www.ip.cn/ referer=https://www.ipshudi.com/&Cookie=:empty:
+  ipcn: get#tab0_address ip/:ip.html#address=!innerText
 # https://ipchaxun.com/ :
 #   iplocation: get:[].info%20label:nth-child(n+2)>span:nth-child(2) :ip/
 # https://www.ip138.com/:

package/apps/pivot/db/config.xht

@@ -28,6 +28,7 @@
         border: 1px solid #999;
         padding: 4px 10px;
         height: 60px;
+
         [a-key] {
             font-family: 20px;
             font-style: italic;
@@ -67,7 +68,8 @@
     动作管理
     `;
     var fields = refilm`
-    是否公开/open swap`;
+    是否公开/open swap // 允许所有人检索全部内容
+    (用户互访/visit/,open=false) swap // 不公开时检查此项`;
     var [db] = arguments;
     if (!db.fields) {
         var [da1] = await data.from('dbfind', { dbid: db.name, size: 1 });

package/coms/basic/Table.js

@@ -26,6 +26,7 @@ class Table extends Array {
     $filterFields = [];
     $unsummaryFileds = [];
     callback = null;
+    heightLight = undefined;
     static from(fields, data) {
         var t = new Table;
         t.fields = fields;
@@ -120,7 +121,7 @@ class Table extends Array {
             var name = seek(o, f.key);
             if (isEmpty(name) || !isString(name)) continue;
             if (name === searchtext) this.hasFullmatch = true;
-            var [p, m] = mark.power(name, searchtext);
+            var [p, m] = mark.power(name, searchtext, this.heightLight);
             if (p > power) power = p;
             if (!isEmpty(f.key) && !isFunction(f.key)) o[f.key] = m;
             else o.name = m, o.toString = returnName, o.valueOf = returnName;

package/coms/basic/data.js

@@ -604,14 +604,16 @@ var privates = {
         return getApi(serviceId, this.getConfigPromise());
     },
     prepare(method, url, params) {
-        var spliterIndex = /[\:\|\/\~\!\?]/.exec(method), search;
+        var spliterIndex = /[\:\|\/\~\!\?\#\.\[]/.exec(method), search;
         if (spliterIndex) spliterIndex = spliterIndex.index;
         else spliterIndex = method.length;
         var coinmethod = method.slice(0, spliterIndex).toLowerCase();
-        var realmethod = coinmethod.replace(/\W+$/g, '');
+        var realmethod = coinmethod.replace(/\W[\s\S]*$/g, '');
         var [uri, rest, baseuri, search] = prepareURL(url, params);
         if (params && rest.length) rest.forEach(r => delete params[r]);
-        return { method: realmethod, coinmethod, selector: method.slice(spliterIndex + 1), search, baseuri, uri, params };
+        var selector = method.slice(spliterIndex);
+        if (!/^(?:[\.\#\[]|\:(?:nth|first|last)\-child)/.test(selector)) selector = selector.slice(1);
+        return { method: realmethod, coinmethod, selector, search, baseuri, uri, params };
     },
     loadIgnoreConfig(method, url, params1, api) {
         var headers = api && api.headers;

package/coms/basic/mark.js

@@ -80,10 +80,16 @@ var pair = function (source, search, t1, t2, t3, t4) {
     return power2(source, search);
 }
 var searchText = '';
-var power = function (source, search) {
+var concat1 = function (pre, match, aft) {
+    return pre.concat(MARK_PRE1, match, MARK_AFT1, aft);
+};
+var power = function (source, search, concat_me) {
     searchText = search;
+    var concat_ = concat1;
+    if (concat_me) concat1 = concat_me;
     var res = power_(source, search);
     searchText = '';
+    concat1 = concat_;
     return res;
 };
 var power_p = function () { };
@@ -140,7 +146,7 @@ var power_ = function (source, search, func, mp) {
         else if (ap >= p) {
             p += ap / source.length / search.length * .01 - .2;
         }
-        return [p, match_text_pre.concat(MARK_PRE1, match_text, MARK_AFT1, match_text_aft)];
+        return [p, concat1(match_text_pre, match_text, match_text_aft)];
     }
     return [0, source];
 };

package/coms/basic/writeLEB128.js

@@ -3,7 +3,7 @@ function writeLEB128(dist, offset, value) {
     while (b > 127) {
         var t = b & 0x7f;
         dist[offset++] = t | 0b10000000;
-        b = b >> 7;
+        b = b >>> 7;
     }
     dist[offset++] = b;
     return offset;

package/coms/frame/route.js

@@ -78,6 +78,7 @@
             }
         }
     };
+    var firstMenu = null;
     var parseMenuList = function (items) {
         if (items instanceof Array) {
             if (!items[0] || !items[0].name) {
@@ -123,6 +124,7 @@
     result.update = function (items) {
         delete result.loading_promise;
         delete result.then;
+        firstMenu = null;
         items = result.parse(items);
         items.map(getChildren);
         var opened = data.getInstance("menu-opened");
@@ -131,11 +133,13 @@
         historys.forEach((a, i) => map[a] = i + 1);
         result.splice(0, result.length);
         var actived, actived_value = 0;
+        var zimoilPath = zimoli.getInitPath();
         var a = function (menu) {
             var res = checkroles(user.roles, menu.roles);
             if (res) {
                 if (savedChildren[menu.id] instanceof Array) menu.children = savedChildren[menu.id].filter(a);
                 if (menu.path) {
+                    if (!firstMenu || menu.path === zimoilPath) firstMenu = menu;
                     if (map[menu.path] > actived_value) {
                         actived = menu;
                         actived_value = map[menu.path];
@@ -189,11 +193,17 @@
             oped.active = menu.id;
             data.setInstance('menu-opened', oped);
         }
+        first_opened = true;
     });
     result.open = function (menu) {
         if (!menu) {
             if (first_opened && result.active) return;
-            menu = result.active || result[0];
+            menu = result.active || firstMenu;
+            if (!menu?.path) return;
+            first_opened = true;
+            zimoli.switch(null, null, menu);
+            zimoli();
+            return;
         }
         if (!menu.path) {
             menu.closed = !menu.closed;

package/coms/layer/glance.js

@@ -57,7 +57,7 @@ var dragview = function (dragview) {
  * 左侧为菜单
  * 菜单在小屏上收起，可以点击按钮打开
  */
-function main(mainPath, historyName = "") {
+function main(mainPath, historyName = "/") {
     var layer = div();
     layer.innerHTML = glance;
     if (mainPath instanceof Object) {

package/coms/pivot/checkGeo.js

@@ -1,11 +1,38 @@
+var md5 = docs$md5;
+var baidu = function (ip) {
+    var query = {
+        ip,
+        ak: "lPiUBf6CCdZtLzrbzYREa6liU0NycJyr"
+    };
+    query.sn = md5(encodeURIComponent("/location/ip?" + serialize(query)) + "dZtaNhMkjlDmxAot0uYs2fEJKvTi3REe");
+    return data.from("ipbaidu", query);
+};
+var gaode = function (ip) {
+    var query = {
+        ip,
+        key: 'e360c7487575c81c617a42d00edea1fb'
+    };
+    query.sig = md5(serialize(query) + "a9b7a9509b47169bde38dfa825898ff8");
+    return data.from("ipgaode", query);
+};
 return async function (a) {
     var ip = a.ip || a.remote;
     var m = /(\d+\.){3}\d+$/.exec(ip);
-    var res = await data.from("iplocation", { ip: m ? m[0] : ip });
+    ip = m ? m[0] : ip;
+    var res = await data.from("ipcn", { ip });
+    console.log(res)
+    if (!res.address && !res.data) res = await baidu(ip);
+    var msg = '加载错误';
+    if (res.message && !res.data && !res.content && !res.address) {
+        msg = res.message;
+        res = await gaode(ip);
+    }
     if (res.data) res = res.data;
+    if (res.content) res = res.content;
     if (res.address) res = res.address;
-    else if (res.country || res.isp) {
-        res = [res.country, res.province, res.city, res.district, res.isp].join(' ');
+    else if (res.country || res.province || res.city || res.isp) {
+        res = [res.country, res.province, res.city, res.district, res.isp].join('');
     }
-    a.address = res;
+    if (!res) alert(msg, 'warn');
+    a.address = res || msg;
 }

package/coms/zimoli/checkbox.less

@@ -7,6 +7,6 @@
     margin-right: 10px;
     vertical-align: top;
     >span {
-        vertical-align: middle;
+        vertical-align: top;
     }
 }

package/coms/zimoli/marker.js

@@ -1,7 +1,20 @@
+var b = function (match) {
+    var b = document.createElement('b');
+    b.innerText = match;
+    return b;
+};
+var wrap = function (pre, match, aft) {
+    return [].concat(pre, b(match), aft);
+};
 function marker(e) {
     if (!e) e = document.createElement("marker");
     on("changes")(e, function () {
-        e.innerHTML = isEmpty(this.source) ? "" : mark(this.source, this.search);
+        remove(e.childNodes);
+        if (isEmpty(this.source)) return;
+        var source = mark(this.source, this.search, wrap);
+        if (isArray(source)) appendChild(this, source);
+        else this.innerText = source;
     });
     return e;
-}
+}
+marker.wrap = wrap;

package/coms/zimoli/marker_test.js

@@ -0,0 +1,24 @@
+var test_wrap = function (data, search) {
+    var wrap = mark.wrap;
+    var startTime = Date.now();
+    for (var cx = 0, dx = 10000; cx < dx; cx++) {
+        for (var d of data) {
+            mark(d, search, wrap);
+        }
+    }
+    var spendTime = (Date.now() - startTime);
+    console.log('用时', spendTime);
+}
+var testData = [
+    "efront.cc/baiplay/bp",
+    "chat.efront.cc/baiplay/aa",
+    "baiplay.efront.cc/baiplay/aa",
+    "baiplay.efront.cc/baiplay/cc",
+    "ipv4.efront.cc/baiplay/dd",
+    "ipv6.efront.cc/baiplay/ff",
+    "baiplay.cn/baiplay/ee",
+    "baidu.com/baiplay/gg",
+];
+return function () {
+    test_wrap(testData, 'bai');
+}

package/coms/zimoli/table.js

@@ -522,6 +522,7 @@ function table(elem) {
             find(text) {
                 if ($scope.data.constructor === Table) {
                     $scope.data.searchText = text;
+                    $scope.data.heightLight = marker.wrap;
                     $scope.data.update();
                 }
             }