centaline-data-driven 1.2.75 → 1.2.76

package/package.json

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

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

@@ -1,6 +1,6 @@
 <template>
     <div v-loading="loading" class="ct-Layout" v-if="Layout !== null && !loading">
-      <ct-layoutchildren  v-for="(item, index) in Layout.fields" :key="index":vmodel="item" :rowindex="index"  @click="rolRouterClickHandler"></ct-layoutchildren>
+      <ct-layoutchildren :rowindex="rowindex"  :vmodel="Layout" @click="rolRouterClickHandler"></ct-layoutchildren>
     </div>
 </template>
 <script>
@@ -17,6 +17,8 @@
       api: String,
       cellLayout: String,
       vmodel: Object,
+      rowindex: Number,
+      actionRouter: Array,
       listData: Array,
       apiParam: Object
     },
@@ -38,30 +40,23 @@
             self.loaderObj.CellLayout(self.api, self.load, this.apiParam, self.failLoad);
           }
           else if (typeof self.vmodel !== 'undefined') {
-            self.load(self.vmodel);
+            self.load(self.vmodel, self.cellLayout);
           }
-         
         });
-        
       },
       failLoad() {
         this.$emit('failLoad', this.model);
       },
-      load(data) {
-        this.model = data;
-        if (data.rows.length > 0) {
-          var str = '<Layout orientation="vertical">';
-          for (var i = 0; i < data.rows.length; i++) {
-            str += data.cellLayout.replace(/\{\{(.+?)\}\}/g, (...args) => {
-              return this.getValue(data.rows[i], args[1])
-            });
-          }
-          str += '</Layout>';
+      load(data, cellLayout) {
+        var str = '';
+        if (typeof data !== 'undefined') {
+          str = cellLayout.replace(/\{\{(.+?)\}\}/g, (...args) => {
+            return this.getValue(data, args[1])
+          });
         }
         var xmlDOM = this.loadXML(str);
         this.Layout = this.xmlToJson(xmlDOM.childNodes[0]);
         this.loading = false;
-        this.$emit('loaded', this.model);
       },
       getValue(data,val) {
         return val.split('.').reduce((data, currentVal) => {
@@ -82,7 +77,6 @@
       xmlToJson(xml) {
         // Create the return object
         var obj = {};
-        var buffer = [];
         if (xml.nodeType == 1) { // element
           // do attributes
           if (xml.attributes.length > 0) {
@@ -128,14 +122,9 @@
       rolRouterClickHandler(routerKey, rowindex) {
         var self = this;
         var submitData = {};
-        var rowData = self.model.rows[rowindex];
-        var actionRouter = [];
-        if (self.model.actionRouters) {
-          self.model.actionRouters.forEach((v) => {
-            var field = self.loaderObj.Router(v);
-            actionRouter.push(field);
-          });
-        }
+        var rowData = self.vmodel;
+        var actionRouter = self.actionRouter;
+        debugger
         let field = actionRouter.find(b => {
           return b.id === routerKey;
         });

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

@@ -17,7 +17,7 @@
       @rowClickHandle="rowClickHandle" 
       @showTitle="showTitleHandler"></ct-searchtable>
     </div>
-    <div v-if="flagSideBar && flagSideBarOfData" 
+    <div ref="sidebar" v-if="flagSideBar && flagSideBarOfData" 
     :style="{'height': pageHeight? pageHeight:'100%','width':sideBarWidth+'px',right:sideBarRight+'px'}" 
     class="sidebar">
       <ct-Detail ref="detail" :api="sideBarApi" :apiParam="sideBarApiParam" :pageType="sideBarPageType" 
@@ -209,6 +209,7 @@
             }
           }
         }
+        this.$emit('tableLoaded', this.$refs.table.model);
       },
       rowClickHandle() {
         var self = this;

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

@@ -134,7 +134,9 @@
         </table>
       </div>
       <div v-else>
-        <ct-layout ref="CellLayout" :vmodel="model.source.content"></ct-layout>
+        <div v-for="(row,rowindex) in model.listData" :key="rowindex">
+            <ct-layout :vmodel="row" :cellLayout="model.cellLayout" :rowindex="rowindex" :actionRouter="model.actionRouter"></ct-layout>
+        </div>
       </div>
     </div>
     <ct-tabletip ref="listFooter" class="ct-search-table-list-footer" :tip="model.listFooter" v-if="!isLoading&&!isLayout"></ct-tabletip>
@@ -545,8 +547,8 @@
             });
           }
           else {
-            var h1 = document.body.offsetHeight | 0;
             if (this.$parent.$parent.$vnode.componentOptions.tag === 'ct-PropertySimpleDetailRET') {
+              var h1 = this.$parent.$parent.$parent.$parent.$refs.sidebar.offsetHeight | 0;
               var h2 = this.$parent.$parent.$refs.contact.offsetHeight | 0;
               var h3 = this.$parent.$parent.$refs.title.offsetHeight | 0;
               let tableHeight = h1 - h2 - h3 - 270;