centaline-data-driven 1.4.4 → 1.4.6
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/Form.vue +3 -16
- package/src/centaline/api/index.js +2 -0
- package/src/centaline/comfirm/src/comfirm.vue +3 -3
- package/src/centaline/common/index.js +1 -1
- package/src/centaline/css/common.css +1 -1
- package/src/centaline/dynamicForm/src/dynamicForm.vue +23 -1
- package/src/centaline/loader/src/ctl/SliceUpload.js +1 -1
- package/src/centaline/loader/src/ctl/lib/Enum.js +1 -0
- package/src/main.js +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
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="'/PropertyContact/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
|
|
5
5
|
<ct-dialog-list></ct-dialog-list>
|
|
6
6
|
</div>
|
|
7
7
|
</template>
|
|
@@ -11,21 +11,8 @@
|
|
|
11
11
|
name: 'DataDrivenForm',
|
|
12
12
|
data() {
|
|
13
13
|
return {
|
|
14
|
-
apiParam:{
|
|
15
|
-
:
|
|
16
|
-
"3",
|
|
17
|
-
originalTraId
|
|
18
|
-
:
|
|
19
|
-
"1572420664851103746",
|
|
20
|
-
pageOnly
|
|
21
|
-
:
|
|
22
|
-
"true",
|
|
23
|
-
pageStyle
|
|
24
|
-
:
|
|
25
|
-
"2",
|
|
26
|
-
pageTitle
|
|
27
|
-
:
|
|
28
|
-
"修改成交单",
|
|
14
|
+
apiParam:{
|
|
15
|
+
chanceID: "1580430736434008064", actionType: 2
|
|
29
16
|
},
|
|
30
17
|
topHeight:10,
|
|
31
18
|
}
|
|
@@ -221,6 +221,8 @@ const api = {
|
|
|
221
221
|
self.$common.openDialog(dialogOption);
|
|
222
222
|
}
|
|
223
223
|
}
|
|
224
|
+
else if(data.rtnCode === Enum.ReturnCode.ConfirmAlert){
|
|
225
|
+
}
|
|
224
226
|
else {
|
|
225
227
|
if (response.data.rtnMsg && common.getDataDrivenOpts().showRequestErrorMessage) {
|
|
226
228
|
if (data.MsgAlertStyle && data.MsgAlertStyle == Enum.MessageAlertStyle.Dialog) {
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="ct-comfirm-content max-comfirm-content">
|
|
3
|
-
<div style="margin-top: 15px;margin-bottom: 15px;min-width: 150px;text-align: center;">
|
|
4
|
-
<
|
|
3
|
+
<div style="margin-top: 15px;margin-bottom: 15px;min-width: 150px;text-align: center; display: flex; justify-content: center;">
|
|
4
|
+
<div style="text-align: left;">{{text}}</div>
|
|
5
5
|
</div>
|
|
6
|
-
<div style="text-align:center;width:100
|
|
6
|
+
<div style="text-align:center;width:100%;margin-bottom: 15px;">
|
|
7
7
|
<el-button @click="clickHandler($event,true)" type="primary" size="mini">{{options.confirmButtonText||'确定'}}</el-button>
|
|
8
8
|
<el-button v-if="options.flagShowcCancelButton===undefined || options.flagShowcCancelButton==='1'" @click="clickHandler($event,false)" size="mini">{{options.cancelButtonText||'取消'}}</el-button>
|
|
9
9
|
</div>
|
|
@@ -336,6 +336,25 @@
|
|
|
336
336
|
if (self.parentModel) {
|
|
337
337
|
self.parentModel.$vue.closeTabThen(data);
|
|
338
338
|
}
|
|
339
|
+
}
|
|
340
|
+
else if (data.rtnCode === 202) {
|
|
341
|
+
self.$common.confirm(data.rtnMsg, '提示', {
|
|
342
|
+
confirmButtonText: '确定',
|
|
343
|
+
cancelButtonText: '取消',
|
|
344
|
+
type: 'warning'
|
|
345
|
+
}).then(() => {
|
|
346
|
+
field.doAction(self.getFormObj({flagHaveAlert:'1'}), (res) => {
|
|
347
|
+
if (res.rtnCode === 200) {
|
|
348
|
+
if(res.notification===17){
|
|
349
|
+
self.clickHandler(self.model.getRtnRouter(res.content),null)
|
|
350
|
+
}
|
|
351
|
+
else{
|
|
352
|
+
self.$emit('submit', { formData: self.model, responseData: res });
|
|
353
|
+
}
|
|
354
|
+
}
|
|
355
|
+
});
|
|
356
|
+
}).catch(() => {
|
|
357
|
+
});
|
|
339
358
|
}
|
|
340
359
|
},self.model.scripts);
|
|
341
360
|
}
|
|
@@ -869,11 +888,14 @@
|
|
|
869
888
|
}
|
|
870
889
|
});
|
|
871
890
|
},
|
|
872
|
-
getFormObj(){
|
|
891
|
+
getFormObj(moreFormObj){
|
|
873
892
|
let formData=this.model.getFormObj();
|
|
874
893
|
if(this.$route && this.$route.query && this.$route.query.pageStyle){
|
|
875
894
|
return Object.assign(formData,{'pageStyle':this.$route.query.pageStyle});
|
|
876
895
|
}
|
|
896
|
+
if(moreFormObj){
|
|
897
|
+
return Object.assign(formData,moreFormObj);
|
|
898
|
+
}
|
|
877
899
|
return formData;
|
|
878
900
|
},
|
|
879
901
|
getFileData(field) {
|
|
@@ -13,7 +13,7 @@ async function postFile(api, data, callback) {
|
|
|
13
13
|
|
|
14
14
|
//分片上传
|
|
15
15
|
const uploadByPieces = async (url, { file }, callback, uploadOptions) => {
|
|
16
|
-
var uploadData = { blockSize: 5 * 1024 * 1024, nextOffSet: 0 };
|
|
16
|
+
var uploadData = { blockSize: 0.5 * 1024 * 1024, nextOffSet: 0 };
|
|
17
17
|
// 获取当前chunk数据
|
|
18
18
|
const getChunkInfo = (file, data) => {
|
|
19
19
|
let start = data.nextOffSet;
|
package/src/main.js
CHANGED
|
@@ -43,7 +43,7 @@ Vue.use(centaline, {
|
|
|
43
43
|
getRequestHeaders: function () {
|
|
44
44
|
return {
|
|
45
45
|
oldToken: '854e91e2-3a5e-42af-a522-c51a0f5c09bc',
|
|
46
|
-
token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.
|
|
46
|
+
token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZMwMDszSycLNh6CuGFJsDICicZ4dzVCR-8rXvGa_58wLREq0BXc0UbnV3BHGx0ReyVp8eA1IAuXaBQMA0vgY9OWoW4gg3S_QkUi6p0WuWYwnudfMM3tG5Yp3U7p8Y9zl3n8zBIPYs4bRjcocuEMPYkh5cZ9ZNeXHOH1BgAA__8.J4WTk1z7IsB5k_3a-fvnnjm6AUgGBRi7Y631pFLVCPo',
|
|
47
47
|
|
|
48
48
|
originalRequestURL: 'http://10.88.22.67:8080',
|
|
49
49
|
EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',
|