centaline-data-driven 1.5.41 → 1.5.42

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 (25) hide show
  1. package/package.json +1 -1
  2. package/release-log.md +23 -0
  3. package/src/Detail.vue +3 -3
  4. package/src/SearchList.vue +6 -5
  5. package/src/centaline/dialogList/src/dialog.vue +17 -2
  6. package/src/centaline/dynamicDetail/src/dynamicCustomerSimpleDetail.vue +278 -49
  7. package/src/centaline/dynamicDetail/src/dynamicEstateBuildingDetail.vue +11 -11
  8. package/src/centaline/dynamicDetail/src/dynamicEstateSimpleDetail.vue +1 -1
  9. package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue +10 -11
  10. package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue +12 -11
  11. package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue +1 -1
  12. package/src/centaline/dynamicForm/src/dynamicForm.vue +1 -1
  13. package/src/centaline/dynamicPhotoSelect/src/dynamicPhotoSelect.vue +31 -0
  14. package/src/centaline/dynamicPhotoSelectList/src/dynamicPhotoSelectList.vue +31 -0
  15. package/src/centaline/dynamicRepeat/src/dynamicRepeat.vue +21 -14
  16. package/src/centaline/dynamicSearchList/src/dynamicSearchList.vue +10 -1
  17. package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue +1 -1
  18. package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +8 -2
  19. package/src/centaline/dynamicSearchListTab/src/dynamicSearchListOne.vue +10 -1
  20. package/src/centaline/loader/src/ctl/Detail.js +13 -0
  21. package/src/centaline/loader/src/ctl/Repeat.js +1 -1
  22. package/src/centaline/loader/src/ctl/SearchScreen.js +6 -6
  23. package/src/main.js +3 -3
  24. package/wwwroot/static/centaline/centaline-data-driven.js +361 -164
  25. package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
@@ -218,7 +218,7 @@
218
218
  </div>
219
219
  </div>
220
220
  <ct-searchlist v-if="model.searchConditionApiTags1" :key="'list' + listKey.toString() + refershKey"
221
- :pageHeight="'450px'" :from="'detail'" :apiParam="model.paramDataTags1" :flagFocus="false"
221
+ :pageHeight="model.appIDTags1=='Follow'?'675px':'450px'" :from="'detail'" :apiParam="model.paramDataTags1" :flagFocus="false"
222
222
  :searchConditionApi="model.searchConditionApiTags1" :searchDataApi="model.searchDataApiTags1">
223
223
  </ct-searchlist>
224
224
  </div>
@@ -383,11 +383,10 @@ export default {
383
383
  self.model.activeIndex1 = i.toString();
384
384
  if (self.model.tags1 && self.model.tags1[i]) {
385
385
  self.listKey = self.listKey + 1;
386
- self.model.searchConditionApiTags1 =
387
- self.model.tags1[i].searchConditionAction || "";
388
- self.model.searchDataApiTags1 =
389
- self.model.tags1[i].searchDataAction || "";
386
+ self.model.searchConditionApiTags1 = self.model.tags1[i].searchConditionAction || "";
387
+ self.model.searchDataApiTags1 = self.model.tags1[i].searchDataAction || "";
390
388
  self.model.paramDataTags1 = self.model.tags1[i].paramData || "";
389
+ self.model.appIDTags1 = self.model.tags1[i].appID || "";
391
390
  }
392
391
  }
393
392
  }
@@ -501,11 +500,10 @@ export default {
501
500
  this.model.activeIndex1 = i;
502
501
  if (this.model.tags1 && this.model.tags1[i]) {
503
502
  this.listKey = this.listKey + 1;
504
- this.model.searchConditionApiTags1 =
505
- this.model.tags1[i].searchConditionAction || "";
506
- this.model.searchDataApiTags1 =
507
- this.model.tags1[i].searchDataAction || "";
503
+ this.model.searchConditionApiTags1 = this.model.tags1[i].searchConditionAction || "";
504
+ this.model.searchDataApiTags1 = this.model.tags1[i].searchDataAction || "";
508
505
  this.model.paramDataTags1 = this.model.tags1[i].paramData || "";
506
+ this.model.appIDTags1 = this.model.tags1[i].appID || "";
509
507
  window.localStorage.setItem("detailtagkey", this.model.tags1[i].appID); //存储
510
508
  }
511
509
  },
@@ -519,6 +517,8 @@ export default {
519
517
  this.model.searchConditionApiTags1 = dropDownData[i].searchConditionAction || "";
520
518
  this.model.searchDataApiTags1 = dropDownData[i].searchDataAction || "";
521
519
  this.model.paramDataTags1 = dropDownData[i].paramData || "";
520
+ this.model.appIDTags1 = dropDownData[i].appID || "";
521
+
522
522
  //交换位置
523
523
  let lastItemIndex = this.showData[0].length - 1;
524
524
  let lastItem = this.showData[0][lastItemIndex];
@@ -1298,7 +1298,7 @@ export default {
1298
1298
  border-radius: 6px;
1299
1299
  display: flex;
1300
1300
  img {
1301
- width: 50px;
1301
+ width: 37.5px;
1302
1302
  height: 50px;
1303
1303
  margin-right: 6px;
1304
1304
  }
@@ -1344,7 +1344,7 @@ export default {
1344
1344
  display: flex;
1345
1345
  margin-bottom: 16px;
1346
1346
  img {
1347
- width: 50px;
1347
+ width: 37.5px;
1348
1348
  height: 50px;
1349
1349
  margin-right: 10px;
1350
1350
  }
@@ -267,7 +267,7 @@ export default {
267
267
  });
268
268
  },
269
269
  refreshPage() {
270
- this.refreshKey = this.refreshKey + 1;
270
+ // this.refreshKey = this.refreshKey + 1;
271
271
  this.showIndex = 0;
272
272
  this.setDetailStyle();
273
273
  },
@@ -223,7 +223,7 @@
223
223
  </div>
224
224
  </div>
225
225
  <ct-searchlist v-if="model.searchConditionApiTags1" :key="'list' + listKey.toString() + refershKey"
226
- :pageHeight="'450px'" :from="'detail'" :apiParam="model.paramDataTags1" :flagFocus="false"
226
+ :pageHeight="model.appIDTags1=='Follow'?'675px':'450px'" :from="'detail'" :apiParam="model.paramDataTags1" :flagFocus="false"
227
227
  :searchConditionApi="model.searchConditionApiTags1" :searchDataApi="model.searchDataApiTags1">
228
228
  </ct-searchlist>
229
229
  </div>
@@ -586,11 +586,10 @@ export default {
586
586
  self.model.activeIndex1 = i.toString();
587
587
  if (self.model.tags1 && self.model.tags1[i]) {
588
588
  self.listKey = self.listKey + 1;
589
- self.model.searchConditionApiTags1 =
590
- self.model.tags1[i].searchConditionAction || "";
591
- self.model.searchDataApiTags1 =
592
- self.model.tags1[i].searchDataAction || "";
589
+ self.model.searchConditionApiTags1 = self.model.tags1[i].searchConditionAction || "";
590
+ self.model.searchDataApiTags1 = self.model.tags1[i].searchDataAction || "";
593
591
  self.model.paramDataTags1 = self.model.tags1[i].paramData || "";
592
+ self.model.appIDTags1 = self.model.tags1[i].appID || "";
594
593
  }
595
594
  }
596
595
  }
@@ -704,11 +703,10 @@ export default {
704
703
  this.model.activeIndex1 = i;
705
704
  if (this.model.tags1 && this.model.tags1[i]) {
706
705
  this.listKey = this.listKey + 1;
707
- this.model.searchConditionApiTags1 =
708
- this.model.tags1[i].searchConditionAction || "";
709
- this.model.searchDataApiTags1 =
710
- this.model.tags1[i].searchDataAction || "";
706
+ this.model.searchConditionApiTags1 = this.model.tags1[i].searchConditionAction || "";
707
+ this.model.searchDataApiTags1 = this.model.tags1[i].searchDataAction || "";
711
708
  this.model.paramDataTags1 = this.model.tags1[i].paramData || "";
709
+ this.model.appIDTags1 = this.model.tags1[i].appID || "";
712
710
  window.localStorage.setItem("detailtagkey", this.model.tags1[i].appID); //存储
713
711
  }
714
712
  },
@@ -722,6 +720,7 @@ export default {
722
720
  this.model.searchConditionApiTags1 = dropDownData[i].searchConditionAction || "";
723
721
  this.model.searchDataApiTags1 = dropDownData[i].searchDataAction || "";
724
722
  this.model.paramDataTags1 = dropDownData[i].paramData || "";
723
+ this.model.appIDTags1 = dropDownData[i].appID || "";
725
724
 
726
725
  //交换位置
727
726
  let lastItemIndex = this.showData[0].length - 1;
@@ -1502,7 +1501,7 @@ export default {
1502
1501
  border-radius: 6px;
1503
1502
  display: flex;
1504
1503
  img {
1505
- width: 50px;
1504
+ width: 37.5px;
1506
1505
  height: 50px;
1507
1506
  margin-right: 6px;
1508
1507
  }
@@ -1548,7 +1547,7 @@ export default {
1548
1547
  display: flex;
1549
1548
  margin-bottom: 16px;
1550
1549
  img {
1551
- width: 50px;
1550
+ width: 37.5px;
1552
1551
  height: 50px;
1553
1552
  margin-right: 10px;
1554
1553
  }
@@ -226,7 +226,7 @@
226
226
  </div>
227
227
  </div>
228
228
  <ct-searchlist v-if="model.searchConditionApiTags1" :key="'list' + listKey.toString() + refershKey"
229
- :pageHeight="'450px'" :from="'detail'" :apiParam="model.paramDataTags1" :flagFocus="false"
229
+ :pageHeight="model.appIDTags1=='Follow'?'675px':'450px'" :from="'detail'" :apiParam="model.paramDataTags1" :flagFocus="false"
230
230
  :searchConditionApi="model.searchConditionApiTags1" :searchDataApi="model.searchDataApiTags1">
231
231
  </ct-searchlist>
232
232
  </div>
@@ -599,6 +599,7 @@ export default {
599
599
  self.model.searchConditionApiTags1 = self.model.tags1[i].searchConditionAction || "";
600
600
  self.model.searchDataApiTags1 = self.model.tags1[i].searchDataAction || "";
601
601
  self.model.paramDataTags1 = self.model.tags1[i].paramData || "";
602
+ self.model.appIDTags1 = self.model.tags1[i].appID || "";
602
603
  }
603
604
  }
604
605
  }
@@ -712,11 +713,10 @@ export default {
712
713
  this.model.activeIndex1 = i;
713
714
  if (this.model.tags1 && this.model.tags1[i]) {
714
715
  this.listKey = this.listKey + 1;
715
- this.model.searchConditionApiTags1 =
716
- this.model.tags1[i].searchConditionAction || "";
717
- this.model.searchDataApiTags1 =
718
- this.model.tags1[i].searchDataAction || "";
716
+ this.model.searchConditionApiTags1 = this.model.tags1[i].searchConditionAction || "";
717
+ this.model.searchDataApiTags1 = this.model.tags1[i].searchDataAction || "";
719
718
  this.model.paramDataTags1 = this.model.tags1[i].paramData || "";
719
+ this.model.appIDTags1 = this.model.tags1[i].appID || "";
720
720
  window.localStorage.setItem("detailtagkey", this.model.tags1[i].appID); //存储
721
721
  }
722
722
  },
@@ -728,12 +728,13 @@ export default {
728
728
  this.dropDownSelected = true;
729
729
  if (dropDownData && dropDownData[i]) {
730
730
  this.listKey = this.listKey + 1;
731
- this.model.searchConditionApiTags1 =
732
- dropDownData[i].searchConditionAction || "";
731
+ this.model.searchConditionApiTags1 = dropDownData[i].searchConditionAction || "";
733
732
  this.model.searchDataApiTags1 = dropDownData[i].searchDataAction || "";
734
733
  this.model.paramDataTags1 = dropDownData[i].paramData || "";
735
- //交换位置
736
- let lastItemIndex = this.showData[0].length - 1;
734
+ this.model.appIDTags1 = dropDownData[i].appID || "";
735
+
736
+ //交换位置
737
+ let lastItemIndex = this.showData[0].length - 1;
737
738
  let lastItem = this.showData[0][lastItemIndex];
738
739
  this.showData[0][lastItemIndex]=col;
739
740
  this.showData[1][index]=lastItem;
@@ -1515,7 +1516,7 @@ export default {
1515
1516
  border-radius: 6px;
1516
1517
  display: flex;
1517
1518
  img {
1518
- width: 50px;
1519
+ width: 37.5px;
1519
1520
  height: 50px;
1520
1521
  margin-right: 6px;
1521
1522
  }
@@ -1561,7 +1562,7 @@ export default {
1561
1562
  display: flex;
1562
1563
  margin-bottom: 16px;
1563
1564
  img {
1564
- width: 50px;
1565
+ width: 37.5px;
1565
1566
  height: 50px;
1566
1567
  margin-right: 10px;
1567
1568
  }
@@ -266,7 +266,7 @@ export default {
266
266
  });
267
267
  },
268
268
  refreshPage() {
269
- this.refreshKey = this.refreshKey + 1;
269
+ // this.refreshKey = this.refreshKey + 1;
270
270
  this.showIndex = 0;
271
271
  this.setDetailStyle();
272
272
  },
@@ -989,7 +989,7 @@
989
989
  if (f.model && typeof f.validExcute !== 'undefined') {
990
990
  if (!f.validExcute()) {
991
991
  if (i === 0) {
992
- if (f.model.is == "ct-file") {
992
+ if (f.model.is == "ct-file"||f.model.is == "ct-repeat") {
993
993
  self.$message({
994
994
  message: f.validMessage,
995
995
  type: 'error',
@@ -20,6 +20,11 @@
20
20
  @click="viewerfile(photoList, index)"
21
21
  >
22
22
  </el-image>
23
+ <span class="cover-list-item-play" v-if="item.videoPlayIconUrl">
24
+ <div class="swiper-i" @click="viewerfile(photoList, index)" >
25
+ <img :src="item.videoPlayIconUrl" class="hous-icon"/>
26
+ </div>
27
+ </span>
23
28
  <span
24
29
  class="cover-list-item-span-delete"
25
30
  v-if="!model.lock"
@@ -291,6 +296,32 @@ export default {
291
296
  position: sticky;
292
297
  }
293
298
 
299
+
300
+ .ct-photoSelect .cover-list-item-play{
301
+ position: inherit;
302
+ bottom: 50%;
303
+ display: block;
304
+ opacity: 0.8;
305
+ left: 50%;
306
+ }
307
+ .swiper-i {
308
+ position: relative;
309
+ width: 100%;
310
+ height: 100%;
311
+ }
312
+ .swiper-i img {
313
+ width: 100%;
314
+ height: 100%;
315
+ }
316
+ .swiper-i .hous-icon {
317
+ width: 48px;
318
+ height: 48px;
319
+ position: absolute;
320
+ top: 50%;
321
+ left: 50%;
322
+ transform: translate(-50%, -50%);
323
+ }
324
+
294
325
  .ct-photoSelect .cover-list-item-span {
295
326
  position: inherit;
296
327
  bottom: 0px;
@@ -18,6 +18,11 @@
18
18
  :z-index="previewZIndex"
19
19
  @click="viewerfile(imageList, index)">
20
20
  </el-image>
21
+ <span class="cover-list-item-play" v-if="item.videoPlayIconUrl">
22
+ <div class="swiper-i" @click="viewerfile(imageList, index)" >
23
+ <img :src="item.videoPlayIconUrl" class="hous-icon"/>
24
+ </div>
25
+ </span>
21
26
  <span class="cover-list-item-span" v-if="item.mediaLabelName">
22
27
  <span class="el-dropdown-link">
23
28
  &nbsp;{{ item.mediaLabelName }}
@@ -168,6 +173,32 @@
168
173
  .border-danger {
169
174
  border: 1px solid red !important;
170
175
  }
176
+
177
+ .ct-photoSelectList .cover-list-item-play{
178
+ position: inherit;
179
+ bottom: 50%;
180
+ display: block;
181
+ opacity: 0.8;
182
+ left: 50%;
183
+ }
184
+ .swiper-i {
185
+ position: relative;
186
+ width: 100%;
187
+ height: 100%;
188
+ }
189
+ .swiper-i img {
190
+ width: 100%;
191
+ height: 100%;
192
+ }
193
+ .swiper-i .hous-icon {
194
+ width: 48px;
195
+ height: 48px;
196
+ position: absolute;
197
+ top: 50%;
198
+ left: 50%;
199
+ transform: translate(-50%, -50%);
200
+ }
201
+
171
202
  .ct-photoSelectList .cover-list-item-span {
172
203
  position: inherit;
173
204
  bottom: 0px;
@@ -1,7 +1,7 @@
1
1
  <template>
2
2
  <div class="ct-form-repeat">
3
3
  <el-button
4
- v-if="model.create&&model.tableData.length<model.max"
4
+ v-if="model.create&&model.tableData.filter((v) => {return v.deleted !== true;}).length<model.max"
5
5
  type="success"
6
6
  style="float: right; "
7
7
  class=" max-btn-add"
@@ -188,6 +188,15 @@ export default {
188
188
  self.$refs.Fields.forEach((f) => {
189
189
  if (typeof f.validExcute !== "undefined") {
190
190
  if (!f.validExcute()) {
191
+ if (f.validMessage) {
192
+ if (f.validMessage == "必填") {
193
+ self.validMessage= "【"+self.model.label+"-" + f.model.label + "】" + f.validMessage;
194
+ } else {
195
+ self.validMessage= f.validMessage;
196
+ }
197
+ } else {
198
+ self.validMessage="【"+self.model.label+"-" + f.model.label + "】不能为空!";
199
+ }
191
200
  rtnBool = false;
192
201
  }
193
202
  }
@@ -201,25 +210,23 @@ export default {
201
210
  if (this.model.show) {
202
211
  if (!self.fieldsValidExcute()) {
203
212
  rtnBool = false;
204
- } else if (this.model.tableData.length < this.model.min) {
205
- self.$message({
206
- message: this.model.title + " 最少需要" + this.model.min + "条数据",
207
- type: "warning",
208
- showClose: true,
209
- });
213
+ } else if (
214
+ self.model.tableData.filter((v) => {
215
+ return v.deleted !== true;
216
+ }).length < this.model.min
217
+ ) {
218
+ self.validMessage= this.model.title + " 最少需要" + this.model.min + "条数据";
210
219
  rtnBool = false;
211
220
  }
212
221
  if (
213
222
  rtnBool &&
214
223
  self.model.required &&
215
- this.model.tableData.length === 0
224
+ self.model.tableData.filter((v) => {
225
+ return v.deleted !== true;
226
+ }).length === 0
216
227
  ) {
217
- self.$message({
218
- message: this.model.title + " 表格不能为空",
219
- type: "warning",
220
- showClose: true,
221
- });
222
- rtnBool = false;
228
+ self.validMessage= this.model.title + " 表格不能为空";
229
+ rtnBool = false;
223
230
  }
224
231
  }
225
232
  return rtnBool;
@@ -8,7 +8,7 @@
8
8
  @loadedCategoryError="categoryLoadedError" @changeCategory="categorychange" ></ct-searchcategory>
9
9
 
10
10
  <ct-searchscreen ref="screen" :api="searchConditionApi" :key="reloadKeyScreen"
11
- @loaded="screenLoaded" :screenPara="screenPara"
11
+ @loaded="screenLoaded" :screenPara="screenPara" @resetSearch="resetSearch()"
12
12
  :categoryLoaded="loaded.categoryLoaded" @search="search()" @saveShortcut="saveShortcut"
13
13
  @showTitle="showTitleScreenHandler"></ct-searchscreen>
14
14
 
@@ -189,6 +189,15 @@
189
189
  this.$refs.table.searchComplate(this.$refs.screen.model,this.$refs.screen.model.defaultSearch);
190
190
  }
191
191
  },
192
+ resetSearch() {
193
+ if (this.$refs.table.model) {
194
+ this.$refs.table.model.sortData = [];
195
+ this.$refs.table.model.columns.forEach((v1) => {
196
+ v1.sortAction = "";
197
+ });
198
+ this.search();
199
+ }
200
+ },
192
201
  searchComplate(index) {
193
202
  this.pageDisabled=false;
194
203
  if(this.flagSideBar && this.$refs.table.model.listData.length>0){
@@ -101,7 +101,7 @@ import dynamicElement from '../../mixins/dynamicElement';
101
101
  break;
102
102
  case 'reset':
103
103
  this.model.reset();
104
- this.$emit('search', this.model);
104
+ this.$emit('resetSearch', this.model);
105
105
  break;
106
106
  default:
107
107
  if (model.type === 15) {
@@ -297,7 +297,8 @@ export default {
297
297
  theadTitleShow:false,
298
298
  theadTitleTop:0,
299
299
  theadTitleLeft:0,
300
- theadTitleWidth:0
300
+ theadTitleWidth:0,
301
+ updateTableColumnsKey:0,
301
302
  };
302
303
  },
303
304
  deactivated(){
@@ -590,9 +591,12 @@ export default {
590
591
  },
591
592
  toSort(ev, col, action) {
592
593
  var self = this;
594
+ self.tableLoading = true;
593
595
  this.model.toSort(col, action, () => {
596
+ self.tableLoading = false;
594
597
  self.$forceUpdate();
595
598
  self.getScrollAttr();
599
+ self.$emit("simpleRouterRefreshHandler");
596
600
  });
597
601
  ev.cancelBubble = true;
598
602
  ev.stopPropagation();
@@ -1811,7 +1815,7 @@ export default {
1811
1815
  self.tableComplate = false;
1812
1816
  self.$emit("searchComplate");
1813
1817
  if(data && !flagSimple){
1814
- self.$emit("simpleRouterRefreshHandler",);
1818
+ self.$emit("simpleRouterRefreshHandler");
1815
1819
  }
1816
1820
  },
1817
1821
  data,
@@ -1983,6 +1987,8 @@ export default {
1983
1987
  else {
1984
1988
  self.loaderObj.SearchTable(self.api, self.load, self.model.searchModel, true);
1985
1989
  }
1990
+ this.updateTableColumnsKey = this.updateTableColumnsKey + 1;
1991
+ this.model.toolbarKey = this.updateTableColumnsKey;
1986
1992
  },
1987
1993
  popupClickHandler() {
1988
1994
  var tempListData = this.model.getSelectRowData({ isMulti: this.model.isMulti });
@@ -2,7 +2,7 @@
2
2
  <div ref="main" style="width: 100%;height: 100%;display: flex;" :class="{'domDisabled':pageDisabled}">
3
3
  <div class="ct-search-list" :style="{'height': pageHeight? pageHeight:'100%','width':searchWidth?searchWidth+'px':'100%'}" >
4
4
  <ct-searchscreen ref="screen" :api="searchConditionApi" :key="reloadKeyScreen"
5
- @loaded="screenLoaded" :screenPara="screenPara" :prevParam="prevParam"
5
+ @loaded="screenLoaded" :screenPara="screenPara" :prevParam="prevParam" @resetSearch="resetSearch()"
6
6
  :categoryLoaded="loaded.categoryLoaded" @search="search()" @saveShortcut="saveShortcut"
7
7
  @showTitle="showTitleScreenHandler"></ct-searchscreen>
8
8
 
@@ -167,6 +167,15 @@
167
167
  this.$refs.table.searchComplate(this.$refs.screen.model,this.$refs.screen.model.defaultSearch);
168
168
  }
169
169
  },
170
+ resetSearch() {
171
+ if (this.$refs.table.model) {
172
+ this.$refs.table.model.sortData = [];
173
+ this.$refs.table.model.columns.forEach((v1) => {
174
+ v1.sortAction = "";
175
+ });
176
+ this.search();
177
+ }
178
+ },
170
179
  searchComplate(index) {
171
180
  this.pageDisabled=false;
172
181
  if(this.flagSideBar && this.$refs.table.model.listData.length>0){
@@ -34,6 +34,7 @@ const Detail = function (source, para, callBack) {
34
34
  _searchConditionApiTags1: null,
35
35
  _searchDataApiTags1: null,
36
36
  _paramDataTags1: null,
37
+ _appIDTags1: null,
37
38
  _operationApiRouter: null,
38
39
  _operationList: null,
39
40
  _operationRouters: [],
@@ -440,6 +441,18 @@ const Detail = function (source, para, callBack) {
440
441
  rtn._paramDataTags1 = {};
441
442
  if (v) rtn._paramDataTags1 = JSON.parse(v);
442
443
  },
444
+ get appIDTags1() {
445
+ if (rtn._searchConditionApiTags1 !== null) {
446
+ return rtn._appIDTags1;
447
+ }
448
+ else if (rtn.tags1 && rtn.tags1.length > 0) {
449
+ rtn._appIDTags1 = rtn.tags1[0].appID;
450
+ return rtn._appIDTags1;
451
+ }
452
+ },
453
+ set appIDTags1(v) {
454
+ rtn._appIDTags1 = v;
455
+ },
443
456
  get tags2() {
444
457
  return data.tags2;
445
458
  },
@@ -79,7 +79,7 @@ const Repeat = function (source, master, formobj) {
79
79
  }
80
80
  else {
81
81
  if (master.maxValue1) {
82
- t = t + "(" + this.tableData.length + "/" + master.maxValue1 + ")";
82
+ t = t + "(" + this.tableData.filter((v) => {return v.deleted !== true;}).length + "/" + master.maxValue1 + ")";
83
83
  }
84
84
  }
85
85
  return t;
@@ -329,10 +329,10 @@ const SearchScreen = function (source, callBack, screenPara, prevParam) {
329
329
  this.screen.forEach((v) => {
330
330
  if (v.type !== Enum.ControlType.Hidden) {
331
331
  var tempObj = common.deepClone(v.searchObj);
332
+ if (that.isHandle(v.type)) {
333
+ tempObj.searchValue1 = that.getNewSearchValue(tempObj);
334
+ }
332
335
  if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
333
- if (that.isHandle(v.type)) {
334
- tempObj.searchValue1 = that.getNewSearchValue(tempObj);
335
- }
336
336
  rtn.fields.push(tempObj);
337
337
  }
338
338
  }
@@ -340,10 +340,10 @@ const SearchScreen = function (source, callBack, screenPara, prevParam) {
340
340
  this.highScreen.forEach((v) => {
341
341
  if (v.type !== Enum.ControlType.Hidden) {
342
342
  var tempObj = common.deepClone(v.searchObj);
343
+ if (that.isHandle(v.type)) {
344
+ tempObj.searchValue1 = that.getNewSearchValue(tempObj);
345
+ }
343
346
  if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
344
- if (that.isHandle(v.type)) {
345
- tempObj.searchValue1 = that.getNewSearchValue(tempObj);
346
- }
347
347
  rtn.fields.push(tempObj);
348
348
  }
349
349
  }
package/src/main.js CHANGED
@@ -21,7 +21,7 @@ Vue.use(centaline, {
21
21
  // baseUrl: "http://10.25.10.67:8080/",
22
22
  // baseUrl: "http://10.88.22.42:9999/service-api/v1/form/router",
23
23
  // baseUrl: "http://10.88.22.69:8080/api/",
24
- // baseUrl: "http://10.88.22.40:8080/api/",
24
+ // baseUrl: "http://10.88.22.39:8080/",
25
25
  // baseUrl: "http://10.58.2.108:8080/",
26
26
  // baseUrl: "http://tjcptest.centaline.com.cn/",
27
27
  // baseUrl: "http://tjcpuat.centaline.com.cn:9090/",
@@ -56,9 +56,9 @@ Vue.use(centaline, {
56
56
  // 获取请求头
57
57
  getRequestHeaders: function () {
58
58
  return {
59
- oldToken: 'e9e9bcf4-4350-451d-9d5c-0fd175ca07b1',
59
+ oldToken: 'f328eca3-7e3d-41ef-beff-5533e83a8bb9',
60
60
  token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
61
- authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s_au08V20nCIyEmMFCpEEgmEuDtBQEfPK6Z4xczcxbINohaJG4mxMxBbbQETWWg6YgiRWQZNBgP3_gP8iC-9UuhJuRYaTxHQoQFWkSGii9il1sSQRCXK9Sxq5bw0hqSTlZjz-hbaSvcS21Iuh3L7x7nTOu-zmcmT1QPwcZwAJ7eXZRyBRlsGztk7zeLxBAAA__8.6ZjK6ezl2zUhACa0ESuCs-0RyxzDnLXPVQb_qA5q7a0"}',
61
+ authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVbyZ-2108V20nCICIMthQqRRAIh7k4Q0NEzxSumeXOHec3QQnKdoDhojL0ySIkNdgM7DNE5ERRrCm70H_DHfBmlJM_S9th5jkiWNDoZHUaykYbU6xgSNFCuZ2il9cIKZS03MO2XtzDSqpdY53LZlds_4k7LtN0eFVUjWGI1B49UNOOWW5BE5my4lpoVPJ4AAAD__w.OX5oLp238UuHYjqOl2oF0wSleZV7Y500kQSjeRpTOIw"}',
62
62
 
63
63
  originalRequestURL: 'http://10.88.22.67:8080',
64
64
  EstateInfo: '{"estateId":"201806071109550C867184E8BCA56EC3","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',