centaline-data-driven 1.4.47 → 1.4.49
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.
- package/package.json +1 -1
- package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue +31 -18
- package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue +32 -17
- package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue +3 -3
- package/src/centaline/dynamicLayout/src/dynamicLayout.vue +1 -1
- package/wwwroot/static/centaline/centaline-data-driven.js +1 -1
- package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
package/package.json
CHANGED
|
@@ -85,45 +85,53 @@
|
|
|
85
85
|
</div>
|
|
86
86
|
<img class="code-ewm" slot="reference" :src="model.fields1Dic.ewmUrl.value" />
|
|
87
87
|
</el-popover>
|
|
88
|
-
<div class="info-row
|
|
88
|
+
<div class="info-row">
|
|
89
89
|
<div class="row-i">
|
|
90
|
-
<
|
|
90
|
+
<div>{{ model.fields1Dic.Price.label }}</div>
|
|
91
|
+
<div style="height:26px;">
|
|
91
92
|
<span class="base-clolr expand-f" v-html="model.fields1Dic.Price.value"></span>
|
|
92
93
|
<span class="base-clolr">{{model.fields1Dic.Price.unitName}}</span>
|
|
93
|
-
<component v-if="model.actionRouterPrice" class="ml10"
|
|
94
|
+
<component v-if="model.actionRouterPrice" class="ml10"
|
|
94
95
|
:is="model.actionRouterPrice.is" :vmodel="model.actionRouterPrice" :api="model.optionApi"
|
|
95
96
|
@click="fieldClickHandler(model.actionRouterPrice, $event)">
|
|
96
97
|
</component>
|
|
98
|
+
</div>
|
|
97
99
|
</div>
|
|
98
100
|
<div class="row-i">
|
|
99
|
-
<
|
|
100
|
-
<
|
|
101
|
+
<div>{{ model.fields1Dic.PriceUnit.label }}</div>
|
|
102
|
+
<div>
|
|
103
|
+
<span class="base-clolr expand-f" v-html="model.fields1Dic.PriceUnit.value"></span>
|
|
101
104
|
<span class="base-clolr">{{model.fields1Dic.PriceUnit.unitName}}</span>
|
|
105
|
+
</div>
|
|
102
106
|
</div>
|
|
103
107
|
<div v-if="model.fields1Dic.PriceLine" class="row-i">
|
|
104
|
-
<
|
|
108
|
+
<div>{{ model.fields1Dic.PriceLine.label }}</div>
|
|
105
109
|
<div>
|
|
106
110
|
{{ model.fields1Dic.PriceLine.value}}{{ model.fields1Dic.PriceLine.unitName }}
|
|
107
111
|
</div>
|
|
108
112
|
</div>
|
|
109
113
|
</div>
|
|
110
|
-
<div class="info-row">
|
|
114
|
+
<div class="info-row" style="padding: 10px 0;">
|
|
111
115
|
<div v-if="model.fields1Dic.PriceLine" class="row-i">
|
|
112
|
-
<
|
|
113
|
-
<
|
|
116
|
+
<div>{{ model.fields1Dic.MarketRateOfReturn.label }}</div>
|
|
117
|
+
<div>
|
|
118
|
+
<span>{{ model.fields1Dic.MarketRateOfReturn.value }} </span>
|
|
114
119
|
<span>{{ model.fields1Dic.MarketRateOfReturn.unitName }}</span>
|
|
120
|
+
</div>
|
|
115
121
|
</div>
|
|
116
122
|
<div v-if="model.fields1Dic.EstimatePriceRent" class="row-i">
|
|
117
|
-
<
|
|
123
|
+
<div>{{ model.fields1Dic.EstimatePriceRent.label }}</div>
|
|
118
124
|
<div>
|
|
119
125
|
{{ model.fields1Dic.EstimatePriceRent.value }}
|
|
120
126
|
<span>{{ model.fields1Dic.EstimatePriceRent.unitName }}</span>
|
|
121
127
|
</div>
|
|
122
128
|
</div>
|
|
123
129
|
<div v-if="model.fields1Dic.EstimatePriceRentUnit" class="row-i">
|
|
124
|
-
<
|
|
125
|
-
<
|
|
130
|
+
<div>{{ model.fields1Dic.EstimatePriceRentUnit.label }}</div>
|
|
131
|
+
<div>
|
|
132
|
+
<span>{{ model.fields1Dic.EstimatePriceRentUnit.value }}</span>
|
|
126
133
|
<span>{{ model.fields1Dic.EstimatePriceRentUnit.unitName }}</span>
|
|
134
|
+
</div>
|
|
127
135
|
</div>
|
|
128
136
|
</div>
|
|
129
137
|
<div class="info-mid">
|
|
@@ -1264,18 +1272,23 @@ export default {
|
|
|
1264
1272
|
}
|
|
1265
1273
|
|
|
1266
1274
|
.row-i {
|
|
1267
|
-
width:
|
|
1268
|
-
|
|
1275
|
+
width: 25%;
|
|
1276
|
+
text-align: left;
|
|
1269
1277
|
}
|
|
1278
|
+
.row-i div:nth-child(1) {
|
|
1279
|
+
margin-bottom: 10px;
|
|
1280
|
+
}
|
|
1270
1281
|
.info-mid {
|
|
1271
|
-
|
|
1272
|
-
padding: 20px;
|
|
1282
|
+
// margin: 35px 0 0 0;
|
|
1283
|
+
// padding: 20px;
|
|
1273
1284
|
border-top: 1px solid #e0e0e0;
|
|
1274
1285
|
border-bottom: 1px solid #e0e0e0;
|
|
1275
1286
|
display: flex;
|
|
1276
|
-
|
|
1287
|
+
padding: 15px 0;
|
|
1288
|
+
|
|
1277
1289
|
.mid-i {
|
|
1278
|
-
text-align:
|
|
1290
|
+
text-align: left;
|
|
1291
|
+
width: 25%;
|
|
1279
1292
|
}
|
|
1280
1293
|
.mid-i div:nth-child(1) {
|
|
1281
1294
|
margin-bottom: 10px;
|
|
@@ -84,46 +84,54 @@
|
|
|
84
84
|
</div>
|
|
85
85
|
<img class="code-ewm" slot="reference" :src="model.fields1Dic.ewmUrl.value" />
|
|
86
86
|
</el-popover>
|
|
87
|
-
<div class="info-row
|
|
87
|
+
<div class="info-row">
|
|
88
88
|
<div class="row-i">
|
|
89
|
-
<
|
|
89
|
+
<div>{{ model.fields1Dic.Price.label }}</div>
|
|
90
|
+
<div style="height:26px;">
|
|
90
91
|
<span class="base-clolr expand-f" v-html="model.fields1Dic.Price.value"></span>
|
|
91
92
|
<span class="base-clolr">{{ model.fields1Dic.Price.unitName}}</span>
|
|
92
|
-
<component v-if="model.actionRouterPrice" class="ml10"
|
|
93
|
+
<component v-if="model.actionRouterPrice" class="ml10"
|
|
93
94
|
:is="model.actionRouterPrice.is" :vmodel="model.actionRouterPrice" :api="model.optionApi"
|
|
94
95
|
@click="fieldClickHandler(model.actionRouterPrice, $event)">
|
|
95
96
|
</component>
|
|
97
|
+
</div>
|
|
96
98
|
</div>
|
|
97
99
|
<div class="row-i">
|
|
98
|
-
<
|
|
100
|
+
<div>{{ model.fields1Dic.PriceUnit.label }}</div>
|
|
101
|
+
<div>
|
|
99
102
|
<span class="base-clolr expand-f" v-html="model.fields1Dic.PriceUnit.value">
|
|
100
103
|
</span>
|
|
101
104
|
<span class="base-clolr">{{ model.fields1Dic.PriceUnit.unitName}}</span>
|
|
102
105
|
</div>
|
|
106
|
+
</div>
|
|
103
107
|
<div v-if="model.fields1Dic.PriceLine" class="row-i">
|
|
104
|
-
<
|
|
108
|
+
<div>{{ model.fields1Dic.PriceLine.label }}</div>
|
|
105
109
|
<div>
|
|
106
110
|
{{ model.fields1Dic.PriceLine.value}}{{ model.fields1Dic.PriceLine.unitName }}
|
|
107
111
|
</div>
|
|
108
112
|
</div>
|
|
109
113
|
</div>
|
|
110
|
-
<div class="info-row">
|
|
114
|
+
<div class="info-row" style="padding: 10px 0;">
|
|
111
115
|
<div v-if="model.fields1Dic.PriceLine" class="row-i">
|
|
112
|
-
<
|
|
113
|
-
<
|
|
116
|
+
<div>{{ model.fields1Dic.MarketRateOfReturn.label }}</div>
|
|
117
|
+
<div>
|
|
118
|
+
<span>{{ model.fields1Dic.MarketRateOfReturn.value }}</span>
|
|
114
119
|
<span>{{model.fields1Dic.MarketRateOfReturn.unitName}}</span>
|
|
120
|
+
</div>
|
|
115
121
|
</div>
|
|
116
122
|
<div v-if="model.fields1Dic.EstimatePriceRent" class="row-i">
|
|
117
|
-
<
|
|
123
|
+
<div>{{ model.fields1Dic.EstimatePriceRent.label }}</div>
|
|
118
124
|
<div>
|
|
119
125
|
{{ model.fields1Dic.EstimatePriceRent.value}}
|
|
120
126
|
<span>{{model.fields1Dic.EstimatePriceRent.unitName}}</span>
|
|
121
127
|
</div>
|
|
122
128
|
</div>
|
|
123
129
|
<div v-if="model.fields1Dic.EstimatePriceRentUnit" class="row-i">
|
|
124
|
-
<
|
|
130
|
+
<div>{{model.fields1Dic.EstimatePriceRentUnit.label}}</div>
|
|
131
|
+
<div>
|
|
125
132
|
<span>{{model.fields1Dic.EstimatePriceRentUnit.value}}</span>
|
|
126
133
|
<span>{{ model.fields1Dic.EstimatePriceRentUnit.unitName}}</span>
|
|
134
|
+
</div>
|
|
127
135
|
</div>
|
|
128
136
|
</div>
|
|
129
137
|
<div class="info-mid">
|
|
@@ -1274,18 +1282,25 @@ export default {
|
|
|
1274
1282
|
}
|
|
1275
1283
|
|
|
1276
1284
|
.row-i {
|
|
1277
|
-
width: 33.3%;
|
|
1278
|
-
display: flex;
|
|
1279
|
-
|
|
1285
|
+
// width: 33.3%;
|
|
1286
|
+
// display: flex;
|
|
1287
|
+
width: 25%;
|
|
1288
|
+
text-align: left;
|
|
1289
|
+
}
|
|
1290
|
+
.row-i div:nth-child(1) {
|
|
1291
|
+
margin-bottom: 10px;
|
|
1292
|
+
}
|
|
1293
|
+
|
|
1280
1294
|
.info-mid {
|
|
1281
|
-
margin: 35px 0 0 0;
|
|
1282
|
-
padding: 20px;
|
|
1295
|
+
// margin: 35px 0 0 0;
|
|
1296
|
+
// padding: 20px;
|
|
1283
1297
|
border-top: 1px solid #e0e0e0;
|
|
1284
1298
|
border-bottom: 1px solid #e0e0e0;
|
|
1285
1299
|
display: flex;
|
|
1286
|
-
|
|
1300
|
+
padding: 15px 0;
|
|
1287
1301
|
.mid-i {
|
|
1288
|
-
text-align:
|
|
1302
|
+
text-align: left;
|
|
1303
|
+
width: 25%;
|
|
1289
1304
|
}
|
|
1290
1305
|
.mid-i div:nth-child(1) {
|
|
1291
1306
|
margin-bottom: 10px;
|
|
@@ -46,15 +46,15 @@
|
|
|
46
46
|
</div>
|
|
47
47
|
<div style="margin-top: 16px;display: flex;height: 65px;border: 1px solid #ECEFF2;box-shadow: 0 2px 4px 0 rgba(0,0,0,0.06);border-radius: 6px;text-align: center;">
|
|
48
48
|
<div style="width: 33.33%;">
|
|
49
|
-
<div style="margin-top: 13px;font-size: 12px;">{{model.fields1Dic.Area.label}}</div>
|
|
49
|
+
<div style="margin-top: 13px;font-size: 12px;">{{model.fields1Dic.Area.label.replace('：','')}}</div>
|
|
50
50
|
<div style="margin-top: 7px;font-size: 14px;font-weight: Bold;color: #EE6B6B;">{{model.fields1Dic.Area.value}}{{model.fields1Dic.Area.unitName}}</div>
|
|
51
51
|
</div>
|
|
52
52
|
<div style="width: 33.33%;">
|
|
53
|
-
<div style="margin-top: 13px;font-size: 12px;">{{model.fields1Dic.Price.label}}</div>
|
|
53
|
+
<div style="margin-top: 13px;font-size: 12px;">{{model.fields1Dic.Price.label.replace('：','')}}</div>
|
|
54
54
|
<div style="margin-top: 7px;font-size: 14px;font-weight: Bold;color: #EE6B6B;"><span v-html="model.fields1Dic.Price.value"></span><span>{{model.fields1Dic.Price.unitName}}</span></div>
|
|
55
55
|
</div>
|
|
56
56
|
<div style="width: 33.33%;">
|
|
57
|
-
<div style="margin-top: 13px;font-size: 12px;">{{model.fields1Dic.FloorName.label}}</div>
|
|
57
|
+
<div style="margin-top: 13px;font-size: 12px;">{{model.fields1Dic.FloorName.label.replace('：','')}}</div>
|
|
58
58
|
<div style="margin-top: 7px;font-size: 14px;font-weight: Bold;color: #EE6B6B;">{{model.fields1Dic.FloorName.value}}</div>
|
|
59
59
|
</div>
|
|
60
60
|
</div>
|
|
@@ -188,7 +188,7 @@
|
|
|
188
188
|
return b.id === attribute.nodeValue;
|
|
189
189
|
});
|
|
190
190
|
if (typeof field !== "undefined") {
|
|
191
|
-
if (!field.rightField || self.vmodel[field.rightField] == 1) {
|
|
191
|
+
if ((!field.rightField || self.vmodel[field.rightField] == 1) && field.show) {
|
|
192
192
|
obj["rightRouter"] = true;
|
|
193
193
|
}
|
|
194
194
|
|