centaline-data-driven 1.3.89 → 1.3.90

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 (8) hide show
  1. package/package.json +1 -1
  2. package/src/SearchList.vue +4 -4
  3. package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue +27 -6
  4. package/src/centaline/dynamicT/src/dynamicT.vue +1 -1
  5. package/src/centaline/loader/src/ctl/Detail.js +0 -1
  6. package/src/main.js +1 -1
  7. package/wwwroot/static/centaline/centaline-data-driven.js +2 -2
  8. 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.3.89",
3
+ "version": "1.3.90",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/src/SearchList.vue CHANGED
@@ -11,16 +11,16 @@
11
11
  :searchStatsApi="'/ProfileWorklistList/getListStats'">
12
12
  </ct-searchlist> -->
13
13
 
14
- <ct-searchlist
14
+ <!-- <ct-searchlist
15
15
  :searchConditionApi="'/customermanage/MyCustomerList/getLayoutOfSearch'"
16
16
  :searchDataApi="'/customermanage/MyCustomerList/getList'">
17
- </ct-searchlist>
17
+ </ct-searchlist> -->
18
18
 
19
- <!-- <ct-searchlist
19
+ <ct-searchlist
20
20
  :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'"
21
21
  :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'"
22
22
  :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
23
- </ct-searchlist> -->
23
+ </ct-searchlist>
24
24
 
25
25
  <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
26
26
  :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue CHANGED
@@ -1,15 +1,22 @@
1
1
  <template>
2
2
  <div ref="main" class="main" v-if="model!==null">
3
- <div style="height:36px;margin-top: 10px;display: flex;border-bottom: solid 2px #EE6B6B;">
4
- <img :src="model.fields1Dic.ewmUrl.value" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:22px;cursor: pointer">
3
+ <div style="height:36px;margin-top: 10px;display: flex;border-bottom: solid 2px #EE6B6B;">
4
+ <el-popover v-if="model.routerForQRCode !== null" placement="left-start" trigger="hover" @show="fieldClickHandler(model.routerForQRCode, $event)">
5
+ <div style="border-bottom:none">
6
+ <div style="text-align: center;margin-bottom:10px;">APP扫码</div>
7
+ <div style="width:200px; height:200px;"><img :src="model.QRCode" @click="fieldClickHandler(model.routerForQRCode, $event)" /></div>
8
+ <div style="text-align: center;margin-top:10px;">点击二维码刷新</div>
9
+ </div>
10
+ <img class="code-ewm" slot="reference" :src="model.fields1Dic.ewmUrl.value" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:22px;" />
11
+ </el-popover>
5
12
  <div :style="{'width':topWidth+'px'}" style="font-size: 14px;color: #333333;padding-left: 10px;line-height: 26px;">
6
13
  <span>{{model.fields1Dic.PropertyNo.label}}</span>
7
14
  <span>{{model.fields1Dic.PropertyNo.value}}</span>
8
15
  </div>
9
- <img :class="{'domDisabled':selectIndex<=0}" @click="clickPrevHandler" src="../../../assets/T.png" alt=""
10
- style="width: 26px;height: 26px;vertical-align: bottom;margin-right:11px;cursor: pointer">
11
- <img :class="{'domDisabled':selectIndex===rowCount-1}" @click="clickNextHandler" src="../../../assets/B.png" alt=""
12
- style="width: 26px;height: 26px;vertical-align: bottom;margin-right:8px;cursor: pointer">
16
+ <img :class="{'domDisabled':selectIndex<=0}" @click="clickPrevHandler" src="../../../assets/T.png" alt=""
17
+ style="width: 26px;height: 26px;vertical-align: bottom;margin-right:11px;cursor: pointer">
18
+ <img :class="{'domDisabled':selectIndex===rowCount-1}" @click="clickNextHandler" src="../../../assets/B.png" alt=""
19
+ style="width: 26px;height: 26px;vertical-align: bottom;margin-right:8px;cursor: pointer">
13
20
  <div class="el-icon-close cursor" style="padding-top: 5px;" @click="closeSideHandler"></div>
14
21
  </div>
15
22
  <div style="padding-left: 20px;padding-right: 20px;">
@@ -253,6 +260,9 @@
253
260
  loadBaseInfo() {
254
261
  this.model.loadBaseInfo();
255
262
  },
263
+ loadqrCode() {
264
+ this.model.loadqrCode();
265
+ },
256
266
  handleClick(tab, event) {
257
267
  let i=tab.index;
258
268
  if(this.model.tags2 && this.model.tags2[i]){
@@ -297,6 +307,11 @@
297
307
  });
298
308
  callBack="loadOperation";
299
309
  }
310
+ if (router == undefined && this.model.routerForQRCode) {
311
+ if (field.id === this.model.routerForQRCode.id) {
312
+ router = this.model.routerForQRCode;
313
+ }
314
+ }
300
315
 
301
316
  if(router){
302
317
  if(field.isSubmitDataFromSelf){
@@ -312,6 +327,9 @@
312
327
  if(router.id=="PropertyEdit"){
313
328
  callBack="loadBaseInfo"
314
329
  }
330
+ else if (router.id == "qrCode") {
331
+ callBack = "loadqrCode"
332
+ }
315
333
  }
316
334
 
317
335
  if(callBack){
@@ -321,6 +339,9 @@
321
339
  else if(callBack=='loadBaseInfo'){
322
340
  this.routerClickHandler(router, submitData, self.loadBaseInfo);
323
341
  }
342
+ else if (callBack == 'loadqrCode') {
343
+ self.loadqrCode();
344
+ }
324
345
  }
325
346
  else{
326
347
  this.routerClickHandler(router,submitData);
package/src/centaline/dynamicT/src/dynamicT.vue CHANGED
@@ -115,7 +115,7 @@
115
115
  self.$emit('popupSearchList', false, self.model, self.model.moreActionRouter, (optionArr) => {
116
116
  optionArr.forEach(row => {
117
117
  if(self.model.type===3){
118
- self.model.value=self.model.value+row[self.model.optionAttrs.label];
118
+ self.model.value=self.model.value+(self.model.value?'\r\n':'')+row[self.model.optionAttrs.label];
119
119
  }
120
120
  else {
121
121
  self.model.value=row[self.model.optionAttrs.label];
package/src/centaline/loader/src/ctl/Detail.js CHANGED
@@ -625,7 +625,6 @@ const Detail = function (source, para, callBack) {
625
625
  function (response) {
626
626
  if (response.rtnCode === Enum.ReturnCode.Successful) {
627
627
  if (response.content) {
628
- Vue.set(rtn._routerForQRCode, "imgUrl", response.content);
629
628
  rtn.QRCode = response.content;
630
629
  }
631
630
  }
package/src/main.js CHANGED
@@ -43,7 +43,7 @@ Vue.use(centaline, {
43
43
  getRequestHeaders: function () {
44
44
  return {
45
45
  oldToken: '42ccd644-040d-4e01-9521-1623f1884058',
46
- token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzrEOgkAQBNB_2ZpNWFh2Fzo9sPEjyJ0HCVZGINEY_12J0NH7iimmmXnBOAeoQFe4E5u2XOFObFoiLpWkwUOpDlk4RyNn6Fgcn-omd8caEugeN6hIFpSqJjD46VcUyrIU89jdz93zH-eu0_CdJTXvxQxjroJ8SQsMlgX0mUXTmPbSF_D-AAAA__8.sdQBmdkYKUL9c9NLyUbjFEl3_SQ-e2f51rR4llSHFPM',
46
+ token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZMws8PsLJ0u2HgIIrgkWBmBRGO8uxqho_cVr3jN_08Y5xZK8Au4oZUmLOCGVhoiCZ60xl3wEUXFoVE0jKJRDlXt4r6CDNL9CiWpqpfC5SGD4TT9ghYWvmEe0-2YHv84d5mGz6wzJm65R9flhNJxwLYXxs6YkybLz2bwegMAAP__.kXabWRcQeD3SN72lRH5vYtNPDARnnOR7ZJd9joFcSyE',
47
47
 
48
48
  originalRequestURL: 'http://10.88.22.67:8080',
49
49
  EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',