centaline-data-driven 1.2.36 → 1.2.37

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.
Files changed (8) hide show
  1. package/package.json +1 -1
  2. package/src/SearchList.vue +4 -4
  3. package/src/assets/ver.png +0 -0
  4. package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +8 -21
  5. package/src/centaline/dynamicSearchList/src/dynamicTableStats.vue +91 -49
  6. package/src/main.js +3 -3
  7. package/wwwroot/static/centaline/centaline-data-driven.js +1 -1
  8. package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "centaline-data-driven",
3
- "version": "1.2.36",
3
+ "version": "1.2.37",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/src/SearchList.vue CHANGED
@@ -1,9 +1,9 @@
1
1
  <template>
2
2
  <div id="app-search" style="height:100%;position: fixed;">
3
- <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
3
+ <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-layout'" :searchDataApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-list'"></ct-searchlist>
4
4
 
5
5
  <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
6
- <ct-searchlist :searchConditionApi="'/PropertyPublishLogList/getLayoutOfSearch'" :searchDataApi="'/PropertyPublishLogList/getListOfSearchModel'"></ct-searchlist>
6
+ <!-- <ct-searchlist :searchConditionApi="'/PropertyPublishLogList/getLayoutOfSearch'" :searchDataApi="'/PropertyPublishLogList/getListOfSearchModel'"></ct-searchlist> -->
7
7
 
8
8
  <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
9
9
  :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
@@ -23,8 +23,8 @@
23
23
  name: 'DataDrivenSearch',
24
24
  data() {
25
25
  return {
26
- //para: { agentId: "1424932685198864386", estateId: "L201402181627000007233", estateName: "271医院宿舍区", pageOnly: "true", pageTitle: "销控房源列表" }
27
- para: {publishID: "1503900718229229568"}
26
+ para: {searchFields: {fields: []}, pageAttribute: {pageIndex: 1}, flagSearch: true}
27
+ // para: {publishID: "1503900718229229568"}
28
28
  // para: {paramKey: "PropertyStatusID", code: "002.001", name: "盘源状态", paramName: "盘源状态"}
29
29
  }
30
30
  },
package/src/assets/ver.png ADDED
Binary file
package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue CHANGED
@@ -463,6 +463,7 @@
463
463
  setTrLazyLoading() {
464
464
  this.pageRowMax = this.firstRow + this.displayRowNumber;
465
465
  this.pageRowMin = this.firstRow - this.displayRowNumber;
466
+ this.pageRowMin=this.pageRowMin>0?this.pageRowMin:0;
466
467
  if (this.pageRowMin > 0 && this.model.listData[this.pageRowMin].$rowspan === 0) {
467
468
  for (let i = this.pageRowMin; i >= 0; i--) {
468
469
  if (this.model.listData[i].$rowspan > 0) {
@@ -522,12 +523,8 @@
522
523
  self.isBusy = true;
523
524
  self.tableLoading = true;
524
525
  self.model.nextPage((rtn) => {
525
- if (rtn) {
526
- self.$nextTick(() => {
527
- self.calculatingRowHeight();
528
- self.getScrollAttr();
529
-
530
- });
526
+ if (rtn) {
527
+ self.getScrollAttr();
531
528
  self.$forceUpdate();
532
529
  }
533
530
  self.isBusy = false;
@@ -833,25 +830,15 @@
833
830
  },
834
831
  calculatingRowHeight() {
835
832
  let self = this;
836
- let count = 0;
837
833
 
838
834
  //查询出所有没有设置$heigth的数据并重新设置$heigth
839
- let notHeigthData = self.model.listData.filter(item => {
840
- return item.$heigth === undefined || item.$heigth <= 0
841
- })
842
- if (notHeigthData && notHeigthData.length > 0) {
843
- notHeigthData.forEach((v, i) => {
835
+ self.model.listData.forEach((item, i) => {
836
+ if(item.$heigth === undefined || item.$heigth <= 0){
844
837
  if (self.$refs["rows." + i] && self.$refs["rows." + i].length > 0) {
845
- self.$set(v, "$heigth", self.$refs["rows." + i][0].clientHeight);
838
+ self.$set(item, "$heigth", self.$refs["rows." + i][0].clientHeight);
846
839
  }
847
- });
848
- }
849
-
850
- //for (let i = 0; i < self.model.listData.length; i++) {
851
- // if (self.$refs[]) {
852
- // }
853
- //}
854
- //self.$refs
840
+ }
841
+ });
855
842
  },
856
843
  updateCurrentRow(router,data) {
857
844
  let self = this;
package/src/centaline/dynamicSearchList/src/dynamicTableStats.vue CHANGED
@@ -4,25 +4,46 @@
4
4
  <!--计算占用宽度-->
5
5
  <div style="position:relative" v-if="FlagStatistics">
6
6
  <div style="position:absolute;left:-10000px" class="tab-list">
7
- <label v-for="(item, index) in data" class="btnTab" :ref="'StatisticsItem'+index">
8
- <span :class="[selectStats==item.code1?'active':'']">{{item.controlLabel}}</span></label>111
7
+ <label v-for="(item, index) in data" class="btnTab" :ref="'StatisticsItem'+index">
8
+ {{item.controlLabel}}
9
+ </label>
9
10
  </div>
10
11
  </div>
11
12
  <!--展示-->
12
13
  <div v-if="FlagStatistics" class="tab-list">
13
14
  <template v-if="showData.length===1">
14
- <label class="btnTab" v-for="(item, index) in showData[0]" @click="handleClick($event,item)">
15
- <span :class="[selectStats==item.code1?'active':'']">{{item.controlLabel}}</span></label>
15
+ <div v-for="(item, index) in showData[0]" @click="handleClick($event,item)">
16
+ <ul class="btnTab">
17
+ <li :class="[selectStats==item.code1+'*'+item.controlLabel?'activecolor':'']">{{item.controlLabel}}</li>
18
+ <li class="tdcenter">
19
+ <span :class="[selectStats==item.code1+'*'+item.controlLabel?'active':'']"></span>
20
+ </li>
21
+ </ul>
22
+ </div>
16
23
  </template>
17
24
  <template v-else-if="showData.length>1">
18
- <label class="btnTab" v-for="(item, index) in showData[0]" @click="handleClick($event,item)">
19
- <span :class="[selectStats==item.code1?'active':'']">{{item.controlLabel}}</span></label>
25
+ <div v-for="(item, index) in showData[0]" @click="handleClick($event,item)">
26
+ <ul class="btnTab">
27
+ <li :class="[selectStats==item.code1+'*'+item.controlLabel?'activecolor':'']">{{item.controlLabel}}</li>
28
+ <li class="tdcenter">
29
+ <span :class="[selectStats==item.code1+'*'+item.controlLabel?'active':'']"></span>
30
+ </li>
31
+ </ul>
32
+ </div>
20
33
  <el-popover :append-to-table="option.appendId?option.appendId:''"
21
34
  :placement="option.placement?option.placement:'left'"
22
35
  :trigger="option.trigger?option.trigger:''"
23
- class="tabl-el">
24
- <label class="tablf" v-for="(item, index) in showData[1]" @click="handleClick($event,item)">
25
- <span :class="[selectStats==item.code1?'active':'']">{{item.controlLabel}}</span></label>
36
+ >
37
+ <div v-if="FlagStatistics" class="tab-list" style="border-bottom:none">
38
+ <div class="tablf" v-for="(item, index) in showData[1]" @click="handleClick($event,item)" style="text-align:left">
39
+ <ul class="btnTab">
40
+ <li :class="[selectStats==item.code1+'*'+item.controlLabel?'activecolor':'']">{{item.controlLabel}}</li>
41
+ <li class="tdcenter">
42
+ <span :class="[selectStats==item.code1+'*'+item.controlLabel?'active':'']"></span>
43
+ </li>
44
+ </ul>
45
+ </div>
46
+ </div>
26
47
  <i slot="reference" class="icon-more"></i>
27
48
 
28
49
  </el-popover>
@@ -71,8 +92,10 @@
71
92
  self.data = data.source.content;
72
93
  self.selectVa = "";
73
94
  if (self.data.length > 0) {
74
- if (self.selectStats == []) {
75
- self.selectStats = self.data[0].code1;
95
+ let i = self.data.findIndex(v => self.selectStats === (v.code1 + "*" + v.controlLabel));
96
+
97
+ if (i == -1 || self.selectStats == []) {
98
+ self.selectStats = self.data[0].code1 + "*" + self.data[0].controlLabel;
76
99
  }
77
100
  self.FlagStatistics = true;
78
101
  self.showStats();
@@ -115,12 +138,12 @@
115
138
 
116
139
  }
117
140
 
118
- self.$emit('setTableHeight');
141
+ self.$emit('setTableHeight');
119
142
  });
120
143
  },
121
144
  handleClick(ev, obj) {
122
145
  var self = this;
123
- self.selectStats = obj.code1;
146
+ self.selectStats = obj.code1 + "*" + obj.controlLabel;
124
147
  var fields = self.model.searchData(obj.fieldName1, obj.code1, obj.searchOperation, obj.searchDataType);
125
148
  var model = {
126
149
  "searchData": fields
@@ -152,51 +175,70 @@
152
175
  <style>
153
176
  </style>
154
177
 
155
- <style>
178
+ <style>
156
179
  .tab-list {
157
180
  border-bottom: 2px solid #E0E0E0;
158
181
  margin-bottom: 10px;
159
- padding-bottom: 5px;
182
+ padding-bottom: 5px;
183
+ height: 30px;
160
184
  }
161
185
 
162
- .tab-list .btnTab {
163
- font-size: 14px !important;
164
- font-weight: bold;
165
- padding: 0px 20px 0px 20px;
166
-
186
+ .tab-list .btnTab {
187
+ font-size: 14px !important;
188
+ font-weight: bold;
189
+ padding: 0px 20px 0px 20px;
190
+ cursor: pointer;
191
+ float: left;
192
+ list-style-type: none;
193
+ }
167
194
 
168
- }
195
+ .tab-list .btnTab:hover, .tab-list .tablf:hover {
196
+ color: #ee5d56;
197
+ }
169
198
 
170
- .tab-list .btnTab:hover ,.tab-list .tablf:hover{
171
- color: #ee5d56;
172
- }
173
- .tab-list .tabl-el{
199
+ .tab-list .tabl-el {
174
200
  max-width: 150px;
175
201
  box-shadow: 0 6px 12px rgb(0 0 0 / 18%);
176
202
  }
177
- .tab-list .tablf{
178
- font-size: 14px !important;
179
- font-weight: bold;
180
- text-align: center;
181
- padding: 5px 10px;
182
- display: block;
183
- }
184
- .tab-list .active {
185
- color: #ee5d56 !important;
186
- border-bottom: solid 3px #ee5d56 !important;
187
- background: none;
188
- border-radius: 0 !important;
189
- }
190
- .tab-list .btnTab span{
191
-
192
- }
193
203
 
194
- .tab-list .icon-more {
195
- background: url(../../../assets/vertical.png)no-repeat;
196
- background-size: 80% 80%;
197
- height: 20px;
198
- width: 7px;
199
- display: inline-block;
200
- vertical-align: bottom;
201
- }
204
+ .tab-list .tablf {
205
+ font-size: 14px !important;
206
+ font-weight: bold;
207
+ text-align: center;
208
+ padding: 15px 10px;
209
+ display: block;
210
+ }
211
+
212
+ .tab-list .tdcenter {
213
+ line-height: 1px;
214
+ height: 1px;
215
+ text-align: center;
216
+ }
217
+
218
+ .tab-list .active {
219
+ color: #ee5d56 !important;
220
+ /* border-bottom-right-radius: 12px !important; */
221
+ /* border-top-right-radius: 11px; */
222
+ width: 20px;
223
+ background: -webkit-linear-gradient(right, #dfdede,#ff0c00);
224
+ height: 4px;
225
+ }
226
+
227
+ .tab-list .activecolor {
228
+ color: #ee5d56 !important;
229
+ }
230
+
231
+
232
+ .tab-list .btnTab span {
233
+ display: inline-block;
234
+ }
235
+
236
+ .tab-list .icon-more {
237
+ background: url(../../../assets/ver.png)no-repeat;
238
+ background-size: 80% 80%;
239
+ height: 20px;
240
+ width: 7px;
241
+ display: inline-block;
242
+ vertical-align: bottom;
243
+ }
202
244
  </style>
package/src/main.js CHANGED
@@ -12,8 +12,8 @@ Vue.use(ElementUI, { size: 'mini'});
12
12
  // 关闭生产模式下给出的提示
13
13
  Vue.config.productionTip = false;
14
14
  Vue.use(centaline, {
15
- baseUrl: "http://10.88.22.46:7070/v1/form/router",
16
- // baseUrl: "http://tjcptest.centaline.com.cn/v1/form/router",
15
+ // baseUrl: "http://10.88.22.46:7070/v1/form/router",
16
+ baseUrl: "http://10.1.245.111:38028/v1/form/router",
17
17
  // baseUrl: "http://10.88.22.46:7070/",
18
18
  // flagRouterSelf: true,
19
19
  zindex: 999,
@@ -36,7 +36,7 @@ Vue.use(centaline, {
36
36
  // 获取请求头
37
37
  getRequestHeaders: function () {
38
38
  return {
39
- oldToken: '4195d16c-9b1d-43b2-b6de-ef4a9f2b7d44',
39
+ oldToken: '5e730b63-1439-4850-9e88-4a83c8609525',
40
40
  estateId: '20210729104021C49F04B55C50F6AF58',
41
41
  originalRequestURL: 'http://10.88.22.67:8080',
42
42
  Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE0NmU5ZjEzLTVjMmYtNGVlMy1hM2U5LWIxM2QyZThjZTBhZSJ9.Gl8K5lbG7t5DyCqouu7Ux7Oh9xuAxqdOXr4JnoHCN-YwC3b2zPO-C2sHbYJUZHYQPa7kTNRmg1xJiwugpVo5Xw',