no message
This commit is contained in:
parent
9e9f99a241
commit
279384bddf
@ -1,21 +0,0 @@
|
|||||||
<!--index.html-->
|
|
||||||
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
|
|
||||||
<meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
|
|
||||||
<meta http-equiv="X-Content-Security-Policy" content="default-src 'self'; script-src 'self'">
|
|
||||||
<title>Hello World!</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<h1>Hello World!</h1>
|
|
||||||
We are using Node.js <span id="node-version"></span>,
|
|
||||||
Chromium <span id="chrome-version"></span>,
|
|
||||||
and Electron <span id="electron-version"></span>.
|
|
||||||
|
|
||||||
<!-- You can also require other files to run in this process -->
|
|
||||||
<script src="./renderer.js"></script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
8
electron/main.js
vendored
8
electron/main.js
vendored
@ -7,15 +7,17 @@ const path = require('path')
|
|||||||
function createWindow () {
|
function createWindow () {
|
||||||
// Create the browser window.
|
// Create the browser window.
|
||||||
const mainWindow = new BrowserWindow({
|
const mainWindow = new BrowserWindow({
|
||||||
width: 800,
|
width: 1280,
|
||||||
height: 600,
|
height: 800,
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
preload: path.join(__dirname, 'preload.js')
|
preload: path.join(__dirname, 'preload.js')
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
// and load the index.html of the app.
|
// and load the index.html of the app.
|
||||||
mainWindow.loadFile('index.html')
|
mainWindow.loadFile('../public/index_electron.html').then(r => {
|
||||||
|
|
||||||
|
})
|
||||||
|
|
||||||
// Open the DevTools.
|
// Open the DevTools.
|
||||||
// mainWindow.webContents.openDevTools()
|
// mainWindow.webContents.openDevTools()
|
||||||
|
4
resources/assets/js/app.js
vendored
4
resources/assets/js/app.js
vendored
@ -51,7 +51,7 @@ VueRouter.prototype.push = function push(location) {
|
|||||||
return originalPush.call(this, location).catch(err => err)
|
return originalPush.call(this, location).catch(err => err)
|
||||||
}
|
}
|
||||||
const router = new VueRouter({
|
const router = new VueRouter({
|
||||||
mode: 'history',
|
mode: 'hash',
|
||||||
routes
|
routes
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -64,7 +64,7 @@ router.beforeEach((to, from, next) => {
|
|||||||
ViewUI.LoadingBar.start();
|
ViewUI.LoadingBar.start();
|
||||||
next();
|
next();
|
||||||
});
|
});
|
||||||
router.afterEach((to, from, next) => {
|
router.afterEach(() => {
|
||||||
ViewUI.LoadingBar.finish();
|
ViewUI.LoadingBar.finish();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -114,7 +114,7 @@
|
|||||||
language = 'zh'
|
language = 'zh'
|
||||||
break;
|
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() {
|
mounted() {
|
||||||
window.addEventListener('message', this.handleMessage)
|
window.addEventListener('message', this.handleMessage)
|
||||||
|
@ -51,13 +51,13 @@ export default {
|
|||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
$A.loadScriptS([
|
$A.loadScriptS([
|
||||||
window.location.origin + '/js/luckysheet/plugins/css/pluginsCss.css',
|
'./js/luckysheet/plugins/css/pluginsCss.css',
|
||||||
window.location.origin + '/js/luckysheet/plugins/plugins.css',
|
'./js/luckysheet/plugins/plugins.css',
|
||||||
window.location.origin + '/js/luckysheet/css/luckysheet.css',
|
'./js/luckysheet/css/luckysheet.css',
|
||||||
window.location.origin + '/js/luckysheet/assets/iconfont/iconfont.css',
|
'./js/luckysheet/assets/iconfont/iconfont.css',
|
||||||
//
|
//
|
||||||
window.location.origin + '/js/luckysheet/plugins/js/plugin.js',
|
'./js/luckysheet/plugins/js/plugin.js',
|
||||||
window.location.origin + '/js/luckysheet/luckysheet.umd.js',
|
'./js/luckysheet/luckysheet.umd.js',
|
||||||
], () => {
|
], () => {
|
||||||
this.loadIng = false;
|
this.loadIng = false;
|
||||||
this.bakValue = JSON.stringify(this.value);
|
this.bakValue = JSON.stringify(this.value);
|
||||||
@ -99,7 +99,7 @@ export default {
|
|||||||
],
|
],
|
||||||
lang: lang,
|
lang: lang,
|
||||||
loading: {
|
loading: {
|
||||||
image: 'image://' + window.location.origin + '/js/luckysheet/css/loading.gif'
|
image: 'image://.js/luckysheet/css/loading.gif'
|
||||||
},
|
},
|
||||||
data: value ? $A.cloneJSON(value) : [
|
data: value ? $A.cloneJSON(value) : [
|
||||||
{
|
{
|
||||||
|
@ -212,7 +212,7 @@
|
|||||||
return {
|
return {
|
||||||
inline: isFull ? false : this.inline,
|
inline: isFull ? false : this.inline,
|
||||||
selector: (isFull ? '#T_' : '#') + this.id,
|
selector: (isFull ? '#T_' : '#') + this.id,
|
||||||
base_url: $A.serverUrl('js/tinymce'),
|
base_url: './js/tinymce',
|
||||||
language: "zh_CN",
|
language: "zh_CN",
|
||||||
toolbar: this.toolbar,
|
toolbar: this.toolbar,
|
||||||
plugins: this.plugin(isFull),
|
plugins: this.plugin(isFull),
|
||||||
|
31
resources/assets/js/functions/common.js
vendored
31
resources/assets/js/functions/common.js
vendored
@ -220,37 +220,6 @@
|
|||||||
return serverUrl + str;
|
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
|
* @param key
|
||||||
|
@ -296,7 +296,7 @@ export default {
|
|||||||
}
|
}
|
||||||
this._notificationId = id;
|
this._notificationId = id;
|
||||||
this.notificationClass.replaceOptions({
|
this.notificationClass.replaceOptions({
|
||||||
icon: $A.serverUrl('images/logo.png'),
|
icon: './images/logo.png',
|
||||||
body: body,
|
body: body,
|
||||||
data: data,
|
data: data,
|
||||||
tag: "dialog",
|
tag: "dialog",
|
||||||
|
3
resources/assets/js/store/actions.js
vendored
3
resources/assets/js/store/actions.js
vendored
@ -1424,10 +1424,9 @@ export default {
|
|||||||
}
|
}
|
||||||
let url = window.webSocketConfig.URL;
|
let url = window.webSocketConfig.URL;
|
||||||
if (!url) {
|
if (!url) {
|
||||||
url = window.location.origin;
|
url = state.method.apiUrl('/ws');
|
||||||
url = url.replace("https://", "wss://");
|
url = url.replace("https://", "wss://");
|
||||||
url = url.replace("http://", "ws://");
|
url = url.replace("http://", "ws://");
|
||||||
url += "/ws";
|
|
||||||
}
|
}
|
||||||
url += "?action=web&token=" + state.userToken;
|
url += "?action=web&token=" + state.userToken;
|
||||||
//
|
//
|
||||||
|
13
resources/assets/js/store/state.js
vendored
13
resources/assets/js/store/state.js
vendored
@ -1,13 +1,20 @@
|
|||||||
const method = {
|
const method = {
|
||||||
apiUrl(str) {
|
apiUrl(str) {
|
||||||
|
let origin;
|
||||||
|
origin = window.location.origin;
|
||||||
|
origin = 'http://127.0.0.1:2222';
|
||||||
|
//
|
||||||
if (str.substring(0, 2) === "//" ||
|
if (str.substring(0, 2) === "//" ||
|
||||||
str.substring(0, 7) === "http://" ||
|
str.substring(0, 7) === "http://" ||
|
||||||
str.substring(0, 8) === "https://" ||
|
str.substring(0, 8) === "https://" ||
|
||||||
str.substring(0, 6) === "ftp://" ||
|
str.substring(0, 6) === "ftp://") {
|
||||||
str.substring(0, 1) === "/") {
|
|
||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
return window.location.origin + '/api/' + str;
|
if (str.substring(0, 1) == "/") {
|
||||||
|
return origin + str;
|
||||||
|
} else {
|
||||||
|
return origin + "/api/" + str;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
date2string(params, format) {
|
date2string(params, format) {
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 42px;
|
height: 42px;
|
||||||
min-width: 900px;
|
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
box-shadow: 0 1px 5px 0 rgba(0, 0, 0, 0.05);
|
box-shadow: 0 1px 5px 0 rgba(0, 0, 0, 0.05);
|
||||||
position: relative;
|
position: relative;
|
||||||
|
6
resources/assets/sass/taskfont.scss
vendored
6
resources/assets/sass/taskfont.scss
vendored
@ -1,8 +1,8 @@
|
|||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'taskfont'; /* Project id 2583385 */
|
font-family: 'taskfont'; /* Project id 2583385 */
|
||||||
src: url('//at.alicdn.com/t/font_2583385_vbi15jduv0n.woff2?t=1625644968453') format('woff2'),
|
src: url('../css/fonts/taskfont.woff2') format('woff2'),
|
||||||
url('//at.alicdn.com/t/font_2583385_vbi15jduv0n.woff?t=1625644968453') format('woff'),
|
url('../css/fonts/taskfont.woff') format('woff'),
|
||||||
url('//at.alicdn.com/t/font_2583385_vbi15jduv0n.ttf?t=1625644968453') format('truetype');
|
url('../css/fonts/taskfont.ttf') format('truetype');
|
||||||
}
|
}
|
||||||
|
|
||||||
.taskfont {
|
.taskfont {
|
||||||
|
BIN
resources/assets/statics/public/css/fonts/taskfont.ttf
Normal file
BIN
resources/assets/statics/public/css/fonts/taskfont.ttf
Normal file
Binary file not shown.
BIN
resources/assets/statics/public/css/fonts/taskfont.woff
Normal file
BIN
resources/assets/statics/public/css/fonts/taskfont.woff
Normal file
Binary file not shown.
BIN
resources/assets/statics/public/css/fonts/taskfont.woff2
Normal file
BIN
resources/assets/statics/public/css/fonts/taskfont.woff2
Normal file
Binary file not shown.
1
webpack.mix.js
vendored
1
webpack.mix.js
vendored
@ -28,6 +28,7 @@ mix
|
|||||||
.sass('resources/assets/sass/app.scss', 'public/css')
|
.sass('resources/assets/sass/app.scss', 'public/css')
|
||||||
.webpackConfig({
|
.webpackConfig({
|
||||||
output: {
|
output: {
|
||||||
|
publicPath: './',
|
||||||
chunkFilename: function ({chunk}) {
|
chunkFilename: function ({chunk}) {
|
||||||
return `js/build/${mixBuildName(chunk.id)}.js`
|
return `js/build/${mixBuildName(chunk.id)}.js`
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user