centaline-data-driven 1.4.3 → 1.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/externalincomemanage/externalincomeimport/readDetail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/PropertyContact/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -11,21 +11,8 @@
     name: 'DataDrivenForm',
     data() {
       return {
-        apiParam:{actionType
-: 
-"3",
-originalTraId
-: 
-"1572420664851103746",
-pageOnly
-: 
-"true",
-pageStyle
-: 
-"2",
-pageTitle
-: 
-"修改成交单",
+        apiParam:{
+          chanceID: "1580430736434008064", actionType: 2
         },
         topHeight:10,
       }

package/src/centaline/api/index.js

@@ -221,6 +221,8 @@ const api = {
         self.$common.openDialog(dialogOption);
       }
     }
+    else if(data.rtnCode === Enum.ReturnCode.ConfirmAlert){
+    }
     else {
       if (response.data.rtnMsg && common.getDataDrivenOpts().showRequestErrorMessage) {
         if (data.MsgAlertStyle && data.MsgAlertStyle == Enum.MessageAlertStyle.Dialog) {

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -3,6 +3,7 @@
     <!--分片上传-->
     <template v-if="model.type==51">
       <el-upload :class="disableUpload ? 'ct-upload-display-none' : ''"
+                   :http-request="SliceUpload"
                  :disabled="model.lock"
                  :accept="model.fileAccept"
                  :on-change="handleChange"
@@ -27,7 +28,7 @@
         </div>
         <div slot="file" slot-scope="{ file }" :title="file.fileName">
           <div class="cover-list-item">
-            <el-image fit="fill" :src="file.fileName?file.url:require('../../../assets/blank.png')" style="width: 100px; height: 100px" :z-index="previewZIndex" @click="viewerfile(file)">
+            <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)">
             </el-image>
             <span class="cover-list-item-span-Default" v-if="model.rightDefault&&model.rightDefault==1&&file.mediaTypeID==2">
               <i>
@@ -69,7 +70,6 @@
     <!-- 官方上传 -->
     <template v-else>
       <el-upload :class="disableUpload ? 'ct-upload-display-none' : ''"
-                 :http-request="SliceUpload"
                  :disabled="model.lock"
                  :accept="model.fileAccept"
                  :on-change="handleChange"
@@ -175,7 +175,6 @@
     },
     methods: {
       load(data) {
-        debugger
         this.model = data;
         this.classifyClickHandle();
         if (this.model.action === '' && !this.model.lock) {

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -336,6 +336,25 @@
                         if (self.parentModel) {
                           self.parentModel.$vue.closeTabThen(data);
                         }
+                      }                      
+                      else if (data.rtnCode === 202) {
+                        self.$common.confirm(data.rtnMsg, '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            type: 'warning'
+                          }).then(() => {
+                            field.doAction(self.getFormObj({flagHaveAlert:'1'}), (res) => {
+                              if (res.rtnCode === 200) {
+                                if(res.notification===17){
+                                  self.clickHandler(self.model.getRtnRouter(res.content),null)
+                                }
+                                else{
+                                  self.$emit('submit', { formData: self.model, responseData: res });
+                                }
+                              }
+                            });
+                        }).catch(() => {
+                        });
                       }
                     },self.model.scripts);
                   }
@@ -869,11 +888,14 @@
           }
         });
       },
-      getFormObj(){
+      getFormObj(moreFormObj){
         let formData=this.model.getFormObj();
         if(this.$route && this.$route.query && this.$route.query.pageStyle){
            return Object.assign(formData,{'pageStyle':this.$route.query.pageStyle});
         }
+        if(moreFormObj){
+          return Object.assign(formData,moreFormObj);
+        }
         return formData;
       },
       getFileData(field) {

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -616,7 +616,7 @@ export default {
           var h2 = this.$refs.searchTable.offsetTop | 0;
           var h3 = this.$refs.toolbar.$el.offsetHeight | 0;
           var h4 = this.$refs.footer.$el.offsetHeight | 0;
-          var h5 = this.$refs.listHeader ? (this.$refs.listHeader.$el.offsetHeight + 12) | 0 : 0;
+          var h5 = this.$refs.listHeader ? (this.$refs.listHeader.$el.offsetHeight + 8) | 0 : 0;
           var h6 = this.$refs.listFooter.$el.offsetHeight | 0;
           var h7 = this.$refs.tableStats ? (this.$refs.tableStats.$el.offsetHeight + 7) | 0 : 0;
           var h8 = this.$refs.popupButton ? this.$refs.popupButton.offsetHeight + 21 : 0;
@@ -973,8 +973,8 @@ export default {
             }
             else {
               if (field.action.indexOf("http://") === 0 || field.action.indexOf("https://") === 0) {
-                var tempwindow=window.open('about:blank'); 
-                tempwindow.location=field.action;
+                var tempwindow = window.open('about:blank');
+                tempwindow.location = field.action;
                 // document.body.addEventListener('click', function() {
                 //   window.open(field.action, "_blank");
                 // });
@@ -982,9 +982,9 @@ export default {
               else {
                 field.doAction(submitData, (data) => {
                   if (data.content) {
-                    if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {                      
-                      var tempwindow=window.open('about:blank'); 
-                      tempwindow.location=data.content;
+                    if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
+                      var tempwindow = window.open('about:blank');
+                      tempwindow.location = data.content;
                       // document.body.addEventListener('click', function() {
                       //   window.open(data.content, "_blank");
                       // });
@@ -1846,7 +1846,7 @@ export default {
   background-color: #fdf6ec;
   border-color: #faecd8;
   width: 100%;
-  box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
-  margin-bottom: 12px;
+  box-shadow: 0 2px 10px 0 rgb(0 0 0 / 10%);
+  margin-bottom: 8px;
 }
 </style>

package/src/centaline/loader/src/ctl/SliceUpload.js

@@ -4,7 +4,6 @@ async function postFile(api, data, callback) {
   xhr.open('POST', api)
   xhr.onreadystatechange = function () {
     if (xhr.readyState === 4 && xhr.status === 200) {
-      console.log(xhr.responseText)
       var rtn = JSON.parse(xhr.responseText);
       callback(rtn);
     }

package/src/centaline/loader/src/ctl/lib/Enum.js

@@ -256,6 +256,7 @@ const Enum = {
     Successful: 200, //成功
     Error: 201, //失败
     Unauthorized: 401, //没有登录 或 登录超时
+    ConfirmAlert: 202, //确认提示
   },
 
   InsertPos: {

package/src/centaline/loader/src/ctl/lib/LibFunction.js

@@ -289,6 +289,7 @@ const LibFunction = {
         item.attrs.class = item.attrs.class + ' max-reset-btn ';
         break;
       case Enum.ControlType.File: //文件
+      case Enum.ControlType.SliceUpload: //文件
         var router = source.actionRouters.find((v1) => {
           return v1.key === field.fieldName1;
         });

package/src/main.js

@@ -43,7 +43,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '854e91e2-3a5e-42af-a522-c51a0f5c09bc',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrsOgkAQRf9laiZhYHaGpdMFGz-C7LJrgpXhkWiM_65G6Og9xSlOc-8TpiVADbqCO9ro7AruaKMjYqskLR6sOmThEityFToWx6emLd2xgQzS_QY1iagQWckzGPz8C6Yw5huWKY3n9PjHues8fGbJJuOrS0SKRY8cPGPQKBhTXirlXmMv8HoDAAD__w.gv5xV0ypbUsmam7QpRtTNsZhNoxbL3P4F2Rp2aYHb3Y',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEKg0AQRP9laxdcXXfv7OJpmnyEeGQFU4WokBDy7zFwdvZ5xSuGgZk3zGuEGjSBB9rpfQIPtNMTsVeSDk9eA7JwiY6Cw8AS-Nx2ZWhayMCed6hJRJ3Tgn0G07CkIM_dL1hne1zs9Y9zt2XaZn2lZcxpxGEsqq3sGH0sBiS6morZGMXg8wUAAP__.pRHigsL1V-LoAhchjSKQEXLI9EJv4RKjXEm6tliOaqk',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',