diff --git a/electron/index.html b/electron/index.html
deleted file mode 100644
index 8d359519..00000000
--- a/electron/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
- Hello World!
-
-
-Hello World!
-We are using Node.js ,
-Chromium ,
-and Electron .
-
-
-
-
-
diff --git a/electron/main.js b/electron/main.js
index eb3c1c95..46c39395 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -7,15 +7,17 @@ const path = require('path')
function createWindow () {
// Create the browser window.
const mainWindow = new BrowserWindow({
- width: 800,
- height: 600,
+ width: 1280,
+ height: 800,
webPreferences: {
preload: path.join(__dirname, 'preload.js')
}
})
// and load the index.html of the app.
- mainWindow.loadFile('index.html')
+ mainWindow.loadFile('../public/index_electron.html').then(r => {
+
+ })
// Open the DevTools.
// mainWindow.webContents.openDevTools()
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index 2fbc6549..f10629d6 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -51,7 +51,7 @@ VueRouter.prototype.push = function push(location) {
return originalPush.call(this, location).catch(err => err)
}
const router = new VueRouter({
- mode: 'history',
+ mode: 'hash',
routes
});
@@ -64,7 +64,7 @@ router.beforeEach((to, from, next) => {
ViewUI.LoadingBar.start();
next();
});
-router.afterEach((to, from, next) => {
+router.afterEach(() => {
ViewUI.LoadingBar.finish();
});
diff --git a/resources/assets/js/components/Flow.vue b/resources/assets/js/components/Flow.vue
index 329fe728..e14c4f6c 100644
--- a/resources/assets/js/components/Flow.vue
+++ b/resources/assets/js/components/Flow.vue
@@ -114,7 +114,7 @@
language = 'zh'
break;
}
- this.url = window.location.origin + '/js/grapheditor/' + (this.readOnly ? 'viewer' : 'index') + '.html?lang=' + language;
+ this.url = './js/grapheditor/' + (this.readOnly ? 'viewer' : 'index') + '.html?lang=' + language;
},
mounted() {
window.addEventListener('message', this.handleMessage)
diff --git a/resources/assets/js/components/LuckySheet.vue b/resources/assets/js/components/LuckySheet.vue
index 39dbc90a..27292ac5 100644
--- a/resources/assets/js/components/LuckySheet.vue
+++ b/resources/assets/js/components/LuckySheet.vue
@@ -51,13 +51,13 @@ export default {
},
mounted() {
$A.loadScriptS([
- window.location.origin + '/js/luckysheet/plugins/css/pluginsCss.css',
- window.location.origin + '/js/luckysheet/plugins/plugins.css',
- window.location.origin + '/js/luckysheet/css/luckysheet.css',
- window.location.origin + '/js/luckysheet/assets/iconfont/iconfont.css',
+ './js/luckysheet/plugins/css/pluginsCss.css',
+ './js/luckysheet/plugins/plugins.css',
+ './js/luckysheet/css/luckysheet.css',
+ './js/luckysheet/assets/iconfont/iconfont.css',
//
- window.location.origin + '/js/luckysheet/plugins/js/plugin.js',
- window.location.origin + '/js/luckysheet/luckysheet.umd.js',
+ './js/luckysheet/plugins/js/plugin.js',
+ './js/luckysheet/luckysheet.umd.js',
], () => {
this.loadIng = false;
this.bakValue = JSON.stringify(this.value);
@@ -99,7 +99,7 @@ export default {
],
lang: lang,
loading: {
- image: 'image://' + window.location.origin + '/js/luckysheet/css/loading.gif'
+ image: 'image://.js/luckysheet/css/loading.gif'
},
data: value ? $A.cloneJSON(value) : [
{
diff --git a/resources/assets/js/components/TEditor.vue b/resources/assets/js/components/TEditor.vue
index fb876596..8358a51c 100755
--- a/resources/assets/js/components/TEditor.vue
+++ b/resources/assets/js/components/TEditor.vue
@@ -212,7 +212,7 @@
return {
inline: isFull ? false : this.inline,
selector: (isFull ? '#T_' : '#') + this.id,
- base_url: $A.serverUrl('js/tinymce'),
+ base_url: './js/tinymce',
language: "zh_CN",
toolbar: this.toolbar,
plugins: this.plugin(isFull),
diff --git a/resources/assets/js/functions/common.js b/resources/assets/js/functions/common.js
index 8f6a7084..def3853d 100755
--- a/resources/assets/js/functions/common.js
+++ b/resources/assets/js/functions/common.js
@@ -220,37 +220,6 @@
return serverUrl + str;
},
- /**
- * 获取IP地址详情
- * @param ip
- * @param callback
- */
- getIpInfo: function(ip, callback) {
- if (!this.strExists(ip, ".")) {
- return;
- }
- let keyName = '__ip' + ip.substring(0, 1) + '__';
- let key = this.getMiddle(ip, '', '.');
- let res = this.loadFromlLocal(key, ip, '', keyName);
- if (typeof res == "object") {
- if (typeof callback == "function") {
- callback(res);
- }
- return;
- }
- $A.ajaxc({
- url: $A.serverUrl('api/system/get/ipinfo'),
- data: { ip: ip },
- timeout: 8000,
- success: (res) => {
- this.savaToLocal(key, ip, res, keyName);
- if (typeof callback == "function") {
- callback(res);
- }
- }
- });
- },
-
/**
* 新增&&获取缓存数据
* @param key
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index ce0782b1..4191975d 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -296,7 +296,7 @@ export default {
}
this._notificationId = id;
this.notificationClass.replaceOptions({
- icon: $A.serverUrl('images/logo.png'),
+ icon: './images/logo.png',
body: body,
data: data,
tag: "dialog",
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 71bab93b..8a006a5b 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -1424,10 +1424,9 @@ export default {
}
let url = window.webSocketConfig.URL;
if (!url) {
- url = window.location.origin;
+ url = state.method.apiUrl('/ws');
url = url.replace("https://", "wss://");
url = url.replace("http://", "ws://");
- url += "/ws";
}
url += "?action=web&token=" + state.userToken;
//
diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js
index 87dfb579..0daace60 100644
--- a/resources/assets/js/store/state.js
+++ b/resources/assets/js/store/state.js
@@ -1,13 +1,20 @@
const method = {
apiUrl(str) {
+ let origin;
+ origin = window.location.origin;
+ origin = 'http://127.0.0.1:2222';
+ //
if (str.substring(0, 2) === "//" ||
str.substring(0, 7) === "http://" ||
str.substring(0, 8) === "https://" ||
- str.substring(0, 6) === "ftp://" ||
- str.substring(0, 1) === "/") {
+ str.substring(0, 6) === "ftp://") {
return str;
}
- return window.location.origin + '/api/' + str;
+ if (str.substring(0, 1) == "/") {
+ return origin + str;
+ } else {
+ return origin + "/api/" + str;
+ }
},
date2string(params, format) {
diff --git a/resources/assets/sass/pages/components/file-content.scss b/resources/assets/sass/pages/components/file-content.scss
index ca777001..8838d20e 100644
--- a/resources/assets/sass/pages/components/file-content.scss
+++ b/resources/assets/sass/pages/components/file-content.scss
@@ -15,7 +15,6 @@
align-items: center;
width: 100%;
height: 42px;
- min-width: 900px;
background-color: #ffffff;
box-shadow: 0 1px 5px 0 rgba(0, 0, 0, 0.05);
position: relative;
diff --git a/resources/assets/sass/taskfont.scss b/resources/assets/sass/taskfont.scss
index d49667ea..da7c42e0 100644
--- a/resources/assets/sass/taskfont.scss
+++ b/resources/assets/sass/taskfont.scss
@@ -1,8 +1,8 @@
@font-face {
font-family: 'taskfont'; /* Project id 2583385 */
- src: url('//at.alicdn.com/t/font_2583385_vbi15jduv0n.woff2?t=1625644968453') format('woff2'),
- url('//at.alicdn.com/t/font_2583385_vbi15jduv0n.woff?t=1625644968453') format('woff'),
- url('//at.alicdn.com/t/font_2583385_vbi15jduv0n.ttf?t=1625644968453') format('truetype');
+ src: url('../css/fonts/taskfont.woff2') format('woff2'),
+ url('../css/fonts/taskfont.woff') format('woff'),
+ url('../css/fonts/taskfont.ttf') format('truetype');
}
.taskfont {
diff --git a/resources/assets/statics/public/css/fonts/taskfont.ttf b/resources/assets/statics/public/css/fonts/taskfont.ttf
new file mode 100644
index 00000000..50865a71
Binary files /dev/null and b/resources/assets/statics/public/css/fonts/taskfont.ttf differ
diff --git a/resources/assets/statics/public/css/fonts/taskfont.woff b/resources/assets/statics/public/css/fonts/taskfont.woff
new file mode 100644
index 00000000..2532d4f7
Binary files /dev/null and b/resources/assets/statics/public/css/fonts/taskfont.woff differ
diff --git a/resources/assets/statics/public/css/fonts/taskfont.woff2 b/resources/assets/statics/public/css/fonts/taskfont.woff2
new file mode 100644
index 00000000..712ed587
Binary files /dev/null and b/resources/assets/statics/public/css/fonts/taskfont.woff2 differ
diff --git a/webpack.mix.js b/webpack.mix.js
index 517054c7..973f0230 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -28,6 +28,7 @@ mix
.sass('resources/assets/sass/app.scss', 'public/css')
.webpackConfig({
output: {
+ publicPath: './',
chunkFilename: function ({chunk}) {
return `js/build/${mixBuildName(chunk.id)}.js`
}