centaline-data-driven 1.5.33 → 1.5.35

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 (36) hide show
  1. package/package.json +1 -1
  2. package/release-log.md +24 -0
  3. package/src/SearchList.vue +7 -7
  4. package/src/centaline/common/index.js +5 -5
  5. package/src/centaline/dynamicBtn/src/dynamicBtn.vue +46 -46
  6. package/src/centaline/dynamicFile/src/dynamicFile.vue +2 -2
  7. package/src/centaline/dynamicLayout/src/dynamicLayoutChildren.vue +17 -17
  8. package/src/centaline/dynamicLayout/src/dynamicLayoutChildrenFor.vue +4 -4
  9. package/src/centaline/dynamicLayout/src/dynamicLayoutImage.vue +4 -4
  10. package/src/centaline/dynamicRepeat/src/dynamicRepeat.vue +3 -3
  11. package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue +5 -1
  12. package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +19 -19
  13. package/src/centaline/dynamicSearchListTab/src/dynamicSearchListOne.vue +8 -1
  14. package/src/centaline/dynamicSearchListTab/src/dynamicSearchListTab.vue +21 -9
  15. package/src/centaline/dynamicSos/src/dynamicSos.vue +8 -8
  16. package/src/centaline/dynamicTree/src/dynamicTree.vue +5 -2
  17. package/src/centaline/dynamicViewerFile/src/dynamicViewerFile.vue +1 -1
  18. package/src/centaline/formData/index.js +3 -3
  19. package/src/centaline/loader/src/ctl/Button.js +16 -16
  20. package/src/centaline/loader/src/ctl/PhotoSelect.js +4 -1
  21. package/src/centaline/loader/src/ctl/Repeat.js +19 -18
  22. package/src/centaline/loader/src/ctl/SearchScreen.js +85 -51
  23. package/src/centaline/loader/src/ctl/Sos.js +2 -2
  24. package/src/centaline/templateControls/src/dynamicTableCurrency.vue +5 -5
  25. package/src/main.js +2 -2
  26. package/wwwroot/static/centaline/centaline-data-driven.js +126 -60
  27. package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
  28. package/.vs/Centaline.Front_End.DataDriven/DesignTimeBuild/.dtbcache.v2 +0 -0
  29. package/.vs/Centaline.Front_End.DataDriven/config/applicationhost.config +0 -1034
  30. package/obj/Centaline.Front_End.DataDriven.csproj.nuget.dgspec.json +0 -72
  31. package/obj/Centaline.Front_End.DataDriven.csproj.nuget.g.props +0 -32
  32. package/obj/Centaline.Front_End.DataDriven.csproj.nuget.g.targets +0 -15
  33. package/obj/Debug/netcoreapp2.1/Centaline.Front_End.DataDriven.AssemblyInfo.cs +0 -23
  34. package/obj/Debug/netcoreapp2.1/Centaline.Front_End.DataDriven.RazorAssemblyInfo.cs +0 -20
  35. package/obj/Debug/netcoreapp2.1/Centaline.Front_End.DataDriven.csproj.FileListAbsolute.txt +0 -6
  36. package/obj/project.assets.json +0 -11948
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "centaline-data-driven",
3
- "version": "1.5.33",
3
+ "version": "1.5.35",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/release-log.md CHANGED
@@ -1,3 +1,27 @@
1
+ ## v1.5.34
2
+ 2023-07-14
3
+
4
+ 优化
5
+
6
+ 上传文件浏览状态下逻辑处理
7
+ ## v1.5.34
8
+ 2023-07-13
9
+
10
+ 优化
11
+
12
+ 文件预览组件 图片类型根据flagurl判断,是否加高宽等参数
13
+
14
+ 列表打开多个tab
15
+
16
+ 图片选择组件验证优化
17
+
18
+ ## v1.5.33
19
+ 2023-07-11
20
+
21
+ 优化
22
+
23
+ 房源列表点击颜色变化保存当晚凌晨
24
+
1
25
  ## v1.5.32
2
26
  2023-07-11
3
27
 
@@ -2,7 +2,7 @@
2
2
  <div id="app-search" style="width:100%;height:100%;position: fixed;">
3
3
  <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/transaction-workflow/getLayoutOfSearch'" :searchDataApi="'/api/third-dept-tran/transaction-workflow/list'"></ct-searchlist> -->
4
4
 
5
- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist>
5
+ <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
6
6
 
7
7
  <!-- <ct-searchlist :apiParam="para"
8
8
  :searchConditionApi="'/api/third-dept-tran/tran-list/layout'"
@@ -37,16 +37,16 @@
37
37
  :searchStatsApi="'/ProfileWorklistList/getListStats'">
38
38
  </ct-searchlist> -->
39
39
 
40
- <!--<ct-searchlist :apiParam="para"
41
- :searchConditionApi="'/CallTaskList/getLayoutOfSearch'"
42
- :searchDataApi="'/CallTaskList/getListOfSearchModel'">
43
- </ct-searchlist>-->
40
+ <!-- <ct-searchlist :apiParam="para"
41
+ :searchConditionApi="'/RightValueList/getLayoutOfSearch'"
42
+ :searchDataApi="'/RightValueList/getListOfSearchModel'">
43
+ </ct-searchlist> -->
44
44
 
45
- <!--<ct-searchlist
45
+ <ct-searchlist
46
46
  :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'"
47
47
  :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" :searchStatsApi="'/PropertyPublishList/getListStatsForRET'"
48
48
  :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
49
- </ct-searchlist>-->
49
+ </ct-searchlist>
50
50
 
51
51
  <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
52
52
  :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
@@ -429,7 +429,7 @@ const common = {
429
429
  * @desc 执行动态脚本,装载自定义方法和参数在window上(这样使用自定义对象时,不需要this.了)
430
430
  * @returns {obj} 返回值
431
431
  */
432
- excute(code) {
432
+ excute(code) {
433
433
  var self = this;
434
434
  common.with(self);
435
435
  let rtn = eval(code);
@@ -620,11 +620,11 @@ const common = {
620
620
  * @return 格式化后的日期
621
621
  */
622
622
  formatDate: function (date, format) {
623
- var v = "";
624
- if (typeof date === "string") {
625
- date = new Date(date)
623
+ var v = "";
624
+ if (typeof date === "string") {
625
+ date = new Date(date)
626
626
  }
627
- if (typeof date === "string" || typeof date !== "object") {
627
+ if (typeof date === "string" || typeof date !== "object") {
628
628
  return;
629
629
  }
630
630
  if (date == null) return "";
@@ -68,7 +68,7 @@
68
68
  <span v-else>{{model.label}}</span>
69
69
  </div>
70
70
  <el-dropdown-menu>
71
- <el-dropdown-item>
71
+ <el-dropdown-item>
72
72
  <div style="width:100%;float: left;margin:10px 0;">
73
73
  <el-button style="float: left" v-for="(field, index) in SearchWhereButtons" :key="index" :type="field.isHyperLink ? 'text' : 'primary'" :disabled="field.locked" @click="SaveSearchWhere(field)">{{field.label}}</el-button>
74
74
  <span style="margin-left:10px;margin-top:3px;float:left" @click="SearchWhereManage" title="维维护已保存的查询条件,如:设置和取消默认、修改标签、删除等。"><i class="el-icon-s-tools" style=" font-size: 18px;"></i></span>
@@ -105,14 +105,14 @@
105
105
  optionApi:String,
106
106
  rowData: Object,
107
107
  rowindex:Number,
108
- flagAppMode: Boolean,
108
+ flagAppMode: Boolean,
109
109
  actionRouters: Array,
110
110
  },
111
111
  mixins: [dynamicElement],
112
112
  data: function () {
113
- return {
114
- fieldSearchWhere: {},
115
- SearchWhereList: [],
113
+ return {
114
+ fieldSearchWhere: {},
115
+ SearchWhereList: [],
116
116
  SearchWhereButtons:[],
117
117
  visible:false,
118
118
  message:'',
@@ -135,12 +135,12 @@
135
135
  }
136
136
  else {
137
137
  this.model = this.vmodel;
138
- }
139
- if (this.actionRouters && this.model.routerKey) {
138
+ }
139
+ if (this.actionRouters && this.model.routerKey) {
140
140
  this.fieldSearchWhere = this.actionRouters.find((b) => {
141
141
  return b.id === this.model.routerKey;
142
- });
143
- }
142
+ });
143
+ }
144
144
  },
145
145
  computed: {
146
146
  uploadData() {
@@ -199,43 +199,43 @@
199
199
  else{
200
200
  this.$emit('click',this.model,this.rowData,this.rowindex);
201
201
  }
202
- },
203
- clickHandleDropdown(v) {
204
- if (v) {
205
- this.getSearchWherList();
206
- }
207
- },
208
- SaveSearchWhere(field) {
209
- if (field.lock) {
210
- return;
211
- }
212
- this.$refs.searchwhere.hide();
213
- this.$emit('SaveSearchWhere', field);
214
- },
215
- getSearchWherList() {
216
- if (this.model.routerKey) {
202
+ },
203
+ clickHandleDropdown(v) {
204
+ if (v) {
205
+ this.getSearchWherList();
206
+ }
207
+ },
208
+ SaveSearchWhere(field) {
209
+ if (field.lock) {
210
+ return;
211
+ }
212
+ this.$refs.searchwhere.hide();
213
+ this.$emit('SaveSearchWhere', field);
214
+ },
215
+ getSearchWherList() {
216
+ if (this.model.routerKey) {
217
217
  let field = this.actionRouters.find((b) => {
218
218
  return b.id === this.model.routerKey;
219
- });
220
- if (field) {
221
- this.model.getApiData(this.loadSearchWher, field);
222
- }
223
- }
224
- },
225
- SearchWhereManage() {
226
- this.$refs.searchwhere.hide();
227
- this.$emit('SearchWhereManage', this.model);
228
- },
229
- clickDropdownItem(col) {
230
- this.$refs.searchwhere.hide();
231
- this.$emit('clichSearchWhere', col);
232
- },
233
- loadSearchWher(data, Buttons) {
234
- this.SearchWhereList = [];
235
- data.rows.forEach((row) => {
219
+ });
220
+ if (field) {
221
+ this.model.getApiData(this.loadSearchWher, field);
222
+ }
223
+ }
224
+ },
225
+ SearchWhereManage() {
226
+ this.$refs.searchwhere.hide();
227
+ this.$emit('SearchWhereManage', this.model);
228
+ },
229
+ clickDropdownItem(col) {
230
+ this.$refs.searchwhere.hide();
231
+ this.$emit('clichSearchWhere', col);
232
+ },
233
+ loadSearchWher(data, Buttons) {
234
+ this.SearchWhereList = [];
235
+ data.rows.forEach((row) => {
236
236
  this.SearchWhereList.push(row);
237
- });
238
- this.SearchWhereButtons = Buttons;
237
+ });
238
+ this.SearchWhereButtons = Buttons;
239
239
  },
240
240
  callTelClick(data){
241
241
  var self=this;
@@ -291,7 +291,7 @@
291
291
  .max-info:hover .subText{
292
292
  color: #fff;
293
293
  }
294
- .max-search-btn-dropdown {
294
+ .max-search-btn-dropdown {
295
295
  margin-right:10px;
296
296
  }
297
297
  .max-search-btn-dropdown .el-dropdown__caret-button::before {
@@ -302,7 +302,7 @@
302
302
  border-radius: 5px 0 0 5px;
303
303
  }
304
304
  .max-search-btn-dropdown .el-dropdown__caret-button {
305
- border-radius: 0 5px 5px 0;
305
+ border-radius: 0 5px 5px 0;
306
306
  }
307
307
  .max-search-btn-dropdown .el-button:first-child:focus {
308
308
  background-color: var(--chinaRed);
@@ -318,4 +318,4 @@
318
318
  border-bottom-color: var(--chinaRed);
319
319
  }
320
320
 
321
- </style>
321
+ </style>
@@ -54,7 +54,7 @@
54
54
  <img :src="(file.videoPlayIconUrl||model.videoPlayIconUrl)" class="hous-icon" />
55
55
  </div>
56
56
  </span>
57
- <span class="cover-list-item-span" v-if="model.lock || model.paramName">
57
+ <span class="cover-list-item-span" v-if="(model.lock&& file.mediaLabelName )|| model.paramName">
58
58
  <!--锁定-->
59
59
  <span v-if="model.lock || !file.rightEdit" class="el-dropdown-link">
60
60
  <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
@@ -143,7 +143,7 @@
143
143
  </div>
144
144
  </span>
145
145
 
146
- <span class="cover-list-item-span" v-if="model.lock || model.paramName">
146
+ <span class="cover-list-item-span" v-if="(model.lock&& file.mediaLabelName )|| model.paramName">
147
147
  <!--锁定-->
148
148
  <span v-if="model.lock || !file.rightEdit" class="el-dropdown-link">
149
149
  <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
@@ -1,12 +1,12 @@
1
- <template>
2
- <el-container v-if="model.routerKey&&model.visibility!='0'&&model.rightRouter&&model.value!=''" :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
3
- <div @click="clickHandlerLayout($event)">
4
- <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
5
- </div>
6
- </el-container>
7
- <el-container v-else-if="model.value!=''&&model.visibility!='0'" :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
8
- <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
9
- </el-container>
1
+ <template>
2
+ <el-container v-if="model.routerKey&&model.visibility!='0'&&model.rightRouter&&model.value!=''" :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
3
+ <div @click="clickHandlerLayout($event)">
4
+ <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
5
+ </div>
6
+ </el-container>
7
+ <el-container v-else-if="model.value!=''&&model.visibility!='0'" :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
8
+ <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
9
+ </el-container>
10
10
  </template>
11
11
  <script>
12
12
  import dynamicElement from '../../mixins/dynamicElement'
@@ -37,13 +37,13 @@
37
37
  };
38
38
  },
39
39
  created() {
40
- this.model = this.loaderObj.CellLayout(this.vmodel);
40
+ this.model = this.loaderObj.CellLayout(this.vmodel);
41
41
  },
42
42
  methods: {
43
43
  clickHandler(routerKey, rowindex, forname, forrowindex,flagHaveAlert) {
44
44
  this.$emit('click', routerKey, rowindex, forname, forrowindex,flagHaveAlert);
45
- },
46
- clickHandlerLayout(ev) {
45
+ },
46
+ clickHandlerLayout(ev) {
47
47
  this.$emit(
48
48
  "click",
49
49
  this.model.routerKey,
@@ -64,16 +64,16 @@
64
64
  for (const vn of vnodes) {
65
65
  destroyDeep(vn)
66
66
  }
67
- }
68
- if (typeof vnode.componentInstance !== 'undefined') {
69
- vnode.componentInstance.$destroy()
67
+ }
68
+ if (typeof vnode.componentInstance !== 'undefined') {
69
+ vnode.componentInstance.$destroy()
70
70
  }
71
71
  setTimeout(() => {
72
72
  vnode.componentInstance = undefined
73
73
  vnode.elm.innerHTML = ''
74
74
  }, 0)
75
75
  }
76
- destroyDeep(this._vnode)
76
+ destroyDeep(this._vnode)
77
77
  },
78
78
  }
79
- </script>
79
+ </script>
@@ -41,16 +41,16 @@
41
41
  for (const vn of vnodes) {
42
42
  destroyDeep(vn)
43
43
  }
44
- }
45
- if (typeof vnode.componentInstance !== 'undefined') {
46
- vnode.componentInstance.$destroy()
44
+ }
45
+ if (typeof vnode.componentInstance !== 'undefined') {
46
+ vnode.componentInstance.$destroy()
47
47
  }
48
48
  setTimeout(() => {
49
49
  vnode.componentInstance = undefined
50
50
  vnode.elm.innerHTML = ''
51
51
  }, 0)
52
52
  }
53
- destroyDeep(this._vnode)
53
+ destroyDeep(this._vnode)
54
54
  },
55
55
  }
56
56
  </script>
@@ -109,16 +109,16 @@
109
109
  for (const vn of vnodes) {
110
110
  destroyDeep(vn)
111
111
  }
112
- }
113
- if (typeof vnode.componentInstance !== 'undefined') {
114
- vnode.componentInstance.$destroy()
112
+ }
113
+ if (typeof vnode.componentInstance !== 'undefined') {
114
+ vnode.componentInstance.$destroy()
115
115
  }
116
116
  setTimeout(() => {
117
117
  vnode.componentInstance = undefined
118
118
  vnode.elm.innerHTML = ''
119
119
  }, 0)
120
120
  }
121
- destroyDeep(this._vnode)
121
+ destroyDeep(this._vnode)
122
122
  },
123
123
  }
124
124
  </script>
@@ -110,8 +110,8 @@
110
110
  },
111
111
  validExcute() {
112
112
  var self = this;
113
- var rtnBool = true;
114
- if (this.model.show) {
113
+ var rtnBool = true;
114
+ if (this.model.show) {
115
115
  if (!self.fieldsValidExcute()) {
116
116
  rtnBool = false;
117
117
  }
@@ -130,7 +130,7 @@
130
130
  showClose: true,
131
131
  });
132
132
  rtnBool = false;
133
- }
133
+ }
134
134
  }
135
135
  return rtnBool;
136
136
  },
@@ -44,6 +44,10 @@ import dynamicElement from '../../mixins/dynamicElement';
44
44
  type: Object,
45
45
  default: () => { }
46
46
  },
47
+ prevParam: {
48
+ type: Object,
49
+ default: () => { }
50
+ },
47
51
  },
48
52
  data() {
49
53
  return {
@@ -61,7 +65,7 @@ import dynamicElement from '../../mixins/dynamicElement';
61
65
  if(self.categoryLoaded){
62
66
  this.$nextTick(function () {
63
67
  if (typeof self.api !== 'undefined') {
64
- self.loaderObj.SearchScreen(self.api, self.load, self.screenPara);
68
+ self.loaderObj.SearchScreen(self.api, self.load, self.screenPara, self.prevParam);
65
69
  }
66
70
  if (typeof self.source !== 'undefined') {
67
71
  self.load(self.loaderObj.SearchScreen(self.source));
@@ -210,7 +210,7 @@ import dynamicElement from "../../mixins/dynamicElement";
210
210
  import dynamicTableTip from "./dynamicTableTip.vue";
211
211
  import dynamicTableToolbar from "./dynamicTableToolbar.vue";
212
212
  import dynamicTableStats from "./dynamicTableStats.vue";
213
- import dynamicLayout from "../../dynamicLayout/src/dynamicLayout.vue";
213
+ import dynamicLayout from "../../dynamicLayout/src/dynamicLayout.vue";
214
214
  import Cookies from 'js-cookie';
215
215
  export default {
216
216
  name: "ct-searchtable",
@@ -984,7 +984,7 @@ export default {
984
984
  routerClickHandler(field, submitData, action) {
985
985
  let self = this;
986
986
  action = action || field.action;
987
- var clickAcion = function () {
987
+ var clickAcion = function () {
988
988
  self.$emit('doClosePopoverHandle');
989
989
  //若不是客户端方法,则直接访问接口
990
990
  if (!field.isClientFuntion) {
@@ -1360,9 +1360,9 @@ export default {
1360
1360
  var fun = self.$common.getDataDrivenOpts().handler[action];
1361
1361
  if (self.isIframe) {
1362
1362
  submitData.isIframe = self.isIframe;
1363
- }
1364
- if (action == "openPropertyDetailRET" || action == "openPropertyDetailOFI") {
1365
- self.setCookies(action + submitData.chanceID);
1363
+ }
1364
+ if (action == "openPropertyDetailRET" || action == "openPropertyDetailOFI") {
1365
+ self.setCookies(action + submitData.chanceID);
1366
1366
  }
1367
1367
  fun(submitData, title, self.$parent);
1368
1368
  }
@@ -1713,21 +1713,21 @@ export default {
1713
1713
  this.model.setSelectAll();
1714
1714
  this.selectAllType = this.model.getSelectAll();
1715
1715
  this.$forceUpdate();
1716
- },
1717
- setCookies(key) {
1718
- var curDate = new Date();
1719
- //当前时间戳
1720
- var curTamp = curDate.getTime();
1721
- //当日凌晨的时间戳,减去一毫秒是为了防止后续得到的时间不会达到00:00:00的状态
1722
- var curWeeHours = new Date(curDate.toLocaleDateString()).getTime() - 1;
1723
- //当日已经过去的时间(毫秒)
1724
- var passedTamp = curTamp - curWeeHours;
1725
- //当日剩余时间
1726
- var leftTamp = 24 * 60 * 60 * 1000 - passedTamp;
1727
- var expires = new Date();
1728
- expires.setTime(leftTamp + curTamp);
1716
+ },
1717
+ setCookies(key) {
1718
+ var curDate = new Date();
1719
+ //当前时间戳
1720
+ var curTamp = curDate.getTime();
1721
+ //当日凌晨的时间戳,减去一毫秒是为了防止后续得到的时间不会达到00:00:00的状态
1722
+ var curWeeHours = new Date(curDate.toLocaleDateString()).getTime() - 1;
1723
+ //当日已经过去的时间(毫秒)
1724
+ var passedTamp = curTamp - curWeeHours;
1725
+ //当日剩余时间
1726
+ var leftTamp = 24 * 60 * 60 * 1000 - passedTamp;
1727
+ var expires = new Date();
1728
+ expires.setTime(leftTamp + curTamp);
1729
1729
  return Cookies.set(key, "", { expires: expires })
1730
- },
1730
+ },
1731
1731
  calculatingRowHeight() {
1732
1732
  let self = this;
1733
1733
 
@@ -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"
5
+ @loaded="screenLoaded" :screenPara="screenPara" :prevParam="prevParam"
6
6
  :categoryLoaded="loaded.categoryLoaded" @search="search()" @saveShortcut="saveShortcut"
7
7
  @showTitle="showTitleScreenHandler"></ct-searchscreen>
8
8
 
@@ -52,6 +52,10 @@
52
52
  type: Object,
53
53
  default: () => { }
54
54
  },
55
+ prevParam: {
56
+ type: Object,
57
+ default: () => { }
58
+ },
55
59
  from: {
56
60
  String,
57
61
  default:'searchlist'
@@ -347,6 +351,9 @@
347
351
  this.$emit('submit', tempListData);
348
352
  this.$common.closeDialog(this);
349
353
  },
354
+ getPrevParam(){
355
+ return this.$refs.screen.model.getPrevParam();
356
+ },
350
357
  },
351
358
  beforeDestroy() {
352
359
  async function destroyDeep(vnode) {
@@ -12,9 +12,16 @@
12
12
  </div>
13
13
  <div class="ct-radios">
14
14
  <el-radio-group v-model="activeIndex" @change="categorychangeHandler($event)">
15
- <el-radio-button v-bind="{class:'ct-font-size-mini'}" v-for="(col, index) in categorySource.selectItems1" :key="index" v-model="col.code" :label="index">
16
- {{col.name}}
17
- </el-radio-button >
15
+ <template v-if="categorySource.routerKey && categorySource.routerKey=='openMultiList'">
16
+ <el-radio-button v-bind="{class:'ct-font-size-mini'}" v-for="(col, index) in categorySource.selectItems1" :key="index" v-model="col.code" :label="index" @click.native.prevent="categoryClickHandler(col,index)">
17
+ {{col.name}}
18
+ </el-radio-button>
19
+ </template>
20
+ <template v-else>
21
+ <el-radio-button v-bind="{class:'ct-font-size-mini'}" v-for="(col, index) in categorySource.selectItems1" :key="index" v-model="col.code" :label="index">
22
+ {{col.name}}
23
+ </el-radio-button>
24
+ </template>
18
25
  </el-radio-group>
19
26
  </div>
20
27
  </div>
@@ -22,7 +29,7 @@
22
29
  <div v-if="categorySource" class="el-tabs__content">
23
30
  <div v-for="(col, index) in categorySource.selectItems1" v-show="activeIndex===index" v-loading="isLoading" :key="index" :index="index" class="el-tab-pane" role="tabpanel" aria-hidden="true">
24
31
  <ct-searchlistOne v-if="col.loaded" :ref="'searchlist'+index" :searchConditionApi="searchConditionApi" :pageHeight="listHeight" :categorySource="col.code"
25
- :searchStatsApi="searchStatsApi" :searchDataApi="searchDataApi" :apiParam="col.screenPara" @tableLoaded="tableLoaded">
32
+ :searchStatsApi="searchStatsApi" :searchDataApi="searchDataApi" :apiParam="col.screenPara" :prevParam="prevParam" @tableLoaded="tableLoaded">
26
33
  </ct-searchlistOne>
27
34
  </div>
28
35
  </div>
@@ -50,6 +57,10 @@
50
57
  type: Object,
51
58
  default: () => { }
52
59
  },
60
+ prevParam: {
61
+ type: Object,
62
+ default: () => { }
63
+ },
53
64
  from: {
54
65
  String,
55
66
  default:'searchlist'
@@ -137,13 +148,14 @@
137
148
  }
138
149
  );
139
150
  },
140
- categorychangeHandler() {
141
- if(this.categorySource.routerKey && this.categorySource.routerKey=='openMultiList1212'){
142
- this.activeIndex=this.openMultiListIndex>-1?this.openMultiListIndex:0;
143
- this.$common.getDataDrivenOpts().handler.openTabRouter('ofi_propertyList', '');
151
+ categoryClickHandler(col,index) {
152
+ if(this.categorySource.routerKey && this.categorySource.routerKey=='openMultiList'){
153
+ let prevParam = this.$refs['searchlist'+this.activeIndex][0].getPrevParam();
154
+ this.$common.getDataDrivenOpts().handler.openTabSearchRouter('ofi_propertyList', index, prevParam);
144
155
  return;
145
156
  }
146
-
157
+ },
158
+ categorychangeHandler() {
147
159
  let i = this.activeIndex;
148
160
  let parm={};
149
161
  parm[this.categorySource.fieldName1]=this.categorySource.selectItems1[i].code;
@@ -78,12 +78,12 @@
78
78
  else {
79
79
  this.model = this.vmodel;
80
80
  }
81
- this.$watch('model.value', (n, o) => {
82
- if (typeof this.model.child !== 'undefined' && this.model.enableRelationFields) {
83
- for (var item of this.model.child) {
81
+ this.$watch('model.value', (n, o) => {
82
+ if (typeof this.model.child !== 'undefined' && this.model.enableRelationFields) {
83
+ for (var item of this.model.child) {
84
84
  item.value = item.defaultValue || '';
85
- item.text = item.defaultText || '';
86
- item.enableRelationFields = this.model.enableRelationFields;
85
+ item.text = item.defaultText || '';
86
+ item.enableRelationFields = this.model.enableRelationFields;
87
87
  }
88
88
  }
89
89
  });
@@ -147,11 +147,11 @@
147
147
  var self = this;
148
148
  this.model.getOptions(this.api, self.searchText);
149
149
  },
150
- soChange: function () {
151
- var self = this;
150
+ soChange: function () {
151
+ var self = this;
152
152
  this.model.enableRelationFields = true;
153
153
  if (typeof this.model.child !== 'undefined') {
154
- for (var item of this.model.child) {
154
+ for (var item of this.model.child) {
155
155
  item.value = item.defaultValue || '';
156
156
  item.text = item.defaultText || '';
157
157
  }
@@ -54,9 +54,8 @@ export default {
54
54
  currentNodeIndex: 0,// 当前节点索引
55
55
  };
56
56
  },
57
-
58
57
  mounted() {
59
-
58
+
60
59
  },
61
60
  methods: {
62
61
  search(m) {
@@ -123,6 +122,10 @@ export default {
123
122
  self.loading = false;
124
123
  self.LastResolve = treeResolve;
125
124
  self.menuVisible = false;
125
+ self.$nextTick(() => {
126
+ self.$refs.Tree.setCurrentKey(self.model.modeltree[0].code)
127
+ });
128
+ self.handleNodeClick(self.model.modeltree[0]);
126
129
  },
127
130
  searchComplate(m, defaultSearch, resolve) {
128
131
  var self = this;
@@ -46,7 +46,7 @@
46
46
  <!--Photo-->
47
47
  <template v-else-if="itemFile.mediaTypeID == '2'">
48
48
  <ct-viewerImage ref="viewerImage"
49
- :imgUrl="resultObject+'/'+displayAreaWidth+'/'+displayAreaHeight+'?FlagC=0'"
49
+ :imgUrl="resultObject+((!itemFile.flagUrl)?'/'+displayAreaWidth+'/'+displayAreaHeight+'?FlagC=0':'')"
50
50
  :rotate="rotate"></ct-viewerImage>
51
51
  </template>
52
52
  <!--ThreeDimensional-->
@@ -15,8 +15,8 @@ const formData = {
15
15
  formTable:null,
16
16
  excuteData: null,//fields
17
17
  fieldsDic: null,//fieldsDic
18
- _excuteListData: undefined,
19
-
18
+ _excuteListData: undefined,
19
+
20
20
  enableRelationFields(FlagRelation) {
21
21
  this.form.enableRelationFields = FlagRelation
22
22
  },
@@ -308,4 +308,4 @@ if (typeof window !== 'undefined' && window.Vue) {
308
308
  window.Vue.use(formData);
309
309
  }
310
310
 
311
- export default formData;
311
+ export default formData;