centaline-data-driven 1.2.77 → 1.2.78

package/package.json

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

package/src/Detail.vue

@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "3"} ,
+        apiParam: {actionType: 1,chanceID: "1"} ,
       }
     },
     mounted() {

package/src/Form.vue

@@ -1,9 +1,8 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <!-- <ct-form :api="'/salematter/squareupload/readDetail'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/salematter/priceupload/readDetail'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/second-hand-transaction/add-detail'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -18,7 +17,12 @@
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
         // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
         // apiParam: {originalTraId: "1516290587463507969", actionType: "3", pageStyle: "2", pageTitle: "成交报告",pageOnly: "true"}
-        apiParam:{"actionType":2}
+        apiParam:{actionType: 2,
+externalPropertyId: "54802",
+pageOnly: true,
+pageStyle: 2,
+propertyNo: "SHHKS000032362"
+          }
       }
     },
     methods: {

package/src/centaline/dynamicBtn/src/dynamicBtn.vue

@@ -53,7 +53,7 @@
   </el-button>
   <el-button v-else  class="max"
     :type="model.isHyperLink ? 'text' : 'primary'"
-    v-bind="model.attrs" @click="$emit('click',model)"
+    v-bind="model.attrs" @click="clickHandle"
     :style="{color:model.textColor,backgroundColor:model.imgUrl?'transparent':model.bgColor,borderColor:model.imgUrl?'transparent':model.borderColor,padding:model.imgUrl?'0px':null}"
     :icon="model.icon"
     :disabled="model.disabled || model.locked">
@@ -149,7 +149,7 @@
           }
         }
         else{
-          this.$emit('click',this.model);
+          this.$emit('click',this.model,this.rowData,this.rowindex);
         }
       },
       callTelClick(data){

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

@@ -328,21 +328,7 @@
               }
 
               if (!submitData) {
-                submitData = {};
-                var tempFormData = self.model.getFormObj();
-                if(field.flagAttachSearchCondition){
-                  submitData.jsonData=tempFormData;
-                }
-                else{
-                  field.submitFormField.forEach((v) => {
-                    if(tempFormData[v]){
-                      submitData[v] = tempFormData[v];
-                    }
-                    else{
-                      submitData[v] = tempFormData[self.$common.initialsToUpperCase(v)];
-                    }
-                  });
-                }
+                submitData = self.getFileData(field);
               }
 
               if (field.isOpenForm) {
@@ -624,6 +610,7 @@
         return formData;
       },
       getFileData(field) {
+        var self=this;
         var submitData = {};
         var tempFormData = this.model.getFormObj();
         if(field.flagAttachSearchCondition){
@@ -632,7 +619,12 @@
         else{
           if(field.submitFormField){
             field.submitFormField.forEach((v) => {
-              submitData[v] = tempFormData[v];
+              if(tempFormData[v]){
+                submitData[v] = tempFormData[v];
+              }
+              else{
+                submitData[v] = tempFormData[self.$common.initialsToUpperCase(v)];
+              }
             });
           }
         }

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

@@ -22,9 +22,10 @@
               </template>
               <template slot-scope="scope">
                 <span v-if="scope.row.isSet">
-                  <component ref="Fields" :is="v.is" :vmodel="model.currentRow.data[v.id]" :api="model.OptApi"
-                             @change="changeHandler(model.currentRow.data[v.id], model.currentRow.data.$sourceIndex)"
-                             @input="inputHandler(model.currentRow.data[v.id], model.currentRow.data.$sourceIndex)"></component>
+                  <component ref="Fields" :is="model.currentRow.data[v.id].locked || model.currentRow.data[v.id].is!==v.is?model.currentRow.data[v.id].is:v.is" 
+                    :vmodel="model.currentRow.data[v.id]" :api="model.OptApi"
+                    @change="changeHandler(model.currentRow.data[v.id], model.currentRow.data.$sourceIndex)"
+                    @input="inputHandler(model.currentRow.data[v.id], model.currentRow.data.$sourceIndex)"></component>
                 </span>
                 <span v-else-if="v.is=='ct-sensitiveeye'">
                   <component v-if ref="Fields" :is="v.is" :vmodel="scope.row[v.id]" :vrowmodel="scope.row" :api="model.OptApi"></component>
@@ -308,7 +309,8 @@
                 const value = Number(curr);
                 if (!isNaN(value)) {
                   return Number(prev + curr);
-                } else {
+                } 
+                else {
                   return Number(prev);
                 }
               }, 0);
@@ -316,7 +318,8 @@
               if (data[0][column.property].decimals && data[0][column.property].decimals > 0) {
                 sums[index] = sums[index].toFixed(data[0][column.property].decimals);
               }
-            } else {
+            } 
+            else {
               sums[index] = 'N/A';
             }
           }

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

@@ -148,6 +148,9 @@ const Base = function (source) {
     get lock() {
       return source.locked;
     },
+    get locked() {
+      return source.locked;
+    },
     set locked(v) {
       source.locked = v;
     },
@@ -275,6 +278,9 @@ const Base = function (source) {
     get singleLine() {
       return source.singleLine;
     },
+    get decimals() {
+      return source.decimals1;
+    },
   };
 
   return rtn;

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

@@ -19,9 +19,6 @@ const box = function (source, callBack) {
       },
       set clearable(v) {
         source.clear = v;
-      },      
-      get decimals() {
-        return data.decimals1;
       },
       get value() {
         return source.code1;

package/src/main.js

@@ -12,9 +12,9 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  // baseUrl: "http://10.88.22.13:7070/v1/form/router",
-  baseUrl: "http://10.88.23.22:9999/v1/form/router",
-  // baseUrl: "http://tjcptest.centaline.com.cn/", 
+  baseUrl: "http://10.88.22.13:7070/v1/form/router",
+  // baseUrl: "http://10.88.23.22:9999/v1/form/router",
+  // baseUrl: "http://10.88.22.69:8080/", 
   // flagRouterSelf: true,
   zindex: 999,
   showRequestErrorMessage: true,
@@ -36,7 +36,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'c72af00a-da9a-430a-b986-2935092b42f6',
+        oldToken: '89a43c8a-df03-44b9-a234-8ba34b21b671',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: ' {"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"undefined"}',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijk4NGM0ZjJlLTRhNTgtNDM4YS1iNjkxLWQyMTI4ZjdlYjNlMyJ9.nxO4kEXzIM2RJTXuX_AOoctKFvBiTZUEwHTu1YSFMn8JBjM9p-RK31ZB8ckJvlwgjiDGdbuGt1QOZRRP9KS3qQ',