centaline-data-driven 1.4.86 → 1.4.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.4.86",
+  "version": "1.4.88",
   "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="'/PropertyKey/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/edit'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          chanceID: "1560550751669981184", actionType: 2
+          originalTraId: "1646416021069754369", actionType: 3, pageStyle: 2, pageTitle: "修改成交单", pageOnly: true
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -4,10 +4,10 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <!-- <ct-searchlist :apiParam="para"
+    <ct-searchlist :apiParam="para"
       :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" 
       :searchDataApi="'/api/third-dept-tran/tran-list'">
-    </ct-searchlist> -->
+    </ct-searchlist>
 
 
     <!-- <ct-searchlist :apiParam="para"
@@ -28,11 +28,11 @@
       :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
     </ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/PropertyRETList/getListStats'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"

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

@@ -92,7 +92,7 @@
           showNum: 3,//如果isHidden为true时，个数大于3就会隐藏，默认是3
           appendId: '',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
           trigger: 'manual',//触发方式，传值可查看Popper UI组件trigger属性
-          placement: 'bottom-start',//方向，传值可查看Popper UI组件placement属性
+          placement: 'bottom-end',//方向，传值可查看Popper UI组件placement属性
         },
       };
     },
@@ -206,4 +206,7 @@
 .labelText{
 -webkit-transform: scale(0.90);
 }
+.el-popoverCallTel{
+  margin-left: 5px;
+}
 </style>

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

@@ -24,7 +24,7 @@
          @keydown.down="rowKeyDownHandle($event, 1)" tabindex="-1">
       <div class="ct-table-content" v-if="!isLayout">
         <table border="0" cellpadding="0" cellspacing="0"
-               :class="['ct-table', model.attrs.size ? 'ct-table-' + model.attrs.size : '',]">
+               :class="['ct-table', model.attrs.size ? 'ct-table-' + model.attrs.size : '',leftShadow>-1 || rightShadow>-1 ? 'ct-table-Shadow' : '',]">
           <!--表头-->
           <thead ref="tableHead" class="right-no-fixation-th">
             <tr class="ct-tr" ref="headTr" v-for="(columns, columnsIndex) in model.columnsArr" :key="columnsIndex">
@@ -1813,6 +1813,9 @@ export default {
   min-width: 100%;
   border-collapse: collapse;
 }
+.ct-searchtable .ct-table-Shadow {
+  border-collapse: separate;
+}
 
 .ct-searchtable .ct-table th {
   background-color: #f4f7fa !important;
@@ -1846,7 +1849,7 @@ export default {
 }
 
 .shadowLeft {
-  border-right: 1px solid #e7e8eb;
+  /* border-right: 1px solid #e7e8eb; */
   box-shadow: 2px 0 3px -1px rgba(0, 0, 0, 0.1);
 }
 

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

@@ -222,13 +222,19 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           attrKey = this.common.initialsToLowerCase(attrKey);
             var rtn1 = this.fieldsDic[id];
             if (rtn1) {
-                rtn1.source[attrKey] = attrValue;
-                this.form.hatchHandle(id, attrKey, attrValue, rtn1);
-
-                //用于处理源数据改动,强制更新视图数据 todo
-                if (rtn1.self.$forceUpdate) {
-                    rtn1.self.$forceUpdate();
+              if(attrKey=='code1' && rtn1.source.controlType===4 
+              && attrValue!=undefined && attrValue!=null && attrValue!=''){
+                if(rtn1.source.decimals1 != undefined && rtn1.source.decimals1 != null){
+                  attrValue = Number(attrValue).toFixed(rtn1.source.decimals1)
                 }
+              }
+              rtn1.source[attrKey] = attrValue;
+              this.form.hatchHandle(id, attrKey, attrValue, rtn1);
+
+              //用于处理源数据改动,强制更新视图数据 todo
+              if (rtn1.self.$forceUpdate) {
+                  rtn1.self.$forceUpdate();
+              }
             }
         },
         setValueByFieldNameFromParent(id, attrKey, attrValue) {
@@ -514,13 +520,19 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         attrKey = common.initialsToLowerCase(attrKey);
           var rtn1 = this.fieldsDic[id];
           if (rtn1) {
-              rtn1.source[attrKey] = attrValue;
-              this.self.hatchHandle(id, attrKey, attrValue, rtn1);
-
-              //用于处理源数据改动,强制更新视图数据 todo
-              if (rtn1.self.$forceUpdate) {
-                  rtn1.self.$forceUpdate();
+            if(attrKey=='code1' && rtn1.source.controlType===4 
+              && attrValue!=undefined && attrValue!=null && attrValue!=''){
+                if(rtn1.source.decimals1 != undefined && rtn1.source.decimals1 != null){
+                  attrValue = Number(attrValue).toFixed(rtn1.source.decimals1)
+                }
               }
+            rtn1.source[attrKey] = attrValue;
+            this.self.hatchHandle(id, attrKey, attrValue, rtn1);
+
+            //用于处理源数据改动,强制更新视图数据 todo
+            if (rtn1.self.$forceUpdate) {
+                rtn1.self.$forceUpdate();
+            }
           }
       },
       getListField(tableName, rowNum, fiedlId) {        

package/src/centaline/validate/index.js

@@ -84,6 +84,9 @@ const actions = {
       return true;
     } 
     else {
+      if(typeof v.value === "undefined"){
+        return false;
+      }
       v.value = o;
       return true;
     }

package/src/main.js

@@ -12,14 +12,14 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.13:9004/max-uplink-api/v1/form/router",
+  // baseUrl: "http://10.88.22.13:9004/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.6.1.162:17070/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.25.10.63:9999/v1/form/router",
   // baseUrl: "http://10.88.22.42:9999/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
   // baseUrl: "http://10.88.22.40:8080/api/",
-  // baseUrl: "http://tjcptest.centaline.com.cn/", 
-  // flagRouterSelf: true,
+  baseUrl: "http://tjcptest.centaline.com.cn/", 
+  flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
@@ -47,7 +47,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '038e4dcf-1976-4fca-a66a-93611ea1b18c',
+        oldToken: '41a167c9-2968-410a-a186-8f259716d806',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZM4zOzujJ0u2HgIssAWWBmBRGO8uxqho_cVr3jN_08Y5xb2EBZwQyuNLeCGVhoisUC-xoOFiOKFUSkqRvFRTlXN8VhBAfl-hT15JXZm7AoY0vQLZWD3DfOYb-f8-Me5yzR8Zn2nLoeUsCXuUUgVVazDMgnt2Po2iIfXGwAA__8.HBO2CVtY9G5noVhElgHNtMUaUzW8DY-BlKm3gGLL6uM',
         
         originalRequestURL: 'http://10.88.22.67:8080',