Skip to content

Commit 4ec99ac

Browse files
peacewongpeacewong
authored
Merge pull request #12 from xtt55/0.7.0
fix and optimizing somethings.
2 parents 283015b + 643a023 commit 4ec99ac

File tree

25 files changed

+1332
-420
lines changed

25 files changed

+1332
-420
lines changed

‎src/js/component/editor/index.scss‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,24 @@
44
height: 100%;
55
width: 100%;
66

7-
.monaco-editor {
7+
.monaco-editor.vs {
88
.overflow-guard {
99
.monaco-scrollable-element {
10-
left: 82px !important;
10+
.token {
11+
&.log-error {
12+
color: red;
13+
font-weight: bold;
14+
}
15+
&.log-warn {
16+
color: yellow;
17+
}
18+
&.log-info {
19+
color: blue;
20+
}
21+
&.log-date {
22+
color: green;
23+
}
24+
}
1125
}
1226
}
1327
}

‎src/js/component/editor/keyword/python.js‎

Lines changed: 20 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import _ from 'lodash';
2-
import globalcache from '@js/service/db/globalcache.js';
1+
import { map, isEmpty } from 'lodash';
2+
import util from '../util';
33
import storage from '@/js/helper/storage';
44

55
const pyKeywordInfoProposals = [
@@ -215,69 +215,55 @@ const pyKeywordInfoProposals = [
215215
},
216216
];
217217

218-
/**
219-
* 对拿到的数据格式化成completionList格式
220-
* @param {*} monaco 编辑器
221-
* @param {*} list 格式化列表
222-
* @return {*} 格式化后的列表
223-
*/
224-
function completionListFormatter(monaco, list) {
225-
const formatList = [];
226-
list.forEach((item) => {
227-
if (item.udfType === 1 || item.udfType === 3) {
228-
formatList.push({
229-
label: item.udfName,
230-
kind: monaco.languages.CompletionItemKind.Function,
231-
insertText: item.udfName,
232-
detail: item.udfType > 2 ? '方法函数' : 'UDF函数',
233-
documentation: item.description,
234-
});
235-
}
236-
});
237-
return formatList;
238-
}
218+
let functionProposals = [];
239219

240220
export default {
241221
async register(monaco) {
242-
const userInfo = storage.get('userInfo');
243-
const userName = userInfo.basic.userName;
244-
const globalCache = await globalcache.getCache(userName);
222+
const lang = 'python';
245223

246-
const pyProposals = _.map(pyKeywordInfoProposals, (item) => ({
224+
const pyProposals = map(pyKeywordInfoProposals, (item) => ({
247225
label: item.label.toLowerCase(),
248226
kind: monaco.languages.CompletionItemKind.Keyword,
249227
insertText: item.insertText.toLowerCase(),
250228
detail: item.detail,
251229
documentation: item.documentation,
252230
}));
253231

254-
let functionProposals = completionListFormatter(monaco, globalCache.fnList);
232+
util.getHiveList(monaco, lang).then((list) => {
233+
functionProposals = list.udfProposals;
234+
});
255235

256236
monaco.languages.registerCompletionItemProvider('python', {
257237
triggerCharacters: 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789._'.split(''),
258238
async provideCompletionItems(model, position) {
239+
if (isEmpty(functionProposals)) {
240+
util.getHiveList(monaco, lang).then((list) => {
241+
functionProposals = list.udfProposals;
242+
});
243+
}
244+
259245
const textUntilPosition = model.getValueInRange({
260246
startLineNumber: position.lineNumber,
261247
startColumn: 1,
262248
endLineNumber: position.lineNumber,
263249
endColumn: position.column,
264250
});
265-
let completionList = null;
266251
const keywordMatch = textUntilPosition.match(/([^"]*)?$/i);
267252
const functionMatch = textUntilPosition.match(/\s+/i);
268253
if (functionMatch) {
269254
const isFunctionChange = storage.get('isFunctionChange_python');
270255
// 如果函数发生load状态变化，则重新从indexdb中获取fnlist
271256
if (isFunctionChange) {
272257
storage.set('isFunctionChange_python', false);
273-
const globalCache = await globalcache.getCache(userName);
274-
functionProposals = completionListFormatter(monaco, globalCache.fnList);
258+
await util.getHiveList(monaco, lang).then((list) => {
259+
return list.udfProposals;
260+
});
275261
}
276-
completionList = functionProposals;
262+
return functionProposals;
277263
} else if (keywordMatch) {
278-
completionList = pyProposals;
264+
return pyProposals;
279265
}
280-
return completionList;
266+
return [];
281267
},
282268
});
283269
},

‎src/js/component/panel/panelItem.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export default {
103103
} else if (this.isDiy) {
104104
styleAttr = Object.assign({
105105
'position': 'fixed',
106-
'z-index': 1100,
106+
'z-index': 100,
107107
}, this.diyStyle);
108108
} else {
109109
styleAttr = {
@@ -112,7 +112,7 @@ export default {
112112
'right': 0,
113113
'top': 0,
114114
'bottom': 0,
115-
'z-index': 1100,
115+
'z-index': 100,
116116
};
117117
}
118118
return styleAttr;

‎src/js/module/globalHistory/expand.js‎ renamed to ‎src/js/component/table/expand.js‎

File renamed without changes.

‎src/js/module/globalHistory/table.vue‎ renamed to ‎src/js/component/table/historyTable.vue‎

Lines changed: 57 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
:key="th.key"
1717
:style="{'min-width': th.width + 'px', 'text-align': th.align}"
1818
class="we-table-thead-cell">
19-
{{ th.title }}
19+
{{ th.title || '#' }}
2020
</th>
2121
</tr>
2222
</thead>
@@ -26,21 +26,24 @@
2626
:key="index"
2727
class="we-table-row">
2828
<td
29-
v-for="(th) in columns"
29+
v-for="(th, index) in columns"
3030
:key="th.key"
3131
:style="{'text-align': th.align}"
3232
class="we-table-row-cell">
3333
<div
3434
class="we-table-row-label"
35-
:style="{'width': th.width + 'px'}"
36-
:class="{'ellipsis': th.ellipsis}">
35+
:style="{'width': th.width ? th.width + 'px' : getComputedWidth(th)}"
36+
:class="{'ellipsis': th.ellipsis}"
37+
:title="th.ellipsis ? td[th.key] : ''">
3738
<table-expand
3839
v-if="th.renderType"
3940
:row="td"
4041
:column="th"
4142
:index="index"
4243
:render="renderComponent({type: th.renderType, cell: td, key: th.key, params: th.renderParams})"></table-expand>
43-
<span v-else>{{ td[th.key] }}</span>
44+
<span
45+
v-else
46+
:class="th.className">{{ td[th.key] }}</span>
4447
</div>
4548
</td>
4649
</tr>
@@ -52,6 +55,7 @@
5255
import moment from 'moment';
5356
import util from '@/js/util';
5457
import TableExpand from './expand';
58+
import elementResizeEvent from '@js/helper/elementResizeEvent';
5559
export default {
5660
components: {
5761
TableExpand,
@@ -69,9 +73,15 @@ export default {
6973
},
7074
data() {
7175
return {
72-
76+
offsetWidth: 0,
7377
};
7478
},
79+
mounted() {
80+
elementResizeEvent.bind(this.$el, this.resize);
81+
},
82+
beforeDestroy: function() {
83+
elementResizeEvent.unbind(this.$el);
84+
},
7585
methods: {
7686
renderComponent({ type, cell, key, params }) {
7787
const value = cell[key];
@@ -88,6 +98,10 @@ export default {
8898
return this.renderFormatTime(value);
8999
case 'convertTime':
90100
return this.renderConvertTime(value);
101+
case 'index':
102+
return this.renderIndex(cell);
103+
case 'a':
104+
return this.renderA(value, cell, params);
91105
default:
92106
return null;
93107
}
@@ -244,6 +258,43 @@ export default {
244258
return h('span', {}, util.convertTimestamp(value));
245259
};
246260
},
261+
renderIndex(cell) {
262+
const index = this.data.findIndex((item) => item.taskID === cell.taskID);
263+
return (h) => {
264+
return h('span', {}, index + 1);
265+
};
266+
},
267+
renderA(value, cell, params) {
268+
return (h) => {
269+
return h('div', {
270+
style: {
271+
cursor: 'pointer',
272+
color: '#ed4014',
273+
},
274+
on: {
275+
click: (ev) => {
276+
params.action({ row: cell });
277+
},
278+
},
279+
}, value);
280+
};
281+
},
282+
getComputedWidth(current) {
283+
this.offsetWidth = this.$el && this.$el.offsetWidth;
284+
let usedWidth = 0;
285+
const unHasWidthList = [];
286+
this.columns.forEach((item) => {
287+
const width = item.width || 0;
288+
usedWidth += width;
289+
if (!item.width) {
290+
unHasWidthList.push(item);
291+
}
292+
});
293+
return (this.offsetWidth - 30 - usedWidth) / unHasWidthList.length + 'px';
294+
},
295+
resize() {
296+
this.offsetWidth = this.$el && this.$el.offsetWidth;
297+
},
247298
},
248299
};
249300
</script>

‎src/js/component/table/index.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
import WeTable from './table.vue'
1+
import WeTable from './table.vue';
2+
import historyTable from './historyTable.vue';
23

3-
export default WeTable
4+
export default {
5+
WeTable,
6+
historyTable,
7+
};

‎src/js/component/table/index.scss‎

Lines changed: 100 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,10 @@ $border-color : #e0e0e0;
9292
border-bottom: 1px solid $border-color;
9393
}
9494
.we-column-item{
95-
height: 42px;
96-
overflow: hidden;
97-
white-space: nowrap;
98-
text-overflow: ellipsis;
95+
height: 67px;
9996
border-bottom: 1px solid $border-color;
100-
padding: 12px 0 12px 10px;
97+
padding: 6px;
98+
word-break: break-all;
10199
&.odd{
102100
background: rgb(250, 250, 250)
103101
}
@@ -108,4 +106,100 @@ $border-color : #e0e0e0;
108106
color: red;
109107
font-style: italic;
110108
}
111-
}
109+
.we-column-item-content {
110+
height: 100%;
111+
display: flex;
112+
align-items: center;
113+
justify-content: center;
114+
overflow-y: auto;
115+
}
116+
}
117+
.hidden-div {
118+
.hidden-div-item {
119+
padding: 12px 10px 12px 10px;
120+
word-break: break-all;
121+
}
122+
}
123+
.we-table-wrap {
124+
overflow: auto;
125+
display: block;
126+
.we-table {
127+
border: 1px solid #dcdee2;
128+
table-layout: fixed;
129+
.we-table-thead {
130+
background-color: #2d8cf0;
131+
color: #fff;
132+
.we-table-thead-cell {
133+
border-right: 1px solid #dcdee2;
134+
border-bottom: 1px solid #dcdee2;
135+
min-width: 0;
136+
height: 48px;
137+
box-sizing: border-box;
138+
text-align: left;
139+
text-overflow: ellipsis;
140+
vertical-align: middle;
141+
}
142+
}
143+
.we-table-row {
144+
height: 40px;
145+
&:nth-child(2n) {
146+
background-color: #f8f8f9;
147+
}
148+
&:hover {
149+
background-color: #ebf7ff;
150+
}
151+
.we-table-row-cell {
152+
border-right: 1px solid #dcdee2;
153+
border-bottom: 1px solid #dcdee2;
154+
min-width: 0;
155+
height: 48px;
156+
box-sizing: border-box;
157+
text-align: left;
158+
text-overflow: ellipsis;
159+
vertical-align: middle;
160+
.we-table-row-label {
161+
line-height: 20px;
162+
padding-left: 18px;
163+
padding-right: 18px;
164+
overflow: hidden;
165+
text-overflow: ellipsis;
166+
white-space: normal;
167+
word-break: break-all;
168+
-webkit-box-sizing: border-box;
169+
box-sizing: border-box;
170+
&.ellipsis {
171+
text-align: left;
172+
word-break: keep-all;
173+
white-space: nowrap;
174+
overflow: hidden;
175+
text-overflow: ellipsis;
176+
}
177+
.render-btn {
178+
color: #515a6e;
179+
background-color: transparent;
180+
border-color: transparent;
181+
padding: 1px 7px 2px;
182+
font-size: 12px;
183+
border-radius: 3px;
184+
display: inline-block;
185+
margin-bottom: 0;
186+
font-weight: 400;
187+
text-align: center;
188+
cursor: pointer;
189+
background-image: none;
190+
border: 1px solid transparent;
191+
white-space: nowrap;
192+
border-radius: 4px;
193+
transition: color .2s linear,background-color .2s linear,border .2s linear,box-shadow .2s linear;
194+
&:hover {
195+
color: #57a3f3;
196+
background-color: #fff;
197+
border-color: transparent;
198+
text-decoration: none;
199+
}
200+
}
201+
}
202+
}
203+
}
204+
}
205+
}

0 commit comments

Comments
 (0)