centaline-data-driven 1.4.64 → 1.4.66

package/package.json

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

package/src/centaline/dynamicLayout/src/dynamicLayout.vue

@@ -97,12 +97,10 @@
       getValue(data, val) {
         return val.split('.').reduce((data, currentVal) => {
           var rtn = data[currentVal];
-          if (typeof rtn !== 'undefined') {
-            if (rtn.toString().indexOf('"') != -1) {
-              rtn = rtn.replace(/"/g, "'");
-              rtn = rtn.replace(/>/g, ">");
-              rtn = rtn.replace(/</g, "&lt;");
-            }
+          if (typeof rtn !== 'undefined' && typeof (rtn) == 'string') {
+            rtn = rtn.replace(/"/g, "'");
+            rtn = rtn.replace(/>/g, "&gt;");
+            rtn = rtn.replace(/</g, "&lt;");
           }
           else {
             rtn = "";

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

@@ -121,7 +121,6 @@
         sideBarRight:0,
         sideBarMenuRight:0,
         sideBarStatus:'',
-        sideBarStatus:'',
         sideBarApi:'',
         sideBarApiParam:null,
         sideBarPageType:'',
@@ -188,7 +187,16 @@
         this.$emit('refreshParent');
       },
       resize() {
-        this.$refs.table.setTableHeight();
+        if(this.$refs.table){
+          this.$refs.table.setTableHeight();
+        }
+      },
+      resizeSearchList() {
+        if(this.flagSideBar && this.flagSideBarOfData){
+          if(this.sideBarStatus=='open'){
+            this.searchWidth=this.$refs.main.clientWidth-this.sideBarWidth;
+          }
+        }
       },
       showTitleHandler() {
         if (this.$refs.table.model && this.$refs.table.model.flagShowTitle) {
@@ -203,6 +211,7 @@
         }
       },
       tableLoaded() {
+        var self = this;
         if (typeof this.$refs.table.model.cellLayout !== "undefined") {
           this.$refs.screen.LoadLayout();
         }
@@ -235,6 +244,10 @@
               this.sideMenuClickHandler(status);
             }
           }
+
+          window.addEventListener("resize", (ev) => {
+            self.resizeSearchList();
+          });
         }
         else{
           this.flagSideBarOfData=false;

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

@@ -55,8 +55,8 @@ 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) && field.show) {
-            forrightRouter=true;
+          if ((!field.rightField || (typeof rowdata[forname][forrowindex] !== "undefined" && rowdata[forname][forrowindex][field.rightField] == 1)) && field.show) {
+            forrightRouter = true;
           }
         }
         return forrightRouter;

package/src/main.js

@@ -47,7 +47,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '3ba3f510-93fd-4103-9249-73c13f3f6fc2',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjkEKwjAQRe-StQNJZiYz6S5tmo2HkMZWqCuxLSji3a14CLePz3v_ZZatmsZgKy1nFgiJCcj3BJqlAIVMklVKl-gUCmfvRQClKHTOInifMtjvFDPGIPaUKSb1hLAj3E2uB20xgWdSwsIUhc3BTI-baVwQdYzk9WDmYf0Bu1u-YFum-3F6_uPcdZ337Og4ajgTTJdQgWwYYdCqMNpYeajjhSOb9wcAAP__.FwJrqBiqDn1H2KI7t-vmBjLQYadNyXFFaId5kR1WL_8',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzk0KwjAQBeC7ZN2BZn4yE3epaTYeolQbQVdiKyji3W3xEG4_Hu-9t5sfR7dz1GknWRRCEgbGnsGyFuCQWbNp2SceQpGMqAqkxWDvWwLElKHdopQpBm2HzDEZMsFKtDb5HqyjBChsTEU4qrjG1efN7XxQI-QosXGXcfkBkskGj7neD_X1j3PX5bLO8oiep5OC-MmAz4hwRKswhRFHCZX0dHafLwAAAP__.shTXzeB9x00F9bs4SvdWhHe0KlzLxaL0F0y0EW4LXUM',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',