centaline-data-driven 1.5.15 → 1.5.17

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 (10) hide show
  1. package/package.json +1 -1
  2. package/release-log.md +13 -0
  3. package/src/SearchList.vue +6 -2
  4. package/src/centaline/dynamicSearchList/src/dynamicSearchList.vue +3 -0
  5. package/src/centaline/dynamicSearchList/src/dynamicSearchSideMenu.vue +9 -3
  6. package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +12 -3
  7. package/src/centaline/dynamicTree/src/dynamicTree.vue +2 -17
  8. package/src/main.js +4 -4
  9. package/wwwroot/static/centaline/centaline-data-driven.js +2 -2
  10. 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.15",
3
+ "version": "1.5.17",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/release-log.md CHANGED
@@ -1,3 +1,16 @@
1
+ ## v1.5.17
2
+ 2023-05-19
3
+
4
+ Bug Fixes
5
+
6
+ 优化列表页表格可拖拽提示框显示判断
7
+ ## v1.5.16
8
+ 2023-05-18
9
+
10
+ Bug Fixes
11
+
12
+ 优化列表页侧边栏展开收起按钮样式
13
+
1
14
  ## v1.5.15
2
15
  2023-05-15
3
16
 
package/src/SearchList.vue CHANGED
@@ -33,11 +33,11 @@
33
33
  :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
34
34
  </ct-searchlist> -->
35
35
 
36
- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
36
+ <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
37
37
  :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
38
38
  :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
39
39
  :searchStatsApi="'/PropertyRETList/getListStats'">
40
- </ct-searchlist>
40
+ </ct-searchlist> -->
41
41
 
42
42
  <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
43
43
  :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"
@@ -45,6 +45,10 @@
45
45
  :searchStatsApi="'/PropertyOFIList/getListStats'">
46
46
  </ct-searchlist> -->
47
47
 
48
+ <ct-searchlist :searchConditionApi="'/EstateList/getLayoutOfSearch'"
49
+ :searchDataApi="'/EstateList/getListOfSearchModel'">
50
+ </ct-searchlist>
51
+
48
52
  <ct-dialog-list></ct-dialog-list>
49
53
  </div>
50
54
  </template>
package/src/centaline/dynamicSearchList/src/dynamicSearchList.vue CHANGED
@@ -101,6 +101,9 @@
101
101
  this.$refs.detail.$children[0].refreshPage();
102
102
  }
103
103
  }
104
+ if(this.$refs.table){
105
+ this.$refs.table.resetScrollActivated();
106
+ }
104
107
  })
105
108
  },
106
109
  data() {
package/src/centaline/dynamicSearchList/src/dynamicSearchSideMenu.vue CHANGED
@@ -39,12 +39,18 @@
39
39
  width: 15px;
40
40
  height: 48px;
41
41
  position: absolute;
42
- top: 45%;
42
+ top: 50%;
43
+ transform: translateY(-50%);
43
44
  cursor: pointer;
44
- background-color: #fff;
45
+ background-color: var(--chinaRed);
46
+ color: #fff;
47
+
48
+
45
49
  }
46
50
  .toggler >span{
47
- margin-top: 15px;
51
+ position: absolute;
52
+ top: 50%;
53
+ transform: translateY(-50%);
48
54
  }
49
55
  .sidebar > .toggler {
50
56
  -webkit-border-top-left-radius: 4px;
package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue CHANGED
@@ -175,7 +175,7 @@
175
175
  </td>
176
176
  </tr>
177
177
  <!--适配滚动条-->
178
- <tr v-else v-bind:style="{ height: row.$heigth + 'px' }"></tr>
178
+ <tr v-else v-bind:style="{ height: (row.$heigth || 31) + 'px' }"></tr>
179
179
  </tbody>
180
180
  </table>
181
181
  </div>
@@ -307,9 +307,13 @@ export default {
307
307
  },
308
308
  methods: {
309
309
  theadTitleHover(ev){
310
+ if ( !this.model.columnWidthSaveAction) {
311
+ return
312
+ }
310
313
  this.theadTitleShow = true
311
314
  let tagsViewHeight = 0
312
- let thHeight = 0
315
+ let thHeight = 0;
316
+
313
317
  if (document.getElementById("tags-view-container")) {
314
318
  tagsViewHeight = document.getElementById("tags-view-container").offsetHeight;
315
319
  thHeight = document.getElementById("thHeight").offsetHeight;
@@ -422,7 +426,12 @@ export default {
422
426
  if (ev.offsetX > ev.currentTarget.offsetWidth - 10) {
423
427
  ev.currentTarget.style.cursor = "col-resize";
424
428
  ev.currentTarget.canResize = true;
429
+ if ( this.model.columnWidthSaveAction) {
425
430
  this.theadTitleShow = true
431
+ }else{
432
+ this.theadTitleShow = false
433
+ }
434
+
426
435
  } else {
427
436
  ev.currentTarget.style.cursor = "default";
428
437
  ev.currentTarget.canResize = false;
@@ -1030,7 +1039,7 @@ export default {
1030
1039
  });
1031
1040
  self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0,mediaviewpagetype);
1032
1041
  }
1033
- }
1042
+ }
1034
1043
  else if (field.isUrlInLayer) {//URL页面（弹层iframe）
1035
1044
  var dialogOption = {
1036
1045
  title: field.pageTitle,
package/src/centaline/dynamicTree/src/dynamicTree.vue CHANGED
@@ -11,22 +11,7 @@
11
11
                                      <el-input class="slot-t-input" size="mini" autofocus   v-model="data.label"   :ref="'slotTreeInput'+data.id"   @blur.stop="NodeBlur(node,data)"   @keydown.native.enter="NodeBlur(node,data)"></el-input>
12
12
                                  </span>
13
13
                          </span>
14
- </el-tree>
15
-
16
-    <el-card class="box-card" ref="card" v-show="menuVisible">
17
-                     <div @click="addSameLevelNode()" v-show="firstLevel">
18
-                             <i class="el-icon-circle-plus-outline"></i>&nbsp;&nbsp;同级增加
19
-                         </div>
20
-                     <div class="add" @click="addChildNode()">
21
-                             <i class="el-icon-circle-plus-outline"></i>&nbsp;&nbsp;子级增加
22
-                         </div>
23
-                     <div class="delete" @click="deleteNode()">
24
-                             <i class="el-icon-remove-outline"></i>&nbsp;&nbsp;删除节点
25
-                         </div>
26
-                     <div class="edit" @click="editNode()">
27
-                             <i class="el-icon-edit"></i>&nbsp;&nbsp;修改节点
28
-                         </div>
29
-                 </el-card>
14
+ </el-tree>
30
15
  </div>
31
16
  </template>
32
17
 
@@ -60,7 +45,7 @@ export default {
60
45
  id: 'code'
61
46
  },
62
47
  treeHeight:'100%',
63
- searchStatus:[]
48
+ searchStatus:[],
64
49
  };
65
50
  },
66
51
  methods: {
package/src/main.js CHANGED
@@ -14,8 +14,8 @@ Vue.use(ElementUI, { size: 'mini'});
14
14
  // 关闭生产模式下给出的提示
15
15
  Vue.config.productionTip = false;
16
16
  Vue.use(centaline, {
17
- // baseUrl: "http://10.88.22.46:7070/max-uplink-api/v1/form/router",
18
- baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
17
+ baseUrl: "http://10.88.22.46:7070/max-uplink-api/",
18
+ // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
19
19
  // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
20
20
  // baseUrl: "http://10.25.10.67:9999/service-api/v1/form/router",
21
21
  // baseUrl: "http://10.25.10.67:8080/",
@@ -53,8 +53,8 @@ Vue.use(centaline, {
53
53
  getRequestHeaders: function () {
54
54
  return {
55
55
  oldToken: 'af4e8a8b-4fa8-4c39-9464-ce571f45ca7d',
56
- token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOivZ8drrTef403CIKB8jhQqRRAIh7k4Q0NEzxSumeXMXyzaIRmhL7JNVEAw6QKsMMOYMQVrLOkutY-z4A_yYLx1SYO8TAcrWAmaTgOuQQbNpIyZPMVlRiXI9i0ZZh7WSinUl5n59C1VreoltKZdDuf0j7rTO-20pex2RAx76IyCrEfrREUwTT6yIRixSPJ4AAAD__w.wAUATW0EA3yAngNmuDunzbhZt8SG1DkJtTILBEkM8P8',
57
- authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOivZ8drrTef403CIKB8jhQqRRAIh7k4Q0NEzxSumeXMXyzaIRmhL7JNVEAw6QKsMMOYMQVrLOkutY-z4A_yYLx1SYO8TAcrWAmaTgOuQQbNpIyZPMVlRiXI9i0ZZh7WSinUl5n59C1VreoltKZdDuf0j7rTO-20pex2RAx76IyCrEfrREUwTT6yIRixSPJ4AAAD__w.wAUATW0EA3yAngNmuDunzbhZt8SG1DkJtTILBEkM8P8"}',
56
+ token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVaK7fXamy7xp-EQKI6MFCpEEgmEuDsgoKNnildMM-8Gy1agA8NO-sQKgyWPxMqiUM4YWmYxuTUmxr18wB_zZU8uSN8nh9QOjJRtQtEhoxE7REq9i4mhgXo5QafYk2Vi1g3M4_oW5Lx-iW2p5129_uPccZ2fWRn9QZGesHItSN5U9HYklIls0bZQNR7uDwAAAP__.kgkeZ-gn1KkFyMvrZhqiFb2wjlMUs1NV4cTVCu4OFYY',
57
+ authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVaK7fXamy7xp-EQKI6MFCpEEgmEuDsgoKNnildMM-8Gy1agA8NO-sQKgyWPxMqiUM4YWmYxuTUmxr18wB_zZU8uSN8nh9QOjJRtQtEhoxE7REq9i4mhgXo5QafYk2Vi1g3M4_oW5Lx-iW2p5129_uPccZ2fWRn9QZGesHItSN5U9HYklIls0bZQNR7uDwAAAP__.kgkeZ-gn1KkFyMvrZhqiFb2wjlMUs1NV4cTVCu4OFYY"}',
58
58
 
59
59
  originalRequestURL: 'http://10.88.22.67:8080',
60
60
  EstateInfo: '{"estateId":"20191114134322C29C9B83A84F192964","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',