centaline-data-driven 1.5.17 → 1.5.19

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 +29 -7
  3. package/src/SearchList.vue +5 -0
  4. package/src/assets/tableIcon-more.png +0 -0
  5. package/src/centaline/dynamicDetail/src/dynamicAlbums.vue +13 -8
  6. package/src/centaline/dynamicDetail/src/dynamicDetail.vue +7 -0
  7. package/src/centaline/dynamicDetail/src/dynamicEstateSimpleDetail.vue +766 -0
  8. package/src/centaline/dynamicFile/src/dynamicFile.vue +14 -11
  9. package/src/centaline/dynamicLayout/src/dynamicLayout.vue +1 -1
  10. package/src/centaline/dynamicLayout/src/dynamicLayoutChildren.vue +16 -4
  11. package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +3 -2
  12. package/src/centaline/dynamicViewerFile/src/dynamicViewerFile.vue +3 -3
  13. package/src/main.js +3 -3
  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
@@ -2059,12 +2059,13 @@ export default {
2059
2059
  .div_allinline .Stats-popover {
2060
2060
  float: right;
2061
2061
  margin-top: 3px;
2062
- margin-left: 4px;
2062
+ margin-left: 0px;
2063
2063
  height: 16px;
2064
2064
  }
2065
2065
 
2066
2066
  .icon-more {
2067
- background: url("../../../assets/XL.png") no-repeat;
2067
+ /* background: url("../../../assets/XL.png") no-repeat; */
2068
+ background: url("../../../assets/tableIcon-more.png") no-repeat;
2068
2069
  background-size: 100% 100%;
2069
2070
  width: 16px;
2070
2071
  height: 16px;
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
@@ -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-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"}',
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.eNrEjr0OgjAURt-lMzdp6e1trxv0Z_EhCNCS4GQEEo3x3cUEN3fP8A1nOd9TLNsgTkKT5SaSAm_QAZIywJgSeEnEOkmtQ-j4AH7Mlw6t56aJFlC2BJhMBK59As2mDRgbGyKJSpT7VZwUOXRskLESc78eQrL8iG0pt3N5_OPcZZ33bB6N1HVdQLIb9-w0AU9EMDCSzFll0w_i9QYAAP__.2AsfxPGWwPqY5WHplPCbMmK0IfL6D0s4IZJi653U7io"}',
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"}',