centaline-data-driven 1.4.10 → 1.4.11
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/centaline-data-driven-1.4.10.tgz +0 -0
- package/package.json +1 -1
- package/src/Form.vue +20 -8
- package/src/centaline/dynamicFile/src/dynamicFile.vue +2 -2
- package/src/centaline/loader/src/ctl/lib/LibFunction.js +8 -5
- package/src/main.js +1 -1
- package/wwwroot/static/centaline/centaline-data-driven.js +2 -2
- package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
|
Binary file
|
package/package.json
CHANGED
package/src/Form.vue
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
|
|
3
3
|
<!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
|
|
4
|
-
<ct-form :api="'/
|
|
4
|
+
<ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
|
|
5
5
|
<ct-dialog-list></ct-dialog-list>
|
|
6
6
|
</div>
|
|
7
7
|
</template>
|
|
@@ -14,19 +14,31 @@
|
|
|
14
14
|
apiParam:{
|
|
15
15
|
actionType
|
|
16
16
|
:
|
|
17
|
+
2,
|
|
18
|
+
buildingID
|
|
19
|
+
:
|
|
17
20
|
"1",
|
|
18
|
-
|
|
21
|
+
estateID
|
|
19
22
|
:
|
|
20
|
-
"
|
|
21
|
-
|
|
23
|
+
"1",
|
|
24
|
+
floorID
|
|
22
25
|
:
|
|
23
|
-
"
|
|
24
|
-
|
|
26
|
+
"1",
|
|
27
|
+
pageOnly
|
|
25
28
|
:
|
|
26
|
-
|
|
29
|
+
true,
|
|
27
30
|
pageTitle
|
|
28
31
|
:
|
|
29
|
-
"
|
|
32
|
+
"开盘",
|
|
33
|
+
propertyID
|
|
34
|
+
:
|
|
35
|
+
"",
|
|
36
|
+
roomNo
|
|
37
|
+
:
|
|
38
|
+
"1527",
|
|
39
|
+
tradeID
|
|
40
|
+
:
|
|
41
|
+
"200",
|
|
30
42
|
},
|
|
31
43
|
topHeight:10,
|
|
32
44
|
}
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
</el-dropdown>
|
|
63
63
|
</span>
|
|
64
64
|
</div>
|
|
65
|
-
<el-progress type="circle" v-if="file.progressFlag" :percentage="file.loadProgress.toFixed(2)" :width="96" :height="96" class="file-cirle"></el-progress>
|
|
65
|
+
<el-progress type="circle" v-if="file.progressFlag" :percentage="Number(file.loadProgress.toFixed(2))" :width="96" :height="96" class="file-cirle"></el-progress>
|
|
66
66
|
</div>
|
|
67
67
|
</el-upload>
|
|
68
68
|
</template>
|
|
@@ -128,7 +128,7 @@
|
|
|
128
128
|
</el-dropdown>
|
|
129
129
|
</span>
|
|
130
130
|
</div>
|
|
131
|
-
<el-progress type="circle" v-if="file.progressFlag" :percentage="file.loadProgress.toFixed(2)" :width="96" :height="96" class="file-cirle"></el-progress>
|
|
131
|
+
<el-progress type="circle" v-if="file.progressFlag" :percentage="Number(file.loadProgress.toFixed(2))" :width="96" :height="96" class="file-cirle"></el-progress>
|
|
132
132
|
</div>
|
|
133
133
|
</el-upload>
|
|
134
134
|
</template>
|
|
@@ -394,9 +394,11 @@ const LibFunction = {
|
|
|
394
394
|
var colNum = source.colSpan ? source.colSpan : 3;
|
|
395
395
|
if (item1.excLine) {
|
|
396
396
|
num = 24;
|
|
397
|
-
}
|
|
397
|
+
}
|
|
398
|
+
else if (field.spanCols > 0) {
|
|
398
399
|
num = field.spanCols * (24 / colNum);
|
|
399
|
-
}
|
|
400
|
+
}
|
|
401
|
+
else {
|
|
400
402
|
num = 24 / colNum;
|
|
401
403
|
}
|
|
402
404
|
return num;
|
|
@@ -414,9 +416,10 @@ const LibFunction = {
|
|
|
414
416
|
//size: 'mini'
|
|
415
417
|
},
|
|
416
418
|
get excLine() {
|
|
417
|
-
return field.singleLine === true || field.controlType === Enum.ControlType.GroupSplitLine
|
|
418
|
-
field.controlType === Enum.ControlType.List || field.controlType === Enum.ControlType.File
|
|
419
|
-
field.controlType === Enum.ControlType.
|
|
419
|
+
return field.singleLine === true || field.controlType === Enum.ControlType.GroupSplitLine
|
|
420
|
+
|| field.controlType === Enum.ControlType.List || field.controlType === Enum.ControlType.File
|
|
421
|
+
|| field.controlType === Enum.ControlType.SliceUpload
|
|
422
|
+
|| field.controlType === Enum.ControlType.SearchPage;
|
|
420
423
|
},
|
|
421
424
|
showLabel: showLabel
|
|
422
425
|
};
|
package/src/main.js
CHANGED
|
@@ -43,7 +43,7 @@ Vue.use(centaline, {
|
|
|
43
43
|
getRequestHeaders: function () {
|
|
44
44
|
return {
|
|
45
45
|
oldToken: '20ad6f77-b0fc-4a65-9334-eda7a89c5bcf',
|
|
46
|
-
token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.
|
|
46
|
+
token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP9lazZhufX2jk4ObPwIcndugZURSDTGfxcjdPS-4hWTSWZeMM4JapAV3NFG71dwRxs9EXsh2-HRS0C2bNBRcBjYBj61nQlNCwXo4wY1WesqplKkgCFOv4AObL_BPOr9rM9_nLtOwzJbSZZoMqGLmpeyMeiVSmStLlKq-kQJ3h8AAAD__w.IYKSKulo_uX60Qc84xUSb5OPIb_Eir5EbSHfO9k1l3A',
|
|
47
47
|
|
|
48
48
|
originalRequestURL: 'http://10.88.22.67:8080',
|
|
49
49
|
EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',
|