Skip to content

Commit 00fdb3c

Browse files
committed
去除冗余css
1 parent 7866d38 commit 00fdb3c

File tree

7 files changed

+20
-14
lines changed

7 files changed

+20
-14
lines changed

src/Terminal.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import './css/vue-json-viewer.css'
1+
import 'vue-json-viewer/style.css'
22
import sizeof from 'object-sizeof'
33
import {_dateFormat, _isEmpty, _nonEmpty, _sleep} from "./Util.js";
44
import historyStore from "./HistoryStore.js";
5+
import TerminalObj from './TerminalObj.js'
56

67
export default {
78
name: 'Terminal',
@@ -120,7 +121,7 @@ export default {
120121
}
121122
},
122123
created() {
123-
this.$terminal.register(this.name, (type, options) => {
124+
TerminalObj.register(this.name, (type, options) => {
124125
if (type === 'pushMessage') {
125126
this._pushMessage(options)
126127
} else if (type === 'updateContext') {
@@ -166,7 +167,7 @@ export default {
166167
window.addEventListener('keydown', this.keydownListener);
167168
}, destroyed() {
168169
window.removeEventListener('keydown', this.keydownListener)
169-
this.$terminal.unregister(this.name)
170+
TerminalObj.unregister(this.name)
170171
}, watch: {
171172
command(val, oldVal) {
172173
if (!this.cmdChange) {

src/Terminal.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@
8282
</select>
8383
</span>
8484
<div v-else-if="item.type === 'code'" class="t-code">
85-
<div v-if="$terminalOptions.highlight">
85+
<div v-if="require('./TerminalObj').getOptions().highlight">
8686
<highlightjs ref="highlightjs" autodetect :code="item.content"/>
8787
</div>
88-
<div v-else-if="$terminalOptions.codemirror">
89-
<codemirror ref="codemirror" v-model="item.content" :options="$terminalOptions.codemirror"/>
88+
<div v-else-if="require('./TerminalObj').getOptions().codemirror">
89+
<codemirror ref="codemirror" v-model="item.content" :options="require('./TerminalObj').getOptions().codemirror"/>
9090
</div>
9191
<div v-else style="background: rgb(39 50 58);">
9292
<pre style="padding: 1em;margin: 0"><code style="font-size: 15px" v-html="item.content"></code></pre>

src/TerminalObj.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ const instance = new TerminalObj()
44

55
function TerminalObj() {
66
let pool = {}
7+
let options = {}
8+
9+
let setOptions = function (ops) {
10+
options = ops
11+
}
12+
13+
let getOptions = function () {
14+
return options
15+
}
716

817
let register = function (name, listener) {
918
if (pool[name] != null) {
@@ -36,6 +45,8 @@ function TerminalObj() {
3645
}
3746

3847
return {
48+
setOptions: setOptions,
49+
getOptions: getOptions,
3950
post: post,
4051
register: register,
4152
unregister: unregister,

src/css/tomorrow-night-bright.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/css/vue-json-viewer.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/index.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@ let terminal = {}
66
terminal.install = function (Vue, options) {
77
Vue.use(JsonViewer)
88
if (options != null) {
9-
Vue.prototype.$terminalOptions = options
10-
} else {
11-
Vue.prototype.$terminalOptions = {}
9+
TerminalObj.setOptions(options)
1210
}
13-
Vue.prototype.$terminal = TerminalObj
1411
Vue.component(Terminal.name, Terminal)
1512
}
1613
export default terminal

webpack.config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ module.exports = {
2222
use: [
2323
'vue-style-loader',
2424
'css-loader'
25-
],
26-
exclude: path.resolve(__dirname, "node_modules")
25+
]
2726
},
2827
{
2928
test: /\.vue$/,

0 commit comments

Comments
 (0)