centaline-data-driven 1.2.79 → 1.2.80

package/package.json

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

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

@@ -1,12 +1,11 @@
 <template>
-    <div v-loading="loading" class="ct-Layout" v-if="Layout !== null && !loading">
-      <ct-layoutchildren :rowindex="rowindex"  :vmodel="Layout" @click="rolRouterClickHandler"></ct-layoutchildren>
-    </div>
+  <div v-loading="loading" class="ct-Layout" v-if="Layout !== null && !loading">
+    <ct-layoutchildren :ref="'layout'+rowindex" :rowindex="rowindex" :vmodel="Layout" @click="rolRouterClickHandler"></ct-layoutchildren>
+  </div>
 </template>
 <script>
   import dynamicElement from '../../mixins/dynamicElement'
   import dynamicLayoutChildren from './dynamicLayoutChildren.vue';
-  import common from '../../common';
   export default {
     name: 'ct-layout',
     mixins: [dynamicElement],
@@ -24,7 +23,7 @@
     },
     data() {
       return {
-        Layout:[]
+        Layout: []
       };
     },
     created() {
@@ -49,21 +48,71 @@
       },
       load(data, cellLayout) {
         var str = '';
+        if (cellLayout.indexOf("for=") != -1) {
+          var cellxmlDOM = this.loadXML(cellLayout);
+          var listxml = this.getxmlForStr(cellxmlDOM);
+
+          if (typeof listxml !== 'undefined') {
+            for (var j = 0; j < listxml.attributes.length; j++) {
+              var attribute = listxml.attributes.item(j);
+              if (attribute.nodeName.toLowerCase() == "for".toLowerCase()) {
+                var liststr = "";
+                var celllist = this.xmlToString(listxml)
+
+                var celllistNew = this.loadXML(celllist);
+                var newAtt = celllistNew.createAttribute("forrowindex");
+                newAtt.nodeValue = "{{forrowindex}}";
+                var x = celllistNew.getElementsByTagName("Layout");
+                x[0].setAttributeNode(newAtt);
+                var cellstr = this.xmlToString(celllistNew)
+                var list = data[attribute.nodeValue];
+                if (typeof list !== 'undefined') {
+                  for (var i = 0; i < list.length; i++) {
+                    list[i].forrowindex = i;
+                    liststr += cellstr.replace(/\{\{(.+?)\}\}/g, (...args) => {
+                      return this.getValue(list[i], args[1])
+                    });
+                  }
+                }
+                cellLayout = cellLayout.replace(/\n/g, '').trim() //去除换行 和头尾空格
+                let replacer = function (match, p1, p2, p3, offset) {
+                  return p1 + p3
+                }
+                cellLayout = cellLayout.replace(/(>)(\s*)(<)/g, replacer) //把 > 和 < 之间的空格去除
+                cellLayout = cellLayout.replace(/ +/g, ' ')
+                cellLayout = cellLayout.replace(celllist, liststr)
+              }
+            }
+          }
+        }
         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]);
+        console.log(xmlDOM)
+        this.Layout = this.xmlToJson(xmlDOM);
+        this.model = this.loaderObj.CellLayout(this.Layout);
         this.loading = false;
       },
-      getValue(data,val) {
+      getValue(data, val) {
         return val.split('.').reduce((data, currentVal) => {
-          return data[currentVal]
+          var rtn = data[currentVal];
+          if (rtn.toString().indexOf('"') != -1) {
+            rtn = rtn.replace(/"/g, "'");
+            rtn = rtn.replace(/>/g, "&gt;");
+            rtn = rtn.replace(/</g, "&lt;");
+          }
+          return rtn
         }, data)
       },
       loadXML(xmlString) {
+        xmlString = xmlString.replace(/\n/g, '').trim()
+        let replacer = function (match, p1, p2, p3, offset) {
+          return p1 + p3
+        }
+        xmlString = xmlString.replace(/(>)(\s*)(<)/g, replacer)
         if (document.all) {
           var xmlDom = new ActiveXObject("Microsoft.XMLDOM");
           xmlDom.loadXML(xmlString)
@@ -73,19 +122,43 @@
           return new DOMParser().parseFromString(xmlString, "text/xml");
         }
       },
-
-      xmlToJson(xml) {
-        // Create the return object
-        var obj = {};
+      xmlToString(xmlObj) {
+        if (document.all) //IE浏览器
+        {
+          return xmlObj.xml;
+        }
+        else //其他浏览器
+        {
+          return (new XMLSerializer()).serializeToString(xmlObj);
+        }
+      },
+      getxmlForStr(xml) {
         if (xml.nodeType == 1) { // element
           // do attributes
           if (xml.attributes.length > 0) {
             for (var j = 0; j < xml.attributes.length; j++) {
               var attribute = xml.attributes.item(j);
-              obj[attribute.nodeName] = attribute.nodeValue;
+              if (attribute.nodeName.toLowerCase() == "for".toLowerCase()) {
+                return xml
+              }
+            }
+          }
+        }
+        if (xml.hasChildNodes()) {
+          for (var i = 0; i < xml.childNodes.length; i++) {
+            var item = xml.childNodes.item(i);
+            var result = this.getxmlForStr(item);
+            if (result) {
+              return result;
             }
           }
         }
+      },
+
+      xmlToJson(xml) {
+        var self = this;
+        // Create the return object
+        var obj = {};
         if (xml.nodeName.toLowerCase() == "Layout".toLowerCase() || xml.nodeName.toLowerCase() == "StackLayout".toLowerCase()) {
           obj["is"] = "ct-layoutchildren";
         }
@@ -98,12 +171,35 @@
         else if (xml.nodeName.toLowerCase() == "Image".toLowerCase()) {
           obj["is"] = "ct-layoutimage";
         }
-        obj["type"] = xml.nodeName;
+        if (xml.nodeType == 1) { // element
+          // do attributes
+          if (xml.attributes.length > 0) {
+            for (var j = 0; j < xml.attributes.length; j++) {
+              var attribute = xml.attributes.item(j);
+              obj[attribute.nodeName] = attribute.nodeValue;
+              if (attribute.nodeName.toLowerCase() == "for".toLowerCase()) {
+                obj["is"] = "ct-layoutchildrenfor";
+              }
+              if (attribute.nodeName.toLowerCase() == "routerKey".toLowerCase()) {
+                var actionRouter = self.actionRouter;
+                let field = actionRouter.find(b => {
+                  return b.id === attribute.nodeValue;
+                });
+                if (typeof field !== "undefined") {
+                  if (!field.rightField || self.vmodel[field.rightField] == 1) {
+                    obj["rightRouter"] = true;
+                  }
+
+                }
+              }
+            }
+          }
+        }
+
         // do children
         if (xml.hasChildNodes()) {
           for (var i = 0; i < xml.childNodes.length; i++) {
             var item = xml.childNodes.item(i);
-            var nodeName = item.nodeName;
             if (typeof (obj["fields"]) == "undefined") {
               obj["fields"] = [];
               obj["fields"].push(this.xmlToJson(item));
@@ -119,29 +215,34 @@
         }
         return obj;
       },
-      rolRouterClickHandler(routerKey, rowindex) {
+      rolRouterClickHandler(routerKey, rowindex, forname, forrowindex) {
         var self = this;
         var submitData = {};
         var rowData = self.vmodel;
         var actionRouter = self.actionRouter;
-        debugger
         let field = actionRouter.find(b => {
           return b.id === routerKey;
         });
-        field.submitListField.forEach((k) => {
-          submitData[k] = rowData[k];
-        });
-
+        if (typeof forname !== "undefined") {
+          field.submitListField.forEach((k) => {
+            submitData[k] = rowData[forname][forrowindex][k];
+          });
+        }
+        else {
+          field.submitListField.forEach((k) => {
+            submitData[k] = rowData[k];
+          });
+        }
         let action = field.action;
         if (field.actionField) {
           action = rowData[field.actionField];
         }
-        this.routerClickHandler(field, submitData, action);
+        this.routerClickHandler(field, submitData, action, rowindex,forname, forrowindex);
       },
-      routerClickHandler(field, submitData, action) {
+      routerClickHandler(field, submitData, action, rowindex, forname, forrowindex) {
         let self = this;
         action = action || field.action;
-       
+
         var clickAcion = function () {
           //若不是客户端方法，则直接访问接口
           if (!field.isClientFuntion) {
@@ -250,15 +351,11 @@
                 self.$common.openDialog(dialogOption);
               }
               else {
-                self.operationLoading = true;
                 field.doAction(submitData, (data) => {
-                  self.operationLoading = false;
-                  if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
-                    self.model.doAction({ responseData: data });
+                  self.model.doAction(data, field);
+                  if (field.actionType === 19) {
+                    self.callTelClick(self.$refs['layout' + rowindex].$refs.layoutchildren, data, forname, forrowindex)
                   }
-                  self.$forceUpdate();
-                  self.$refs.footer.$forceUpdate();
-                  self.updateCurrentRow(field, data);
                 })
               }
             }
@@ -291,6 +388,22 @@
           clickAcion();
         }
       },
+      callTelClick(VueCom, data, forname, forrowindex) {
+        if (typeof VueCom.$refs['router' + forname + forrowindex] !== "undefined") {
+          VueCom.callTelClick(data);
+          return true;
+        }
+        if (VueCom.$children.length>0) {
+          for (var i = 0; i < VueCom.$children.length; i++) {
+            var item = VueCom.$children[i];
+            var result = this.callTelClick(item, data,forname, forrowindex);
+            if (result) {
+              return result;
+            }
+          }
+        }
+      },
+
     },
     mounted() {
 

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

@@ -1,6 +1,6 @@
 <template>
-  <el-container :direction="model.orientation" :style="model.styleObject">
-    <component v-for="(item, index) in model.fields" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex"  @click="clickHandler"></component>
+  <el-container :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
+    <component v-for="(item, index) in model.fields" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
   </el-container>
 </template>
 <script>
@@ -8,30 +8,33 @@
   import dynamicLayoutLabel from './dynamicLayoutLabel.vue';
   import dynamicLayoutLine from './dynamicLayoutLine.vue';
   import dynamicLayoutImage from './dynamicLayoutImage.vue';
+  import dynamicLayoutChildrenFor from './dynamicLayoutChildrenFor.vue';
   export default {
     name: 'ct-layoutchildren',
     mixins: [dynamicElement],
     components: {
       'ct-layoutlabel': dynamicLayoutLabel,
       'ct-layoutline': dynamicLayoutLine,
-      'ct-layoutimage': dynamicLayoutImage
+      'ct-layoutimage': dynamicLayoutImage,
+      'ct-layoutchildrenfor': dynamicLayoutChildrenFor
     },
     props: {
       vmodel: Object,
-      rowindex: Number
+      rowindex: Number,
+      forname: String,
+      forrowindex: String
     },
     data() {
       return {
-
+        forindex:0
       };
     },
     created() {
       this.model = this.loaderObj.CellLayout(this.vmodel);
-     
     },
     methods: {
-      clickHandler(routerKey, rowindex) {
-        this.$emit('click', routerKey, rowindex);
+      clickHandler(routerKey, rowindex, forname, forrowindex) {
+        this.$emit('click', routerKey, rowindex, forname, forrowindex);
       }
     },
     mounted() {

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

@@ -0,0 +1,39 @@
+<template>
+  <el-container :direction="model.orientation" :style="model.styleObject">
+      <ct-layoutchildren v-for="(item, index) in model.fields" :key="index" :rowindex="rowindex" :forrowindex="model.forrowindex" :vmodel="item" :forname="model.forname" @click="clickHandler"></ct-layoutchildren>
+  </el-container>
+</template>
+<script>
+  import dynamicElement from '../../mixins/dynamicElement'
+  export default {
+    name: 'ct-layoutchildrenfor',
+    mixins: [dynamicElement],
+    components: {
+      'ct-layoutchildren': () => import('./dynamicLayoutChildren.vue'),
+    },
+    props: {
+      vmodel: Object,
+      rowindex: Number
+    },
+    data() {
+      return {
+        forname: '',
+        forwindex:0
+      };
+    },
+    created() {
+      this.model = this.loaderObj.CellLayout(this.vmodel);
+    },
+    methods: {
+      clickHandler(routerKey, rowindex, forname, forrowindex) {
+        this.$emit('click', routerKey, rowindex, forname, forrowindex);
+      }
+    },
+    mounted() {
+
+    }
+  }
+</script>
+<style>
+ 
+</style>

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

@@ -1,6 +1,16 @@
 <template>
-  <div v-if="model.routerKey" :style="model.styleObject">
-    <img class="ct-tablecurrencyImg ct-tablecurrencyItem" :src="model.value"  @click="clickHandler($event)" />
+  <div v-if="model.routerKey">
+    <div :ref="'router'+forname+forrowindex" :style="model.styleObject">
+      <el-popover class="Stats-popover" :popper-class="'el-popoverCallTel'" :placement="option.placement?option.placement:'left'"
+                  v-model="visible" :trigger="option.trigger?option.trigger:''">
+        <div style="border-bottom:none">
+          <div style="color: #388cd3;text-align: center;">{{message}}</div>
+          <img v-show="qrCode" :src="qrCode" style="margin-top: 5px;" :style="{'width':width+'px','height':height+'px'}" />
+        </div>
+        <el-image :src="tellImgUrl?tellImgUrl:model.value"
+                  fit="fit" slot="reference" @click="clickHandler($event)" style="cursor:pointer;"></el-image>
+      </el-popover>
+    </div>
   </div>
   <div v-else :style="model.styleObject">
     <el-image :src="model.value"
@@ -15,10 +25,25 @@
     mixins: [dynamicElement],
     props: {
       vmodel: Object,
-      rowindex: Number
+      rowindex: Number,
+      forname: String,
+      forrowindex: String
     },
     data() {
       return {
+        visible: false,
+        message: '',
+        qrCode: '',
+        width: 300,
+        height: 300,
+        tellImgUrl: '',
+        option: {
+          isHidden: true,//是否开启操作栏隐藏设置，默认开启
+          showNum: 3,//如果isHidden为true时，个数大于3就会隐藏，默认是3
+          appendId: '',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
+          trigger: 'manual',//触发方式，传值可查看Popper UI组件trigger属性
+          placement: 'bottom-start',//方向，传值可查看Popper UI组件placement属性
+        },
       }
     },
     created() {
@@ -29,8 +54,33 @@
    
     methods: {
       clickHandler(ev) {
-        this.$emit('click', this.model.routerKey, this.rowindex);
-      }
+        if (!this.visible) {
+          this.$emit('click', this.model.routerKey, this.rowindex, this.forname, this.forrowindex);
+        }
+        else {
+          this.visible = false;
+          this.tellImgUrl = '';
+        }
+        
+      },
+      callTelClick(data) {
+        this.message = '';
+        this.qrCode = '';
+        this.tellImgUrl = '';
+        if (data.content.actionType == '显示消息') {
+          this.visible = true;
+          this.message = data.content.message;
+          if (data.content.imgUrl) this.tellImgUrl = data.content.imgUrl;
+        }
+        else if (data.content.actionType == '扫码拨号') {
+          this.visible = true;
+          this.message = data.content.message;
+          this.qrCode = data.content.qrCode;
+          if (data.content.width) this.width = data.content.width;
+          if (data.content.height) this.height = data.content.height;
+          if (data.content.imgUrl) this.tellImgUrl = data.content.imgUrl;
+        }
+      },
     },
     computed: {
      

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

@@ -1,8 +1,10 @@
 <template>
-  <div v-if="model.routerKey" :style="model.styleObject">
-    <a href="javascript:void(0);"  @click="clickHandler($event)" class="ct-tablecurrencyItem">
-      {{model.value}}
-    </a>
+  <div v-if="model.routerKey">
+    <div  :style="model.styleObject">
+      <a href="javascript:void(0);" @click="clickHandler($event)" class="ct-tablecurrencyItem">
+        {{model.value}}
+      </a>
+    </div>
   </div>
   <div v-else :style="model.styleObject" v-html="model.value">
   </div>

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

@@ -549,8 +549,14 @@
           else {
             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;
+              var h2 = 0;
+              if (this.$parent.$parent.$refs.contact) {
+                h2 = this.$parent.$parent.$refs.contact.offsetHeight | 0;
+              }
+              var h3 = 0;
+              if (this.$parent.$parent.$refs.contact) {
+                h3 = this.$parent.$parent.$refs.title.offsetHeight | 0;
+              }
               let tableHeight = h1 - h2 - h3 - 270;
               if (h2 == 0) {
                 tableHeight = tableHeight + 15;