centaline-data-driven 1.5.26 → 1.5.28

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 (31) hide show
  1. package/package.json +1 -1
  2. package/release-log.md +28 -0
  3. package/src/SearchList.vue +12 -16
  4. package/src/centaline/dynamicContact/src/dynamicContact.vue +29 -9
  5. package/src/centaline/dynamicDetail/src/dynamicDetail.vue +1 -1
  6. package/src/centaline/dynamicDetail/src/dynamicEstateBuildingDetail.vue +16 -3
  7. package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue +17 -3
  8. package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue +16 -3
  9. package/src/centaline/dynamicForm/src/dynamicForm.vue +6 -2
  10. package/src/centaline/dynamicForm/src/dynamicFormListTable.vue +51 -11
  11. package/src/centaline/dynamicSearchList/src/dynamicSearchList.vue +19 -3
  12. package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +2 -3
  13. package/src/centaline/dynamicSearchList/src/dynamicTableStats.vue +32 -8
  14. package/src/centaline/dynamicSo/src/dynamicSo.vue +1 -1
  15. package/src/centaline/dynamicTimeSelect/src/dynamicTimeSelect.vue +27 -4
  16. package/src/centaline/loader/src/ctl/Cb.js +1 -1
  17. package/src/centaline/loader/src/ctl/Checkbox.js +12 -0
  18. package/src/centaline/loader/src/ctl/Contact.js +6 -2
  19. package/src/centaline/loader/src/ctl/Dtd.js +1 -1
  20. package/src/centaline/loader/src/ctl/DtdOld.js +1 -1
  21. package/src/centaline/loader/src/ctl/Form.js +109 -104
  22. package/src/centaline/loader/src/ctl/FormList.js +23 -5
  23. package/src/centaline/loader/src/ctl/Iti.js +1 -1
  24. package/src/centaline/loader/src/ctl/SearchTable.js +13 -1
  25. package/src/centaline/loader/src/ctl/TimeSelect.js +15 -1
  26. package/src/centaline/loader/src/ctl/Ttts.js +1 -1
  27. package/src/centaline/loader/src/ctl/lib/Enum.js +10 -0
  28. package/src/centaline/loader/src/ctl/lib/LibFunction.js +6 -5
  29. package/src/main.js +4 -4
  30. package/wwwroot/static/centaline/centaline-data-driven.js +2 -2
  31. 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.5.26",
3
+ "version": "1.5.28",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/release-log.md CHANGED
@@ -1,3 +1,31 @@
1
+ ## v1.5.28
2
+ 2023-06-30
3
+
4
+ 优化
5
+
6
+ 电话拨号控件
7
+
8
+ 表单列表弹层新增修改时,数字区间、时间区间、多选等控件显示优化
9
+
10
+ 表单列表的列是组类型过滤不显示
11
+
12
+ 列表合并行,滚动加载后要重新计算
13
+
14
+ ## v1.5.27
15
+ 2023-06-27
16
+
17
+ 优化
18
+
19
+ CCES form表单中的表格数据全展示
20
+
21
+ 列表统计栏和详情页统计栏,点击更多里面的选项交换位置,体验优化
22
+
23
+ formData添加submit方法
24
+
25
+ 列表行删除完后,要关闭右侧
26
+
27
+ 呼叫任务右侧栏固定按钮左对齐优化
28
+
1
29
  ## v1.5.26
2
30
  2023-06-21
3
31
 
@@ -4,10 +4,10 @@
4
4
 
5
5
  <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
6
6
 
7
- <!-- <ct-searchlist :apiParam="para"
8
- :searchConditionApi="'/api/third-dept-tran/tran-list/layout'"
9
- :searchDataApi="'/api/third-dept-tran/tran-list'">
10
- </ct-searchlist> -->
7
+ <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
8
+
9
+ <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-layout'" :searchDataApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-list'"></ct-searchlist>
10
+
11
11
 
12
12
  <!-- <ct-searchlist :apiParam="para"
13
13
  :searchConditionApi="'/api/transaction/adjustRecord/getLayoutOfSearch'"
@@ -60,21 +60,17 @@
60
60
  :searchStatsApi="'/PropertyOFIList/getListStats'">
61
61
  </ct-searchlist> -->
62
62
 
63
- <!-- <ct-searchlist :searchConditionApi="'/EstateList/getLayoutOfSearch'"
64
- :searchDataApi="'/EstateList/getListOfSearchModel'">
65
- </ct-searchlist> -->
63
+ <!-- <ct-searchlist :searchConditionApi="'/CustomerList/getLayoutOfSearch'" :searchStatsApi="'/CustomerList/getListStats'" :searchDataApi="'/CustomerList/getListOfSearchModel'"></ct-searchlist> -->
64
+
65
+ <!-- <ct-searchlist :searchConditionApi="'/EstateList/getLayoutOfSearch'" :searchDataApi="'/EstateList/getListOfSearchModel'"></ct-searchlist> -->
66
66
 
67
- <!-- <ct-searchlist :searchConditionApi="'/EstateBuildingList/getLayoutOfSearch'"
68
- :searchDataApi="'/EstateBuildingList/getListOfSearchModel'">
69
- </ct-searchlist> -->
67
+ <!-- <ct-searchlist :searchConditionApi="'/EstateBuildingList/getLayoutOfSearch'" :searchDataApi="'/EstateBuildingList/getListOfSearchModel'"></ct-searchlist> -->
70
68
 
71
- <!-- <ct-searchlist :searchConditionApi="'/DistrictList/getLayoutOfSearch'"
72
- :searchDataApi="'/DistrictList/getListOfSearchModel'">
73
- </ct-searchlist> -->
69
+ <!-- <ct-searchlist :searchConditionApi="'/DistrictList/getLayoutOfSearch'" :searchDataApi="'/DistrictList/getListOfSearchModel'"></ct-searchlist> -->
70
+
71
+ <!-- <ct-searchlist :searchConditionApi="'/CustomerImportList/getLayoutOfSearch'" :searchDataApi="'/CustomerImportList/getListOfSearchModel'"></ct-searchlist> -->
74
72
 
75
- <ct-searchlist :searchConditionApi="'/CustomerImportList/getLayoutOfSearch'"
76
- :searchDataApi="'/CustomerImportList/getListOfSearchModel'">
77
- </ct-searchlist>
73
+ <!-- <ct-searchlist :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist> -->
78
74
 
79
75
  <!-- <ct-searchlist :searchConditionApi="'/RoleList/getLayoutOfSearch'" :searchStatsApi="'/RoleList/getListStats'" :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist> -->
80
76
 
@@ -1,8 +1,9 @@
1
1
  <template>
2
- <div ref="contact" id="contactWidth" v-if="apiRouter !== {} && model && model.listData.length > 0" style="border: 1px solid #ECEFF2;box-shadow: 0 2px 4px 0 rgba(0,0,0,0.06);border-radius: 6px;
3
- padding-bottom: 10px;padding-top: 10px;padding-left: 10px;display: flex;font-size: 12px;width:100%">
4
- <div class="ct-so"
5
- style="width:auto;margin-right: 10px;flex:1;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
2
+ <div ref="contact" id="contactWidth" v-if="model && model.listData.length > 0" :class="[from=='form'?'ct-contact-form':'ct-contact']">
3
+ <div v-if="from=='form' && model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
4
+ {{model.label}}
5
+ </div>
6
+ <div class="ct-so" style="width:auto;margin-right: 10px;flex:1;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
6
7
  <el-popover ref="pop" placement="bottom-start" v-model="showDrop" trigger="click">
7
8
  <div>
8
9
  <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
@@ -14,7 +15,7 @@
14
15
  @change="changeHandler($event)" :disabled="model.lock"
15
16
  :class="model.lock ? 'ct-is-disabled' : 'ct-input_inner'"></div>
16
17
  </el-popover>
17
- <span class="el-input__suffix" @click="clickHandle"
18
+ <span class="el-input__suffix" @click="clickHandle" :style="{top:'-4px'}"
18
19
  :class="[model.attrs.size ? 'el-input--' + model.attrs.size : '']">
19
20
  <span class="el-input__suffix-inner">
20
21
  <i class="el-select__caret el-input__icon el-icon-arrow-up" :class="{ 'is-reverse': showDrop }"></i>
@@ -43,11 +44,16 @@ export default {
43
44
  },
44
45
  props: {
45
46
  vmodel: Object,
47
+ source: Object,
46
48
  api: String,
47
49
  apiParam: Object,
48
50
  apiRouter: {
49
51
  Object,
50
- default: {}
52
+ default: null
53
+ },
54
+ from: {
55
+ String,
56
+ default: ''
51
57
  },
52
58
  },
53
59
  data() {
@@ -71,9 +77,7 @@ export default {
71
77
  else if (typeof self.api !== 'undefined' && self.apiParam) {
72
78
  self.loaderObj.Contact(self.api, self.apiParam, self.load);
73
79
  }
74
-
75
80
  });
76
-
77
81
  },
78
82
  activated() {
79
83
  this.$nextTick(() => {
@@ -237,7 +241,7 @@ export default {
237
241
  attrs: {
238
242
  searchConditionApi: field.actionForSearchLayout,
239
243
  searchDataApi: field.actionForSearch,
240
- apiParam: field.getActionPara(submitData).para,
244
+ apiParam: submitData,
241
245
  width: field.dialogWidth + 'px',
242
246
  height: field.dialogHeight + 'px'
243
247
  },
@@ -340,4 +344,20 @@ export default {
340
344
  }
341
345
  </script>
342
346
  <style lang="scss" scoped>
347
+ .ct-contact{
348
+ border: 1px solid #ECEFF2;
349
+ box-shadow: 0 2px 4px 0 rgba(0,0,0,0.06);
350
+ border-radius: 6px;
351
+ padding-bottom: 10px;
352
+ padding-top: 10px;
353
+ padding-left: 10px;
354
+ display: flex;
355
+ font-size: 12px;
356
+ width:100%
357
+ }
358
+ .ct-contact-form{
359
+ display: flex;
360
+ font-size: 12px;
361
+ width:100%
362
+ }
343
363
  </style>
@@ -23,7 +23,7 @@
23
23
  </ct-SearchList>
24
24
 
25
25
  <div ref="detailForm" v-if="pageType=='Form'" style="overflow: auto;" :style="{height:(listHeight-5)+'px'}">
26
- <ct-form :api="api" :apiParam="apiParam" @loaded="loaded" @submit="submit" :flagScroll="'true'" :drowerClose="drowerClose">
26
+ <ct-form :api="api" :apiParam="apiParam" @loaded="loaded" @submit="submit" :flagScroll="'true'" :drowerClose="drowerClose" :openType="'detail'">
27
27
  </ct-form>
28
28
  </div>
29
29
 
@@ -196,7 +196,7 @@
196
196
  </div>
197
197
  <div v-if="showData.length > 1" style="position: relative">
198
198
  <el-tabs :value="model.activeIndex1" @tab-click="handleSelect">
199
- <el-tab-pane v-for="(col, index) in showData[0]" :key="col.appID" :index="index.toString()" :name="index.toString()">
199
+ <el-tab-pane v-for="(col, index) in showData[0]" :key="col.appID" :index="index.toString()" :name="index.toString()" :style="{'width':(index == showData[0].length-1 ? lastWidth + 'px' : '' ),}">
200
200
  <div slot="label" v-html="col.appName"></div>
201
201
  </el-tab-pane>
202
202
  </el-tabs>
@@ -280,6 +280,7 @@ export default {
280
280
  flagDisabledPrev:false,
281
281
  flagDisabledNext:false,
282
282
  showData: [],
283
+ lastWidth:0,
283
284
  FlagStatistics: false,
284
285
  dropDownSelected: false,
285
286
  iconSort: require("../../../assets/sort.png"),
@@ -351,6 +352,9 @@ export default {
351
352
  }
352
353
  }
353
354
  if (showIndex > 0) {
355
+ const ExceptShowIndexWidth = self.$refs["StatisticsItem"+(showIndex)][0].offsetLeft;
356
+ const preShowIndexWidth =self.$refs["StatisticsItem" + (showIndex-1)][0].getBoundingClientRect().width;
357
+ self.lastWidth=self.showWidth-ExceptShowIndexWidth + preShowIndexWidth -20;
354
358
  self.showData = [
355
359
  self.model.tags1.slice(0, showIndex),
356
360
  self.model.tags1.slice(showIndex),
@@ -507,7 +511,7 @@ export default {
507
511
  },
508
512
  handleDropDown(key, index) {
509
513
  let i = index;
510
- this.model.activeIndex1 = (this.showData[0].length + i).toString();
514
+ // this.model.activeIndex1 = (this.showData[0].length + i).toString();
511
515
  let dropDownData = this.showData[1];
512
516
  this.dropDownSelected = true;
513
517
  if (dropDownData && dropDownData[i]) {
@@ -515,7 +519,16 @@ export default {
515
519
  this.model.searchConditionApiTags1 = dropDownData[i].searchConditionAction || "";
516
520
  this.model.searchDataApiTags1 = dropDownData[i].searchDataAction || "";
517
521
  this.model.paramDataTags1 = dropDownData[i].paramData || "";
518
- window.localStorage.setItem("detailtagkey", dropDownData[i].appID); //存储
522
+ //交换位置
523
+ let lastItemIndex = this.showData[0].length - 1;
524
+ let lastItem = this.showData[0][lastItemIndex];
525
+ this.showData[0][lastItemIndex]=col;
526
+ this.showData[1][index]=lastItem;
527
+ this.model.activeIndex1 = lastItemIndex.toString();
528
+ this.model.tags1[lastItemIndex]=col;
529
+ this.model.tags1[lastItemIndex +1 +index]=lastItem;
530
+ //存储
531
+ window.localStorage.setItem("detailtagkey", dropDownData[i].appID);
519
532
  }
520
533
  },
521
534
  fieldClickHandler(field) {
@@ -201,7 +201,7 @@
201
201
  </div>
202
202
  <div v-if="showData.length > 1" style="position: relative">
203
203
  <el-tabs :value="model.activeIndex1" @tab-click="handleSelect">
204
- <el-tab-pane v-for="(col, index) in showData[0]" :key="col.appID" :index="index.toString()" :name="index.toString()">
204
+ <el-tab-pane v-for="(col, index) in showData[0]" :key="col.appID" :index="index.toString()" :name="index.toString()" :style="{'width':(index == showData[0].length-1 ? lastWidth + 'px' : '' ),}">
205
205
  <div slot="label" v-html="col.appName"></div>
206
206
  </el-tab-pane>
207
207
  </el-tabs>
@@ -483,6 +483,7 @@ export default {
483
483
  flagDisabledPrev:false,
484
484
  flagDisabledNext:false,
485
485
  showData: [],
486
+ lastWidth:0,
486
487
  FlagStatistics: false,
487
488
  dropDownSelected: false,
488
489
  iconSort: require("../../../assets/sort.png"),
@@ -554,6 +555,9 @@ export default {
554
555
  }
555
556
  }
556
557
  if (showIndex > 0) {
558
+ const ExceptShowIndexWidth = self.$refs["StatisticsItem"+(showIndex)][0].offsetLeft;
559
+ const preShowIndexWidth =self.$refs["StatisticsItem" + (showIndex-1)][0].getBoundingClientRect().width;
560
+ self.lastWidth=self.showWidth-ExceptShowIndexWidth + preShowIndexWidth -20;
557
561
  self.showData = [
558
562
  self.model.tags1.slice(0, showIndex),
559
563
  self.model.tags1.slice(showIndex),
@@ -708,9 +712,9 @@ export default {
708
712
  window.localStorage.setItem("detailtagkey", this.model.tags1[i].appID); //存储
709
713
  }
710
714
  },
711
- handleDropDown(key, index) {
715
+ handleDropDown(col, index) {
712
716
  let i = index;
713
- this.model.activeIndex1 = (this.showData[0].length + i).toString();
717
+ // this.model.activeIndex1 = (this.showData[0].length + i).toString();
714
718
  let dropDownData = this.showData[1];
715
719
  this.dropDownSelected = true;
716
720
  if (dropDownData && dropDownData[i]) {
@@ -718,6 +722,16 @@ export default {
718
722
  this.model.searchConditionApiTags1 = dropDownData[i].searchConditionAction || "";
719
723
  this.model.searchDataApiTags1 = dropDownData[i].searchDataAction || "";
720
724
  this.model.paramDataTags1 = dropDownData[i].paramData || "";
725
+
726
+ //交换位置
727
+ let lastItemIndex = this.showData[0].length - 1;
728
+ let lastItem = this.showData[0][lastItemIndex];
729
+ this.showData[0][lastItemIndex]=col;
730
+ this.showData[1][index]=lastItem;
731
+ this.model.activeIndex1 = lastItemIndex.toString();
732
+ this.model.tags1[lastItemIndex]=col;
733
+ this.model.tags1[lastItemIndex +1 +index]=lastItem;
734
+
721
735
  window.localStorage.setItem("detailtagkey", dropDownData[i].appID); //存储
722
736
  }
723
737
  },
@@ -204,7 +204,7 @@
204
204
  <div v-if="showData.length > 1" style="position: relative">
205
205
  <el-tabs :value="model.activeIndex1" @tab-click="handleSelect">
206
206
  <el-tab-pane v-for="(col, index) in showData[0]" :key="col.appID"
207
- :index="index.toString()" :name="index.toString()">
207
+ :index="index.toString()" :name="index.toString()" :style="{'width':(index == showData[0].length-1 ? lastWidth + 'px' : '' ),}">
208
208
  <div slot="label" v-html="col.appName"></div>
209
209
  </el-tab-pane>
210
210
  </el-tabs>
@@ -481,6 +481,7 @@ export default {
481
481
  flagDisabledPrev: false,
482
482
  flagDisabledNext: false,
483
483
  showData: [],
484
+ lastWidth:0,
484
485
  FlagStatistics: false,
485
486
  dropDownSelected: false,
486
487
  iconSort: require("../../../assets/sort.png"),
@@ -564,6 +565,9 @@ export default {
564
565
  }
565
566
  }
566
567
  if (showIndex > 0) {
568
+ const ExceptShowIndexWidth = self.$refs["StatisticsItem"+(showIndex)][0].offsetLeft;
569
+ const preShowIndexWidth =self.$refs["StatisticsItem" + (showIndex-1)][0].getBoundingClientRect().width;
570
+ self.lastWidth=self.showWidth-ExceptShowIndexWidth + preShowIndexWidth -20;
567
571
  self.showData = [
568
572
  self.model.tags1.slice(0, showIndex),
569
573
  self.model.tags1.slice(showIndex),
@@ -716,9 +720,9 @@ export default {
716
720
  window.localStorage.setItem("detailtagkey", this.model.tags1[i].appID); //存储
717
721
  }
718
722
  },
719
- handleDropDown(key, index) {
723
+ handleDropDown(col, index) {
720
724
  let i = index;
721
- this.model.activeIndex1 = (this.showData[0].length + i).toString();
725
+ // this.model.activeIndex1 = (this.showData[0].length + i).toString();
722
726
  let dropDownData = this.showData[1];
723
727
 
724
728
  this.dropDownSelected = true;
@@ -728,6 +732,15 @@ export default {
728
732
  dropDownData[i].searchConditionAction || "";
729
733
  this.model.searchDataApiTags1 = dropDownData[i].searchDataAction || "";
730
734
  this.model.paramDataTags1 = dropDownData[i].paramData || "";
735
+ //交换位置
736
+ let lastItemIndex = this.showData[0].length - 1;
737
+ let lastItem = this.showData[0][lastItemIndex];
738
+ this.showData[0][lastItemIndex]=col;
739
+ this.showData[1][index]=lastItem;
740
+ this.model.activeIndex1 = lastItemIndex.toString();
741
+ this.model.tags1[lastItemIndex]=col;
742
+ this.model.tags1[lastItemIndex +1 +index]=lastItem;
743
+
731
744
  window.localStorage.setItem("detailtagkey", dropDownData[i].appID); //存储
732
745
  }
733
746
  },
@@ -129,6 +129,10 @@
129
129
  String,
130
130
  default: 'close',
131
131
  },
132
+ openType:{
133
+ String,
134
+ default: '',
135
+ },
132
136
  },
133
137
  data() {
134
138
  return {
@@ -401,7 +405,7 @@
401
405
  });
402
406
  }
403
407
  else {
404
- if (self.$common.dialogList && self.$common.dialogList.List.length === 0
408
+ if (self.$common.dialogList && self.$common.dialogList.List.length === 0 && self.openType !=='detail'
405
409
  && field.actionType && field.actionType===2 && data.notification !== 17) {
406
410
  if (typeof self.$common.getDataDrivenOpts().handler.closeTab === 'function') {
407
411
  self.$common.getDataDrivenOpts().handler.closeTab();
@@ -1137,6 +1141,7 @@
1137
1141
  z-index: 100;
1138
1142
  /* bottom: 6px; */
1139
1143
  bottom: 0;
1144
+ left: 0;
1140
1145
  border-radius: 0 0 4px 4px;
1141
1146
  position: absolute;
1142
1147
  line-height: 34px;
@@ -1144,6 +1149,5 @@
1144
1149
  width: 100%;
1145
1150
  margin: auto;
1146
1151
  box-shadow: 0 2px 20px 0 rgb(0 0 0 / 10%);
1147
- margin-left: -20px;
1148
1152
  }
1149
1153
  </style>
@@ -17,7 +17,7 @@
17
17
  <el-table size="mini" class="max-table--border" :data="model.tableData" :key="itemKey" border
18
18
  style="width: 100%" highlight-current-row :show-summary="model.showSummary" :summary-method="getSummaries">
19
19
  <!--数据列-->
20
- <el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" v-if="v.show !== false" :render-header="renderHeader" :min-width="tableColumnWith">
20
+ <el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" v-if="v.show !== false && v.type!==13" :render-header="renderHeader" :min-width="tableColumnWith">
21
21
  <template slot="header" slot-scope="scope">
22
22
  <div :class="[{'ct-table-required':v.required&&model.rows[0].edit&& model.rows[0].delete&&!model.tableDisabled},getHeadClass(v)]">
23
23
  {{v.label}}
@@ -93,18 +93,58 @@
93
93
  },
94
94
  getLableShow(){
95
95
  let labelShow=this.vmodel.labelValue;
96
- if(this.vmodel.unitName){
96
+ if(labelShow && this.vmodel.unitName){
97
97
  labelShow=labelShow+this.vmodel.unitName;
98
98
  }
99
- if(this.vmodel.type===6){
100
- if(this.vmodel.code2){
101
- labelShow=this.vmodel.labelValue+this.vmodel.code2;
102
- }
103
- }
104
- else if(this.vmodel.type===4){
105
- if(this.vmodel.name1){
106
- labelShow=this.vmodel.name1;
107
- }
99
+ switch(this.vmodel.type){
100
+ case 6:
101
+ case 7:
102
+ if(this.vmodel.code2){
103
+ labelShow=this.vmodel.labelValue+this.vmodel.code2;
104
+ }
105
+ break;
106
+ case 4:
107
+ case 24:
108
+ if(this.vmodel.name1){
109
+ labelShow=this.vmodel.name1;
110
+ }
111
+ break;
112
+ case 19:
113
+ if(this.vmodel.code1 && this.vmodel.code2){
114
+ }
115
+ else if(this.vmodel.code1){
116
+ labelShow=this.vmodel.code1+(this.vmodel.unitName?this.vmodel.unitName:'')+'以上';
117
+ }
118
+ else if(this.vmodel.code2){
119
+ labelShow=this.vmodel.code2+(this.vmodel.unitName?this.vmodel.unitName:'')+'以下';
120
+ }
121
+ break;
122
+ case 20:
123
+ case 21:
124
+ if(this.vmodel.code1 && this.vmodel.code2){
125
+ }
126
+ else if(this.vmodel.code1){
127
+ labelShow=this.vmodel.code1+(this.vmodel.unitName?this.vmodel.unitName:'')+'以后';
128
+ }
129
+ else if(this.vmodel.code2){
130
+ labelShow=this.vmodel.code2+(this.vmodel.unitName?this.vmodel.unitName:'')+'以前';
131
+ }
132
+ break;
133
+ case 11:
134
+ case 22:
135
+ labelShow=this.vmodel.getFormListTableShow();
136
+ break;
137
+ case 31:
138
+ labelShow=this.vmodel.getCheckedName();;
139
+ break;
140
+ case 30:
141
+ labelShow=this.vmodel.value?'开启':'关闭';
142
+ break;
143
+ case 43:
144
+ labelShow=this.vmodel.value?'是':'否';
145
+ break;
146
+ default:
147
+ break;
108
148
  }
109
149
  return labelShow;
110
150
  },
@@ -14,7 +14,7 @@
14
14
 
15
15
  <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from" :isIframe="isIframe" :documentHeight="documentHeight"
16
16
  @loaded="tableLoaded" :documentWidth="documentWidth" :flagPopupSearchlist="flagPopupSearchlist" :screenTop="screenTop" :flagAppMode="flagAppMode"
17
- @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler" :key="reloadKeyTable" @searchComplate="searchComplate"
17
+ @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler" :key="reloadKeyTable" @searchComplate="searchComplate" @closeSideBar="closeSideBar"
18
18
  @rowClickHandle="rowClickHandle" @scrollHandle="scrollHandle" @refreshRowHandle="refreshRowHandle" @doClosePopoverHandle="doClosePopoverHandle"
19
19
  @showTitle="showTitleHandler" @popupClickHandler="popupClickHandler"></ct-searchtable>
20
20
  </div>
@@ -364,6 +364,10 @@
364
364
  closeSideHandler() {
365
365
  this.$refs.sideMenu.clickHandler();
366
366
  },
367
+ closeSideBar() {
368
+ this.flagSideBarOfData=false;
369
+ this.searchWidth=0;
370
+ },
367
371
  clickNextHandler() {
368
372
  this.$refs.table.rowKeyDownHandle(null,1);
369
373
  },
@@ -388,8 +392,20 @@
388
392
  this.$emit('submit', tempListData);
389
393
  this.$common.closeDialog(this);
390
394
  },
391
- submitHandler(modelForm,responseData){
392
- this.$refs.table.updateCurrentRow({flagFreshCurrentRow:true},{responseData:responseData});
395
+ submitHandler(responseData){
396
+ if(responseData && responseData.responseData && responseData.responseData.notification===4){
397
+ this.$refs.table.model.doAction(responseData);
398
+ if(this.$refs.table.model.listData.length>0){
399
+ this.selectIndex=-1;
400
+ this.rowClickHandle();
401
+ }
402
+ else{
403
+ this.closeSideBar();
404
+ }
405
+ }
406
+ else{
407
+ this.$refs.table.updateCurrentRow({flagFreshCurrentRow:true},{responseData:responseData});
408
+ }
393
409
  },
394
410
  },
395
411
  beforeDestroy() {
@@ -74,7 +74,7 @@
74
74
  <tbody>
75
75
  <!--可视区域的行数据-->
76
76
  <tr v-for="(row, rowindex) in model.listData" :key="rowindex"
77
- v-if="pageRowMin <= rowindex && rowindex <= pageRowMax" :ref="'rows.' + rowindex"
77
+ v-if="from == 'form' || pageRowMin <= rowindex && rowindex <= pageRowMax" :ref="'rows.' + rowindex"
78
78
  @click="rowClickHandle($event, rowindex)" class="ct-tr" :style="row.$style">
79
79
  <td v-if="model.isMulti" class="ct-td tdFiexd left-fixation checkbox-td" :class="[model.tdClass,rowindex === model.selectIndex ? 'select' : null,]"
80
80
  align="center">
@@ -252,7 +252,7 @@ export default {
252
252
  screenTop: {
253
253
  Number,
254
254
  default: 0,
255
- },
255
+ },
256
256
  },
257
257
  computed: {},
258
258
  data() {
@@ -290,7 +290,6 @@ export default {
290
290
  disabledStats:false,
291
291
  searchStrat:0,
292
292
  searchEnd:0,
293
-
294
293
  visible:false,
295
294
  theadTitleShow:false,
296
295
  theadTitleTop:0,