centaline-data-driven 1.4.94 → 1.4.95
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/SearchTree.vue +2 -2
- package/src/centaline/css/common.css +0 -1
- package/src/centaline/css/max.css +58 -6
- package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue +2 -2
- package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue +2 -2
- package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +2 -3
- package/src/main.js +3 -3
- package/wwwroot/static/centaline/centaline-data-driven.js +3 -3
- package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
package/package.json
CHANGED
package/src/SearchTree.vue
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div id="app-Tree" style="height:100%;position: fixed;width:100%">
|
|
3
3
|
<ct-treelist :flagsearch="true" :apiParam="apiParam" :leftWidth="'280'"
|
|
4
|
-
:searchConditionApi="'/
|
|
5
|
-
:searchDataApi="'/
|
|
4
|
+
:searchConditionApi="'/orgtree/getLayoutOfSearch'"
|
|
5
|
+
:searchDataApi="'/orgtree/getList'" @loaded="loaded"></ct-treelist>
|
|
6
6
|
<ct-dialog-list></ct-dialog-list>
|
|
7
7
|
</div>
|
|
8
8
|
</template>
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
/* 查询搜索 */
|
|
3
|
-
.max-search-btn{
|
|
3
|
+
.max-search-btn,.max-more-btn{
|
|
4
4
|
height: 26px;
|
|
5
5
|
background: var(--chinaRed) !important;
|
|
6
6
|
border-color: var(--chinaRed) !important;
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
color: #fff !important;
|
|
10
10
|
}
|
|
11
11
|
/* 重置按钮 更多按钮*/
|
|
12
|
-
.max-reset-btn
|
|
12
|
+
.max-reset-btn{
|
|
13
13
|
height: 26px;
|
|
14
14
|
background: #FFFFFF !important;
|
|
15
15
|
border-color: var(--chinaRed) !important;
|
|
@@ -200,6 +200,7 @@
|
|
|
200
200
|
.ct-so .ct-input_inner,.ct-text .showLabel input,.ct-text .showLabel label{
|
|
201
201
|
color: var(--centalineBlue) !important;
|
|
202
202
|
}
|
|
203
|
+
/* 多选框 */
|
|
203
204
|
.cover-list-item .el-checkbox__input.is-checked + .el-checkbox__label,.cover-list-item .el-checkbox__input.is-checked .el-checkbox__inner{
|
|
204
205
|
color: var(--centalineBlue) !important;
|
|
205
206
|
}
|
|
@@ -214,7 +215,12 @@
|
|
|
214
215
|
.cover-list-item .el-checkbox__input.is-focus .el-checkbox__inner,.cover-list-item .el-checkbox__inner:hover{
|
|
215
216
|
border-color:var(--centalineBlue) !important;
|
|
216
217
|
}
|
|
217
|
-
|
|
218
|
+
.cover-list-item .el-checkbox:hover .el-checkbox__inner{
|
|
219
|
+
border-color:var(--centalineBlue) !important;
|
|
220
|
+
}
|
|
221
|
+
.cover-list-item .el-checkbox:hover .el-checkbox__label{
|
|
222
|
+
color: var(--centalineBlue) !important;
|
|
223
|
+
}
|
|
218
224
|
.st-serach-screen .el-input-group__append, .st-serach-screen .el-input-group__prepend{
|
|
219
225
|
color: var(--centalineBlack)!important;
|
|
220
226
|
}
|
|
@@ -253,12 +259,34 @@
|
|
|
253
259
|
.hyperLinkList .el-button + .el-button{
|
|
254
260
|
margin-left: 0!important;
|
|
255
261
|
}
|
|
262
|
+
/* 弹窗 单选按钮鼠标移上 */
|
|
263
|
+
.field-top .ct-radios .el-radio__inner:hover{
|
|
264
|
+
border-color: var(--centalineBlue) !important;
|
|
265
|
+
}
|
|
266
|
+
.field-top .ct-radios .el-radio:hover .el-radio__input .el-radio__inner{
|
|
267
|
+
border-color: var(--centalineBlue) !important;
|
|
268
|
+
}
|
|
269
|
+
.field-top .ct-radios .el-radio:hover .el-radio__label{
|
|
270
|
+
color: var(--centalineBlue) !important;
|
|
271
|
+
}
|
|
272
|
+
.field-top .ct-radios .el-radio.is-disabled:hover .el-radio__label{
|
|
273
|
+
color: #c0c4cc !important;
|
|
274
|
+
}
|
|
275
|
+
.field-top .ct-radios .el-radio.is-disabled:hover .el-radio__input .el-radio__inner{
|
|
276
|
+
border-color: #d6d6d6 !important;
|
|
277
|
+
}
|
|
278
|
+
.field-top .ct-radios .el-radio.is-checked:hover .el-radio__label{
|
|
279
|
+
color: var(--centalineBlue) !important;
|
|
280
|
+
}
|
|
281
|
+
.field-top .ct-radios .el-radio.is-checked:hover .el-radio__input .el-radio__inner{
|
|
282
|
+
border-color: var(--centalineBlue) !important;
|
|
283
|
+
}
|
|
256
284
|
.el-radio__input.is-checked .el-radio__inner {
|
|
257
|
-
border-color: var(--centalineBlue);
|
|
258
|
-
background: var(--centalineBlue);
|
|
285
|
+
border-color: var(--centalineBlue) !important;
|
|
286
|
+
background: var(--centalineBlue) !important;
|
|
259
287
|
}
|
|
260
288
|
.el-radio__input.is-checked + .el-radio__label {
|
|
261
|
-
color: var(--centalineBlue);
|
|
289
|
+
color: var(--centalineBlue) !important;
|
|
262
290
|
}
|
|
263
291
|
.ct-table-content .ct-table .ct-tr .cell img{
|
|
264
292
|
display: inherit;
|
|
@@ -318,3 +346,27 @@
|
|
|
318
346
|
background-color: var(--chinaRed) !important;
|
|
319
347
|
border-color: var(--chinaRed) !important;
|
|
320
348
|
}
|
|
349
|
+
/* 弹窗多选框 */
|
|
350
|
+
.field-top .el-checkbox__input.is-focus .el-checkbox__inner,.field-top .el-checkbox__inner:hover{
|
|
351
|
+
border-color:var(--centalineBlue) !important;
|
|
352
|
+
}
|
|
353
|
+
.field-top .el-checkbox__input.is-checked .el-checkbox__inner {
|
|
354
|
+
background-color:var(--centalineBlue) !important;;
|
|
355
|
+
border-color: var(--centalineBlue) !important;;
|
|
356
|
+
}
|
|
357
|
+
.field-top .el-checkbox:hover .el-checkbox__inner{
|
|
358
|
+
border-color:var(--centalineBlue) !important;
|
|
359
|
+
}
|
|
360
|
+
.field-top .ct-checkbox .el-checkbox.is-disabled:hover .el-checkbox__label{
|
|
361
|
+
color: #c0c4cc !important;
|
|
362
|
+
}
|
|
363
|
+
.field-top .ct-checkbox .el-checkbox.is-disabled:hover .el-checkbox__input .el-checkbox__inner{
|
|
364
|
+
border-color: #d6d6d6 !important;
|
|
365
|
+
}
|
|
366
|
+
.field-top .ct-checkbox .el-checkbox.is-checked:hover .el-checkbox__label{
|
|
367
|
+
color: var(--centalineBlue) !important;
|
|
368
|
+
}
|
|
369
|
+
.field-top .ct-checkbox .el-checkbox.is-checked:hover .el-checkbox__input .el-checkbox__inner{
|
|
370
|
+
border-color: var(--centalineBlue) !important;
|
|
371
|
+
}
|
|
372
|
+
|
|
@@ -60,9 +60,9 @@
|
|
|
60
60
|
@click="fieldClickHandler(model.actionRouters[2], $event)">
|
|
61
61
|
</component>
|
|
62
62
|
<img :class="{domDisabled:flagDisabledPrev,}" @click="clickPrevHandler"
|
|
63
|
-
src="../../../assets/
|
|
63
|
+
src="../../../assets/T1.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 10px;cursor: pointer;"/>
|
|
64
64
|
<img :class="{domDisabled:flagDisabledNext,}" @click="clickNextHandler"
|
|
65
|
-
src="../../../assets/
|
|
65
|
+
src="../../../assets/B1.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 10px;margin-right: 13px;cursor: pointer;"/>
|
|
66
66
|
</div>
|
|
67
67
|
</div>
|
|
68
68
|
</div>
|
|
@@ -58,10 +58,10 @@
|
|
|
58
58
|
@click="fieldClickHandler(model.actionRouters[2], $event)">
|
|
59
59
|
</component>
|
|
60
60
|
<img :class="{ domDisabled: flagDisabledPrev }" @click="clickPrevHandler"
|
|
61
|
-
src="../../../assets/
|
|
61
|
+
src="../../../assets/T1.png" alt=""
|
|
62
62
|
style=" width: 26px; height: 26px;vertical-align: bottom; margin-left: 10px;cursor: pointer;"/>
|
|
63
63
|
<img :class="{ domDisabled: flagDisabledNext }" @click="clickNextHandler"
|
|
64
|
-
src="../../../assets/
|
|
64
|
+
src="../../../assets/B1.png" alt=""
|
|
65
65
|
style=" width: 26px; height: 26px;vertical-align: bottom; margin-left: 10px; margin-right: 13px; cursor: pointer;"/>
|
|
66
66
|
</div>
|
|
67
67
|
</div>
|
|
@@ -144,9 +144,8 @@
|
|
|
144
144
|
|
|
145
145
|
<!--可点击的列-->
|
|
146
146
|
<template v-else-if="column.router">
|
|
147
|
-
<div v-if="column.router.rightField && row[column.router.rightField] === 0"></div>
|
|
148
|
-
<ct-tablecurrency v-else
|
|
149
|
-
:ref="'router' + column.router.id + rowindex"
|
|
147
|
+
<div v-if="column.router.rightField && row[column.router.rightField] === 0" v-html="row[column.id]"></div>
|
|
148
|
+
<ct-tablecurrency v-else :ref="'router' + column.router.id + rowindex"
|
|
150
149
|
:rowindex="rowindex" :align="column.attrs.align"
|
|
151
150
|
:class="column.autoRowHeight ? 'lineFeedCell' : 'cell'" :router="column.router"
|
|
152
151
|
:colValue="row[column.id]" :rowData="row" @click="rolRouterClickHandler">
|
package/src/main.js
CHANGED
|
@@ -50,14 +50,14 @@ Vue.use(centaline, {
|
|
|
50
50
|
getRequestHeaders: function () {
|
|
51
51
|
return {
|
|
52
52
|
oldToken: '0bbcf3e8-cf7e-42de-adef-af54e2158fe4',
|
|
53
|
-
token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.
|
|
53
|
+
token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe-yNZPs7Ay7M3bsAo2HIAhLgpURSDTGu6tRO3tf8YvXvH8zy3YwO1NLZTm1BKlxJXAdSqjaIBCTiI0uEEfp9AP8mC8dImtA30ClIQF7JhBMAol94rZuKMXaFCZfTmaHXhxZG0gLM_frWzhkeoltyed9vv7j3HGdn1lHOrCzCmR1BCbM0FslQJ36kQWnHAZzfwAAAP__.-drHT8BOA8s5JAVSiKV9_NdkJ8clUTrkXDRh9hF_o6I',
|
|
54
54
|
|
|
55
55
|
originalRequestURL: 'http://10.88.22.67:8080',
|
|
56
56
|
EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
|
|
57
57
|
estateId: '20210729104021C49F04B55C50F6AF58',
|
|
58
58
|
|
|
59
|
-
authObject: '{"currentEstate":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"665b7cc4bcb0c902a054498fdf23fab7","token":"","random":"
|
|
60
|
-
AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.
|
|
59
|
+
authObject: '{"currentEstate":{"estateId":"20170524095458338E35F467429530B4","estateName":"A%E5%AE%89%E5%B3%A6%E5%85%AC%E9%A6%86"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"665b7cc4bcb0c902a054498fdf23fab7","token":"","random":"dMxZQ","time":1682069635547,"sign":"a0604f3d4aa249de11ba42a563698b72"}',
|
|
60
|
+
AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImUyMTkyOTJiLTFjZDQtNGRiOS04YjQ1LWFjMDA2Y2Q3ZWFjMSJ9.Ki5iSJ1hoVpdZ_K9NRScKe7IwXKk3JOGx-a02XWPPL1914jpPZQmS6S-DQ752zepOqKOTELTtznMHGjw4cUUcw',
|
|
61
61
|
};
|
|
62
62
|
},
|
|
63
63
|
// 请求完成事件,可判断是否登录过期执行响应操作
|