@arkxos/arkos-core 0.1.3 → 0.1.7

package/ark_dist/js/{app.defbef2d.js → app.f4d188de.js}

@@ -1 +1 @@
-!function(e,r){"object"==typeof exports&&"object"==typeof module?module.exports=r(require("ArkLibProxy"),require("ArkMicro"),require("ElementPlus"),require("Pinia"),require("Vue"),require("VueI18n"),require("VueRouter"),require("axios"),require("piniaPluginPersistedstate")):"function"==typeof define&&define.amd?define(["ArkLibProxy","ArkMicro","ElementPlus","Pinia","Vue","VueI18n","VueRouter","axios","piniaPluginPersistedstate"],r):"object"==typeof exports?exports["@arkxos/arkos-core"]=r(require("ArkLibProxy"),require("ArkMicro"),require("ElementPlus"),require("Pinia"),require("Vue"),require("VueI18n"),require("VueRouter"),require("axios"),require("piniaPluginPersistedstate")):e["@arkxos/arkos-core"]=r(e.ArkLibProxy,e.ArkMicro,e.ElementPlus,e.Pinia,e.Vue,e.VueI18n,e.VueRouter,e.axios,e.piniaPluginPersistedstate)}(self,(function(e,r,t,n,o,i,u,a,s){return function(){"use strict";var c,f,l={720:function(e){e.exports=t},844:function(e){e.exports=r},1677:function(e){e.exports=n},2508:function(e){e.exports=o},2742:function(e){e.exports=a},7620:function(e){e.exports=i},8420:function(e){e.exports=s},8533:function(e){e.exports=u},9189:function(r){r.exports=e}},d={};function p(e){var r=d[e];if(void 0!==r)return r.exports;var t=d[e]={exports:{}};return l[e].call(t.exports,t,t.exports,p),t.exports}p.m=l,p.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return p.d(r,{a:r}),r},p.d=function(e,r){for(var t in r)p.o(r,t)&&!p.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},p.f={},p.e=function(e){return Promise.all(Object.keys(p.f).reduce((function(r,t){return p.f[t](e,r),r}),[]))},p.u=function(e){return"js/"+e+".46c97ff0.js"},p.miniCssF=function(e){return"css/"+e+".fbd21c4a.css"},p.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),p.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},c={},f="@arkxos/arkos-core:",p.l=function(e,r,t,n){if(c[e])c[e].push(r);else{var o,i;if(void 0!==t)for(var u=document.getElementsByTagName("script"),a=0;a<u.length;a++){var s=u[a];if(s.getAttribute("src")==e||s.getAttribute("data-webpack")==f+t){o=s;break}}o||(i=!0,(o=document.createElement("script")).charset="utf-8",o.timeout=120,p.nc&&o.setAttribute("nonce",p.nc),o.setAttribute("data-webpack",f+t),o.src=e),c[e]=[r];var l=function(r,t){o.onerror=o.onload=null,clearTimeout(d);var n=c[e];if(delete c[e],o.parentNode&&o.parentNode.removeChild(o),n&&n.forEach((function(e){return e(t)})),r)return r(t)},d=setTimeout(l.bind(null,void 0,{type:"timeout",target:o}),12e4);o.onerror=l.bind(null,o.onerror),o.onload=l.bind(null,o.onload),i&&document.head.appendChild(o)}},p.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},p.p=window.ArkConfig.cdnHost+"/@arkxos/arkos-core@0.1.3/ark_dist/",function(){if("undefined"!=typeof document){var e={524:0};p.f.miniCss=function(r,t){e[r]?t.push(e[r]):0!==e[r]&&{637:1}[r]&&t.push(e[r]=function(e){return new Promise((function(r,t){var n=p.miniCssF(e),o=p.p+n;if(function(e,r){for(var t=document.getElementsByTagName("link"),n=0;n<t.length;n++){var o=(u=t[n]).getAttribute("data-href")||u.getAttribute("href");if("stylesheet"===u.rel&&(o===e||o===r))return u}var i=document.getElementsByTagName("style");for(n=0;n<i.length;n++){var u;if((o=(u=i[n]).getAttribute("data-href"))===e||o===r)return u}}(n,o))return r();!function(e,r,t,n,o){var i=document.createElement("link");i.rel="stylesheet",i.type="text/css",p.nc&&(i.nonce=p.nc),i.onerror=i.onload=function(t){if(i.onerror=i.onload=null,"load"===t.type)n();else{var u=t&&t.type,a=t&&t.target&&t.target.href||r,s=new Error("Loading CSS chunk "+e+" failed.\n("+u+": "+a+")");s.name="ChunkLoadError",s.code="CSS_CHUNK_LOAD_FAILED",s.type=u,s.request=a,i.parentNode&&i.parentNode.removeChild(i),o(s)}},i.href=r,document.head.appendChild(i)}(e,o,0,r,t)}))}(r).then((function(){e[r]=0}),(function(t){throw delete e[r],t})))}}}(),function(){var e={524:0};p.f.j=function(r,t){var n=p.o(e,r)?e[r]:void 0;if(0!==n)if(n)t.push(n[2]);else{var o=new Promise((function(t,o){n=e[r]=[t,o]}));t.push(n[2]=o);var i=p.p+p.u(r),u=new Error;p.l(i,(function(t){if(p.o(e,r)&&(0!==(n=e[r])&&(e[r]=void 0),n)){var o=t&&("load"===t.type?"missing":t.type),i=t&&t.target&&t.target.src;u.message="Loading chunk "+r+" failed.\n("+o+": "+i+")",u.name="ChunkLoadError",u.type=o,u.request=i,n[1](u)}}),"chunk-"+r,r)}};var r=function(r,t){var n,o,i=t[0],u=t[1],a=t[2],s=0;if(i.some((function(r){return 0!==e[r]}))){for(n in u)p.o(u,n)&&(p.m[n]=u[n]);a&&a(p)}for(r&&r(t);s<i.length;s++)o=i[s],p.o(e,o)&&e[o]&&e[o][0](),e[o]=0},t=self["helJsonp_@arkxos/arkos-core_1762773364901"]=self["helJsonp_@arkxos/arkos-core_1762773364901"]||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))}();var m=p(9189);return async function(){const e=await p.e(637).then(p.bind(p,6637));(0,m.libReady)("@arkxos/arkos-core",e.default)}().catch(console.error),{}}()}));
+!function(e,r){"object"==typeof exports&&"object"==typeof module?module.exports=r(require("ArkLibProxy"),require("ArkMicro"),require("ElementPlus"),require("Pinia"),require("Vue"),require("VueI18n"),require("VueRouter"),require("axios"),require("piniaPluginPersistedstate")):"function"==typeof define&&define.amd?define(["ArkLibProxy","ArkMicro","ElementPlus","Pinia","Vue","VueI18n","VueRouter","axios","piniaPluginPersistedstate"],r):"object"==typeof exports?exports["@arkxos/arkos-core"]=r(require("ArkLibProxy"),require("ArkMicro"),require("ElementPlus"),require("Pinia"),require("Vue"),require("VueI18n"),require("VueRouter"),require("axios"),require("piniaPluginPersistedstate")):e["@arkxos/arkos-core"]=r(e.ArkLibProxy,e.ArkMicro,e.ElementPlus,e.Pinia,e.Vue,e.VueI18n,e.VueRouter,e.axios,e.piniaPluginPersistedstate)}(self,(function(e,r,t,n,o,i,u,a,s){return function(){"use strict";var c,f,l={720:function(e){e.exports=t},844:function(e){e.exports=r},1677:function(e){e.exports=n},2508:function(e){e.exports=o},2742:function(e){e.exports=a},7620:function(e){e.exports=i},8420:function(e){e.exports=s},8533:function(e){e.exports=u},9189:function(r){r.exports=e}},d={};function p(e){var r=d[e];if(void 0!==r)return r.exports;var t=d[e]={exports:{}};return l[e].call(t.exports,t,t.exports,p),t.exports}p.m=l,p.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return p.d(r,{a:r}),r},p.d=function(e,r){for(var t in r)p.o(r,t)&&!p.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},p.f={},p.e=function(e){return Promise.all(Object.keys(p.f).reduce((function(r,t){return p.f[t](e,r),r}),[]))},p.u=function(e){return"js/"+e+".fa7fdcf0.js"},p.miniCssF=function(e){return"css/"+e+".fbd21c4a.css"},p.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),p.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},c={},f="@arkxos/arkos-core:",p.l=function(e,r,t,n){if(c[e])c[e].push(r);else{var o,i;if(void 0!==t)for(var u=document.getElementsByTagName("script"),a=0;a<u.length;a++){var s=u[a];if(s.getAttribute("src")==e||s.getAttribute("data-webpack")==f+t){o=s;break}}o||(i=!0,(o=document.createElement("script")).charset="utf-8",o.timeout=120,p.nc&&o.setAttribute("nonce",p.nc),o.setAttribute("data-webpack",f+t),o.src=e),c[e]=[r];var l=function(r,t){o.onerror=o.onload=null,clearTimeout(d);var n=c[e];if(delete c[e],o.parentNode&&o.parentNode.removeChild(o),n&&n.forEach((function(e){return e(t)})),r)return r(t)},d=setTimeout(l.bind(null,void 0,{type:"timeout",target:o}),12e4);o.onerror=l.bind(null,o.onerror),o.onload=l.bind(null,o.onload),i&&document.head.appendChild(o)}},p.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},p.p=window.ArkConfig.cdnHost+"/@arkxos/arkos-core@0.1.7/ark_dist/",function(){if("undefined"!=typeof document){var e={524:0};p.f.miniCss=function(r,t){e[r]?t.push(e[r]):0!==e[r]&&{100:1}[r]&&t.push(e[r]=function(e){return new Promise((function(r,t){var n=p.miniCssF(e),o=p.p+n;if(function(e,r){for(var t=document.getElementsByTagName("link"),n=0;n<t.length;n++){var o=(u=t[n]).getAttribute("data-href")||u.getAttribute("href");if("stylesheet"===u.rel&&(o===e||o===r))return u}var i=document.getElementsByTagName("style");for(n=0;n<i.length;n++){var u;if((o=(u=i[n]).getAttribute("data-href"))===e||o===r)return u}}(n,o))return r();!function(e,r,t,n,o){var i=document.createElement("link");i.rel="stylesheet",i.type="text/css",p.nc&&(i.nonce=p.nc),i.onerror=i.onload=function(t){if(i.onerror=i.onload=null,"load"===t.type)n();else{var u=t&&t.type,a=t&&t.target&&t.target.href||r,s=new Error("Loading CSS chunk "+e+" failed.\n("+u+": "+a+")");s.name="ChunkLoadError",s.code="CSS_CHUNK_LOAD_FAILED",s.type=u,s.request=a,i.parentNode&&i.parentNode.removeChild(i),o(s)}},i.href=r,document.head.appendChild(i)}(e,o,0,r,t)}))}(r).then((function(){e[r]=0}),(function(t){throw delete e[r],t})))}}}(),function(){var e={524:0};p.f.j=function(r,t){var n=p.o(e,r)?e[r]:void 0;if(0!==n)if(n)t.push(n[2]);else{var o=new Promise((function(t,o){n=e[r]=[t,o]}));t.push(n[2]=o);var i=p.p+p.u(r),u=new Error;p.l(i,(function(t){if(p.o(e,r)&&(0!==(n=e[r])&&(e[r]=void 0),n)){var o=t&&("load"===t.type?"missing":t.type),i=t&&t.target&&t.target.src;u.message="Loading chunk "+r+" failed.\n("+o+": "+i+")",u.name="ChunkLoadError",u.type=o,u.request=i,n[1](u)}}),"chunk-"+r,r)}};var r=function(r,t){var n,o,i=t[0],u=t[1],a=t[2],s=0;if(i.some((function(r){return 0!==e[r]}))){for(n in u)p.o(u,n)&&(p.m[n]=u[n]);a&&a(p)}for(r&&r(t);s<i.length;s++)o=i[s],p.o(e,o)&&e[o]&&e[o][0](),e[o]=0},t=self["helJsonp_@arkxos/arkos-core_1768802629691"]=self["helJsonp_@arkxos/arkos-core_1768802629691"]||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))}();var m=p(9189);return async function(){const e=await p.e(100).then(p.bind(p,5100));(0,m.libReady)("@arkxos/arkos-core",e.default)}().catch(console.error),{}}()}));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@arkxos/arkos-core",
   "appGroupName": "@arkxos/arkos-core",
-  "version": "0.1.3",
+  "version": "0.1.7",
   "main": "ark_proxy/entry.js",
   "module": "ark_proxy_es/entry.js",
   "types": "src/entrance/libTypes.ts",
@@ -17,12 +17,12 @@
   "dependencies": {
     "@arkxio/ark-iso": "0.1.1",
     "@arkxos/arkos-util": "^0.1.0",
-    "core-js": "3.8.3",
+    "core-js": "3.47.0",
     "js-cookie": "3.0.1",
     "dayjs": "1.11.9",
     "file-saver": "2.0.5",
     "@babel/runtime": "7.28.4",
-    "@element-plus/icons-vue": "2.3.1",
+    "@element-plus/icons-vue": "2.3.2",
     "@tinymce/tinymce-vue": "5.0.0",
     "codemirror": "5.65.5",
     "commander": "11.0.0",
@@ -42,7 +42,7 @@
     "vue-simple-acl": "2.0.2",
     "xgplayer": "2.32.2",
     "xgplayer-hls": "2.5.2",
-    "@vueuse/core": "10.7.0",
+    "@vueuse/core": "12.8.2",
     "qs": "^6.10.1",
     "mitt": "3.0.1"
   },
@@ -55,18 +55,18 @@
     "vue-router": "4.4.5",
     "vue-i18n": "9.8.0",
     "axios": "^1.8.0",
-    "core-js": "3.8.3",
+    "core-js": "3.47.0",
     "vue": "3.5.12",
     "pinia": "2.2.4",
     "pinia-plugin-persistedstate": "^3.2.1",
-    "element-plus": "^2.8.5"
+    "element-plus": "^2.13.0"
   },
   "devDependencies": {
-    "@arkxio/ark-dev-utils": "0.1.1",
+    "@arkxio/ark-dev-utils": "0.1.6",
     "@rollup/plugin-typescript": "9.0.1",
-    "@types/jest": "27.0.1",
-    "@typescript-eslint/eslint-plugin": "5.4.0",
-    "@typescript-eslint/parser": "5.4.0",
+    "@types/jest": "29.5.14",
+    "@typescript-eslint/eslint-plugin": "8.53.0",
+    "@typescript-eslint/parser": "8.53.0",
     "@vue/cli-plugin-babel": "~5.0.0",
     "@vue/cli-plugin-eslint": "~5.0.0",
     "@vue/cli-plugin-typescript": "~5.0.0",
@@ -79,7 +79,7 @@
     "babel-jest": "27.0.6",
     "chalk": "5.4.1",
     "cross-env": "7.0.3",
-    "eslint": "7.32.0",
+    "eslint": "8.57.1",
     "eslint-plugin-import": "2.25.3",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-promise": "5.1.0",
@@ -88,7 +88,7 @@
     "rollup": "2.79.2",
     "rollup-plugin-terser": "7.0.2",
     "ts-jest": "27.0.4",
-    "typescript": "5.6.2",
+    "typescript": "5.9.3",
     "vue-cli-plugin-vite": "~1.5.0"
   },
   "publishConfig": {

package/src/api/model/auth.js

@@ -27,7 +27,7 @@ export default {
     url: '/auth/oauth2/token',
     name: '登录获取TOKEN',
     post: async function (data = {}) {
-      const basicAuth = 'Basic ' + window.btoa('arkos:rapidark');
+      const basicAuth = 'Basic ' + window.btoa('2011086324198563840:rapidark');
       const headers = Object.assign({
         skipToken: true,
         Authorization: basicAuth,

package/src/core/system.ts

@@ -51,6 +51,10 @@ const system = {
       if (!menu.path.startsWith('http') && !menu.path.startsWith('/')) {
         menu.path = parentMenu?.path + '/' + menu.path
       }
+
+      menu.dataPath = menu.path;
+      menu.path = menu.component || menu.path;
+
       if (menu.children) {
         this.fixMenuPath(menu.children, menu, menu.puzzleCode)
       }
@@ -61,7 +65,6 @@ const system = {
     const responseData = menusResponse.data;
     const menus = responseData.menu || responseData;
 
-    tool.data.set('MENU', menus)
     if (responseData.permissions) {
       tool.data.set('PERMISSIONS', responseData.permissions)
     }
@@ -72,11 +75,14 @@ const system = {
     this.fixMenuPath(menus);
     console.log('fixedMenus', menus)
 
+    tool.data.set('MENU', menus)
+
     const puzzleInfos = {};
     menus.forEach(item => {
       if (!item.appCode) {
         return;
       }
+
       if (!puzzleInfos[item.appCode]) {
         puzzleInfos[item.appCode] = {
           puzzleCode: item.appCode,
@@ -117,8 +123,7 @@ const system = {
         puzzleLoader = system.dynamicLoadModule
       }
       console.log('prepare load puzzle[' + puzzleCode + '], loader is ', puzzleLoader)
-      const p = await puzzleLoader('puzzles', puzzleCode, '', '')
-      {
+      puzzleLoader('puzzles', puzzleCode, '', '').then(p => {
         console.log('load puzzle ' + puzzleCode, p)
         console.log('import app[' + puzzle.puzzleCode + ']', p)
 
@@ -190,7 +195,9 @@ const system = {
           }
           //   this.$store.registerModule(name, p.store[name]);
         }
-      }
+      }).catch(err => {
+        console.log('load module fail ' + puzzle.id, err)
+      });
     }
     // 储存路由表
     // systemStore
@@ -214,10 +221,12 @@ const system = {
     }
     const accessedRouters = []
     routerMap.forEach(item => {
+      console.log('---menu', item)
       item.meta = item.meta ? item.meta : {};
+
+      item.meta.url = item.dataPath;
       // 处理外部链接特殊路由
       if (item.meta.type == 'iframe') {
-        item.meta.url = item.path;
         item.path = `/i/${item.name}`;
         item.meta.iframe = 'iframe'
       }
@@ -233,6 +242,7 @@ const system = {
         children: item.children ? this.filterAsyncRouter(item.children, item, loadComponent) : null,
         component: item.meta.type == 'iframe' ? null : loadComponent(item)
       }
+      console.log('---route', route)
       accessedRouters.push(route)
     })
     return accessedRouters