centaline-data-driven 1.5.16 → 1.5.18

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 (15) hide show
  1. package/package.json +1 -1
  2. package/release-log.md +27 -5
  3. package/src/SearchList.vue +11 -2
  4. package/src/centaline/dynamicDetail/src/dynamicAlbums.vue +13 -8
  5. package/src/centaline/dynamicDetail/src/dynamicDetail.vue +7 -0
  6. package/src/centaline/dynamicDetail/src/dynamicEstateSimpleDetail.vue +766 -0
  7. package/src/centaline/dynamicFile/src/dynamicFile.vue +14 -11
  8. package/src/centaline/dynamicLayout/src/dynamicLayout.vue +1 -1
  9. package/src/centaline/dynamicLayout/src/dynamicLayoutChildren.vue +16 -4
  10. package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +11 -2
  11. package/src/centaline/dynamicTree/src/dynamicTree.vue +2 -17
  12. package/src/centaline/dynamicViewerFile/src/dynamicViewerFile.vue +3 -3
  13. package/src/main.js +5 -5
  14. package/wwwroot/static/centaline/centaline-data-driven.js +3 -3
  15. package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
package/src/centaline/dynamicFile/src/dynamicFile.vue CHANGED
@@ -29,8 +29,10 @@
29
29
  </div>
30
30
  <div slot="file" slot-scope="{ file }" :title="file.fileName">
31
31
  <div class="cover-list-item">
32
- <el-image fit="fill" :src="file.url?file.url:file.mediaUrl?file.mediaUrl+'/100/100':require('../../../assets/blank.png')" style="width: 100px; height: 100px" :z-index="previewZIndex" @click="viewerfile(file)">
32
+ <div @click="viewerfile(file)">
33
+ <el-image fit="fill" :src="file.url?file.url:file.mediaUrl?file.mediaUrl+'/100/100':require('../../../assets/blank.png')" style="width: 100px; height: 100px" :z-index="previewZIndex">
33
34
  </el-image>
35
+ </div>
34
36
  <span class="cover-list-item-span-Default" v-if="(model.lock&&file.flagDefault)||(model.rightDefault&&model.rightDefault==1&&file.mediaTypeID==2)">
35
37
  <i>
36
38
  <el-radio v-model="file.flagDefault" :label="true" :class="{'browseDefault':model.lock}" @change="handleDefault($event,file)" :disabled="model.lock" title="设为封面">&nbsp;</el-radio>
@@ -43,13 +45,13 @@
43
45
  <i class="el-icon-delete" @click="handleRemove(file)"></i>
44
46
  </span>
45
47
  <span class="cover-list-item-play" v-if="file.videoPlayIconUrl">
46
- <div class="swiper-i">
47
- <img :src="file.videoPlayIconUrl" class="hous-icon" @click="viewerfile(file)" />
48
+ <div class="swiper-i" @click="viewerfile(file)" >
49
+ <img :src="file.videoPlayIconUrl" class="hous-icon"/>
48
50
  </div>
49
51
  </span>
50
52
  <span class="cover-list-item-play" v-else-if="file.mediaTypeID==4 && (file.videoPlayIconUrl||model.videoPlayIconUrl)">
51
- <div class="swiper-i">
52
- <img :src="(file.videoPlayIconUrl||model.videoPlayIconUrl)" class="hous-icon" @click="viewerfile(file)" />
53
+ <div class="swiper-i" @click="viewerfile(file)">
54
+ <img :src="(file.videoPlayIconUrl||model.videoPlayIconUrl)" class="hous-icon" />
53
55
  </div>
54
56
  </span>
55
57
  <span class="cover-list-item-span" v-if="model.lock || model.paramName">
@@ -116,8 +118,9 @@
116
118
  </div>
117
119
  <div slot="file" slot-scope="{ file }" :title="file.fileName">
118
120
  <div class="cover-list-item">
119
- <el-image fit="fill" :src="file.fileName?file.url:require('../../../assets/blank.png')" style="width: 100px; height: 100px" :z-index="previewZIndex" @click="viewerfile(file)">
120
- </el-image>
121
+ <div @click="viewerfile(file)">
122
+ <el-image fit="fill" :src="file.fileName?file.url:require('../../../assets/blank.png')" style="width: 100px; height: 100px" :z-index="previewZIndex" >
123
+ </el-image></div>
121
124
  <span class="cover-list-item-span-Default" v-if="(model.lock&&file.flagDefault)||(model.rightDefault&&model.rightDefault==1&&file.mediaTypeID==2)">
122
125
  <i>
123
126
  <el-radio v-model="file.flagDefault" :label="true" :class="{'browseDefault':model.lock}" @change="handleDefault($event,file)" :disabled="model.lock" title="设为封面">&nbsp;</el-radio>
@@ -130,13 +133,13 @@
130
133
  <i class="el-icon-delete" @click="handleRemove(file)"></i>
131
134
  </span>
132
135
  <span class="cover-list-item-play" v-if="file.videoPlayIconUrl">
133
- <div class="swiper-i">
134
- <img :src="file.videoPlayIconUrl" class="hous-icon" @click="viewerfile(file)" />
136
+ <div class="swiper-i" @click="viewerfile(file)">
137
+ <img :src="file.videoPlayIconUrl" class="hous-icon" />
135
138
  </div>
136
139
  </span>
137
140
  <span class="cover-list-item-play" v-else-if="file.mediaTypeID==4 && (file.videoPlayIconUrl||model.videoPlayIconUrl)">
138
- <div class="swiper-i">
139
- <img :src="(file.videoPlayIconUrl||model.videoPlayIconUrl)" class="hous-icon" @click="viewerfile(file)" />
141
+ <div class="swiper-i" @click="viewerfile(file)">
142
+ <img :src="(file.videoPlayIconUrl||model.videoPlayIconUrl)" class="hous-icon" />
140
143
  </div>
141
144
  </span>
142
145
 
package/src/centaline/dynamicLayout/src/dynamicLayout.vue CHANGED
@@ -186,7 +186,7 @@
186
186
  return b.id === attribute.nodeValue;
187
187
  });
188
188
  if (typeof field !== "undefined") {
189
- if ((!field.rightField || self.vmodel[field.rightField] == 1) && field.show) {
189
+ if ((!field.rightField || !self.vmodel[field.rightField]|| self.vmodel[field.rightField] == 1) && field.show) {
190
190
  obj["rightRouter"] = true;
191
191
  }
192
192
 
package/src/centaline/dynamicLayout/src/dynamicLayoutChildren.vue CHANGED
@@ -1,5 +1,10 @@
1
1
  <template>
2
- <el-container v-if="model.visibility!='0'" :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
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">
3
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>
4
9
  </el-container>
5
10
  </template>
@@ -37,7 +42,16 @@
37
42
  methods: {
38
43
  clickHandler(routerKey, rowindex, forname, forrowindex,flagHaveAlert) {
39
44
  this.$emit('click', routerKey, rowindex, forname, forrowindex,flagHaveAlert);
40
- }
45
+ },
46
+ clickHandlerLayout(ev) {
47
+ this.$emit(
48
+ "click",
49
+ this.model.routerKey,
50
+ this.rowindex,
51
+ this.forname,
52
+ this.forrowindex
53
+ );
54
+ },
41
55
  },
42
56
  mounted() {
43
57
 
@@ -63,5 +77,3 @@
63
77
  },
64
78
  }
65
79
  </script>
66
- <style>
67
- </style>
package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue CHANGED
@@ -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/centaline/dynamicViewerFile/src/dynamicViewerFile.vue CHANGED
@@ -104,7 +104,7 @@
104
104
  <template v-else>
105
105
  <div class="viewerContent"
106
106
  style="max-height: 200px; text-align: center">
107
- <a :href="resultObject">
107
+ <a :href="resultObject" target="_blank">
108
108
  <img :src="itemFile.thumbnailUrl" /><br />{{
109
109
  itemFile.mediaLabelName || itemFile.fileName
110
110
  }}
@@ -115,8 +115,8 @@
115
115
  <template v-else>
116
116
  <div class="viewerContent"
117
117
  style="max-height: 200px; text-align: center">
118
- <a :href="resultObject">
119
- <img :src="itemFile.thumbnailUrl" /><br />{{
118
+ <a :href="resultObject" target="_blank">
119
+ <img :src="itemFile.thumbnailUrl" /><br />{{
120
120
  itemFile.mediaLabelName || itemFile.fileName
121
121
  }}
122
122
  </a>
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/",
@@ -52,9 +52,9 @@ Vue.use(centaline, {
52
52
  // 获取请求头
53
53
  getRequestHeaders: function () {
54
54
  return {
55
- oldToken: 'af4e8a8b-4fa8-4c39-9464-ce571f45ca7d',
56
- token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOivZ2fXamy7xp-EQUT5GggqRRAIh7g5IoaNnildMM--hlm1UjUJ20iY2ECx5IDYWhHKGoJkFs0aMsZcd-DFfenJB2jY5IN0xULYJpA4ZUGwXKbUuJlaVKreLagx7QjFoqFKnYd2FJvmIbSnXQ7n_49x5Pb2zRsTNftIw8jQDWZxAdBEoHu041_U82KN6vgAAAP__.igNZCkByKZVx7ci5HTbVgN6sWu70SyMo-hcZvYadMBw',
57
- authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOivZ2fXamy7xp-EQUT5GggqRRAIh7g5IoaNnildMM--hlm1UjUJ20iY2ECx5IDYWhHKGoJkFs0aMsZcd-DFfenJB2jY5IN0xULYJpA4ZUGwXKbUuJlaVKreLagx7QjFoqFKnYd2FJvmIbSnXQ7n_49x5Pb2zRsTNftIw8jQDWZxAdBEoHu041_U82KN6vgAAAP__.igNZCkByKZVx7ci5HTbVgN6sWu70SyMo-hcZvYadMBw"}',
55
+ oldToken: 'e087f307-b794-4c49-9e0e-f1fe22e218de',
56
+ token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
57
+ authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4"}',
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"}',