centaline-data-driven 1.4.45 → 1.4.47

package/package.json

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

package/src/centaline/css/common.css

@@ -584,7 +584,7 @@ html {
 
 .ct-searchtable{
   margin-top: 10px;
-  padding: 20px 10px 0 15px;
+  padding: 20px 10px 0 10px;
   background: #fff;
   -webkit-box-sizing: border-box;
   border-radius:6px;

package/src/centaline/css/max.css

@@ -281,9 +281,6 @@
     display: flex;
     justify-content: flex-start;
     align-items: center;
-}
-.max-tableToolbar {
-    padding-top: 10px !important;
 }
  .st-serach-screen .max-shortcutFollow {
     padding-left: 0px !important;

package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue

@@ -103,14 +103,19 @@
           return typeof v.parentName !== 'undefined';
         });
         hasParent.forEach((v, index) => {
-          var parent = self.model.screen.find((v1) => {
-            return v1.id === v.parentName;
+          var parentNames=v.parentName.split(',');
+          parentNames.forEach((parname)=>{
+            var parent = self.model.screen.find((v1) => {            
+              return v1.id===parname;
+            });
+            
+            if (parent) {
+              parent.child = parent.child ? parent.child : [];
+              parent.child.push(v);
+              v.parent = v.parent ? v.parent : [];
+              v.parent.push(parent);
+            }
           });
-          if (parent) {
-            parent.child = parent.child ? parent.child : [];
-            parent.child.push(v);
-            v.parent = parent;
-          }
         });
       },
       loadHighScreen() {
@@ -121,14 +126,19 @@
           return typeof v.parentName !== 'undefined';
         });
         hasParent.forEach((v, index) => {
-          var parent = self.model.highScreen.find((v1) => {
-            return v1.id === v.parentName;
+          var parentNames=v.parentName.split(',');
+          parentNames.forEach((parname)=>{
+            var parent = self.model.highScreen.find((v1) => {            
+              return v1.id===parname;
+            });
+            
+            if (parent) {
+              parent.child = parent.child ? parent.child : [];
+              parent.child.push(v);
+              v.parent = v.parent ? v.parent : [];
+              v.parent.push(parent);
+            }
           });
-          if (parent) {
-            parent.child = parent.child ? parent.child : [];
-            parent.child.push(v);
-            v.parent = parent;
-          }
         });
       },
       //无任何筛选条件时，不显示该div

package/src/centaline/dynamicSearchList/src/dynamicTableTip.vue

@@ -19,7 +19,6 @@ export default {
   font-size: 18px;
   line-height: 40px;
   min-height: 40px;
-  padding-left: 15px;
   display: table
 }
 

package/src/centaline/dynamicSearchList/src/dynamicTableToolbar.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="ct-tableToolbar max-tableToolbar" style="width:100%;" v-if="buttons && buttons.length > 0">
+  <div class="ct-tableToolbar" style="width:100%;" v-if="buttons && buttons.length > 0">
   
 <div v-if="buttonsLeft&&buttonsLeft.length>0" class="bool_btn_l">
   <ul>
@@ -73,7 +73,7 @@ export default {
   width: 100%;
   position: relative;
   float: left;
-  padding: 0 5px 10px 0px;
+  padding: 0 5px 5px 0px;
   background-color: #fff;
   border-radius: 6px;
 }

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

@@ -55,7 +55,7 @@ const CellLayout = function (source, actionRouter,rowdata, forname, forrowindex)
           return b.id === source.routerKey;
         });
         if (typeof field !== "undefined") {
-          if (!field.rightField || rowdata[forname][forrowindex][field.rightField] == 1) {
+          if ((!field.rightField || rowdata[forname][forrowindex][field.rightField] == 1) && field.show) {
             forrightRouter=true;
           }
         }

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

@@ -760,7 +760,8 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         let submitData = {};
         var tempFormData = rtn.getFormObj();
         parentFieldNameArr.forEach((v) => {
-          submitData[v] = tempFormData[v];
+          let vs=v.split('.');
+          submitData[vs[vs.length-1]] = tempFormData[v];
         });
         
         if(JSON.stringify(submitData) == "{}"){
@@ -771,7 +772,8 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             return JSON.stringify(submitData);
           }
           else{
-            return submitData[parentFieldNameArr[0]];
+            let parentNameArr = parentFieldNameArr[0].split('.');
+            return submitData[parentNameArr[parentNameArr.length-1]];
           }
         }
       },

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

@@ -338,7 +338,10 @@ const SearchScreen = function (source, callBack, screenPara) {
         var tempFormData = rtn.searchData;
         parentFieldNameArr.forEach((v) => {
           tempFormData.fields.forEach((n)=>{
-            if(n.fieldName1==v)submitData[v] = n.searchValue1;
+            if(n.fieldName1==v){
+              let vs=v.split('.');
+              submitData[vs[vs.length-1]] = n.searchValue1;
+            }
           });
         });
         if(JSON.stringify(submitData) == "{}"){
@@ -349,7 +352,8 @@ const SearchScreen = function (source, callBack, screenPara) {
             return JSON.stringify(submitData);
           }
           else{
-            return submitData[parentFieldNameArr[0]];
+            let parentNameArr = parentFieldNameArr[0].split('.');
+            return submitData[parentNameArr[parentNameArr.length-1]];
           }
         }
       },

package/src/main.js

@@ -44,7 +44,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '3ba3f510-93fd-4103-9249-73c13f3f6fc2',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVbyZ72204ETGg4R2ZYthQqRRAIh7g6IpEvPFFNM894TpiVBC3YFd7Qx-BXc0cYgJXkruceDtwGJSaOTwWEgDnTqeh2OHTRQ7ldoJVsjNbPRDYxx_gVhhPqGZSq3c3n849xlHj-zVCg6WxMWoRRSsQJ9TB5rzqrqXEk4Da83AAAA__8.cb-yxMKDgBK9Hmytc12QtOZf2gNm-2TfF44YGlgp0pM',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrsOgkAQRf9laibZYWZ3WDpdsPEjyPLYBCsjkGiM_26I0NF7ilOc5t43TEsLJegGHmin8Rt4oJ2GSLySq_HkNaA4YSwoFBjEBblUNYdzBRkMzzuU5NSKsuaSwRjnX-BCeQ3LNDyuw-sf527zuM4K2y4mwhhNjhK5xehdQt_bXsm0pusSfL4AAAD__w.fIxeWo0MVh2Rh-dilRePjsm6InCs0-x4ui0uNSwzPfU',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',