centaline-data-driven 1.2.81 → 1.2.82

package/package.json

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

package/src/Form.vue

@@ -2,7 +2,7 @@
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/api/finance/collection-money/detail'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -18,11 +18,11 @@
         // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
         // apiParam: {originalTraId: "1516290587463507969", actionType: "3", pageStyle: "2", pageTitle: "成交报告",pageOnly: "true"}
         apiParam:{
-actionType: 3,
-originalTraId: "1526048947277938690",
+actionType: 2,
+originalTraId: "1527194056950345730",
 pageOnly: true,
 pageStyle: 2,
-pageTitle: "成交报告"
+pageTitle: "新增代收款"
           }
       }
     },

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -354,6 +354,20 @@
         if(this.model.tags2 && this.model.tags2[0]){
           this.model.getTags2List(0);
         }
+        if (typeof window.localStorage !== 'undefined') {
+          var tagkey = window.localStorage.getItem('detailtagkey');
+          for (var i = 0; i < self.model.tags1.length; i++) {
+            if (tagkey == self.model.tags1[i].appID) {
+              self.model.activeIndex1 = i.toString();
+              if (self.model.tags1 && self.model.tags1[i]) {
+                self.listKey = self.listKey + 1;
+                self.model.searchConditionApiTags1 = self.model.tags1[i].searchConditionApiUrl || '';
+                self.model.searchDataApiTags1 = self.model.tags1[i].searchDataApiUrl || '';
+                self.model.paramDataTags1 = self.model.tags1[i].paramData || '';
+              }
+            }
+          }
+        }
         this.loadOperation();
         this.loadCommission();
         this.setDetailHeight();
@@ -444,7 +458,8 @@
           this.listKey=this.listKey+1;
           this.model.searchConditionApiTags1=this.model.tags1[i].searchConditionApiUrl||'';
           this.model.searchDataApiTags1=this.model.tags1[i].searchDataApiUrl||'';
-          this.model.paramDataTags1=this.model.tags1[i].paramData||'';
+          this.model.paramDataTags1 = this.model.tags1[i].paramData || '';
+          window.localStorage.setItem("detailtagkey", this.model.tags1[i].appID);//存储
         }
       },      
       fieldClickHandler(field) {

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -149,6 +149,20 @@
         if(this.model.tags2 && this.model.tags2[0]){
           this.model.getTags2List(0);
         }
+        if (typeof window.localStorage !== 'undefined') {
+          var tagkey = window.localStorage.getItem('simpletagkey');
+          for (var i = 0; i < self.model.tags1.length;i++) {
+            if (tagkey == self.model.tags1[i].appID) {
+              self.model.activeIndex1 = i.toString();
+              if (self.model.tags1 && self.model.tags1[i]) {
+                self.listKey = self.listKey + 1;
+                self.model.searchConditionApiTags1 = self.model.tags1[i].searchConditionApiUrl || '';
+                self.model.searchDataApiTags1 = self.model.tags1[i].searchDataApiUrl || '';
+                self.model.paramDataTags1 = self.model.tags1[i].paramData || '';
+              }
+            }
+          }
+        }
         this.loadOperation();
         this.setDetailStyle();
         this.$nextTick(() => {
@@ -249,6 +263,7 @@
           this.model.searchConditionApiTags1 = this.model.tags1[i].searchConditionApiUrl || '';
           this.model.searchDataApiTags1 = this.model.tags1[i].searchDataApiUrl || '';
           this.model.paramDataTags1 = this.model.tags1[i].paramData || '';
+          window.localStorage.setItem("simpletagkey", this.model.tags1[i].appID);//存储
         }
       },      
       fieldClickHandler(field) {

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -207,7 +207,6 @@
       },
       //不能共用的数据校验
       selfValidExcute: function (eventName) {
-
         if (this.model.required) {
           if (this.model.getfileListLength() === 0) {
             this.validMessage = "必须上传附件";
@@ -217,48 +216,31 @@
         }
 
         if (this.model.max) {
-          //change
-          if(this.model.getfileListLength() >= this.model.max)
-          {
+          if(this.model.getfileListLength() >= this.model.max){
             this.disableUpload=true;
-          }else
-          {
+          }
+          else{
             this.disableUpload=false;
           }
-
-          // if (this.model.getfileListLength() > this.model.max) {
-          //   this.validMessage = "附件数量";
-          //   if(this.model.min)
-          //   {
-          //     this.validMessage += "最少" + this.model.min + "个"+",";
-          //   }
-          //   // this.validMessage += "最多" + this.model.max+ "个";
-          //   this.valid = false;
-          //   return false;
-          // }
         }
         if (this.model.min) {
           if (this.model.getfileListLength() < this.model.min) {
             //change时需要判断有没有上传图片如果没有图片则不提示
-
-            if(eventName=='change' && this.model.getfileListLength()>0)
-            {
+            if(eventName=='change' && this.model.getfileListLength()>0){
                this.validMessage = "附件数量还差" + (parseInt(this.model.min)-this.model.getfileListLength()) + "张";
                this.valid = false;
-            }else if(eventName=='valid')
-            {
+            }
+            else if(eventName=='valid'){
                this.validMessage = "附件数量还差" + (parseInt(this.model.min)-this.model.getfileListLength()) + "张";
                this.valid = false;
-            }else if(eventName=='remove')
-            {
-              this.valid = true;
             }
-          
+            else if(eventName=='remove'){
+              this.valid = true;
+            }          
             return false;
           }
         }
-        if(eventName=='valid'&&!this.validFileClass())
-        {
+        if(eventName=='valid'&&!this.validFileClass()){
           this.validMessage="请选择附件分类";
           this.valid = false;
           return false;
@@ -267,17 +249,13 @@
         return this.valid;
       },
       //验证附件分类是否必填
-      validFileClass()
-      {
-        if(this.model.paramName)
-        {
-          if(this.model.sourceList&&this.model.sourceList.length>0)
-          {
+      validFileClass(){
+        if(this.model.paramName){
+          if(this.model.sourceList&&this.model.sourceList.length>0){
             let notClass= this.model.sourceList.filter(item=>{
-              return item.mediaLabelID==undefined||item.mediaLabelID=="";
+              return (item.mediaLabelID==undefined||item.mediaLabelID=="") && item.flagDeleted !== true;
             })
-            if(notClass.length>0)
-            {
+            if(notClass.length>0){
               return false
             }
           }

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -552,7 +552,7 @@
         self.$refs.Fields.forEach((f) => {
           if (f.model && typeof f.validExcute !== 'undefined') {
             if (!f.validExcute()) {
-              if(i===0){
+              if(i===0 && f.model.label){
                 self.$message.error('【'+f.model.label+'】不能为空！');
               }
               i++;

package/src/centaline/dynamicForm/src/dynamicFormListTable.vue

@@ -31,12 +31,11 @@
                   <component v-if ref="Fields" :is="v.is" :vmodel="scope.row[v.id]" :vrowmodel="scope.row" :api="model.OptApi"></component>
                 </span>
                 <!--可点击的列-->
-                <!-- <span v-else-if="v.routers" :class="'cell'" style="display: flex;">
-                  <component v-for="(router, routerIndex) in v.routers" :key="routerIndex" :ref="'router'+router.id+scope.$index" :rowData="scope.row" :rowindex="scope.$index"
-                    v-if="!router.rightField || !scope.row[router.rightField] || scope.row[router.rightField] == 1" 
-                    :is="router.is" :vmodel="router" :api="model.optionApi" @click="rolRouterClickHandler">
-                  </component>
-                </span> -->
+                <span v-else-if="v.router" :class="'cell'" style="display: flex;">
+                  <ct-tablecurrency :router="v.router" :colValue="scope.row[v.id].label" :rowData="scope.row"
+                                  @click="rolRouterClickHandler">
+                  </ct-tablecurrency>
+                </span>
                 <ct-span v-else :vmodel="scope.row[v.id]" :rowNum="scope.row.$sourceIndex" ref="FieldsLabel"></ct-span>
               </template>
             </el-table-column>
@@ -288,6 +287,18 @@
 
         this.$emit('tableButtonClick', button, submitData);
       },
+      rolRouterClickHandler(field, rowData,rowindex) {
+        if(this.$refs['popover'+rowindex]){
+          this.$refs['popover'+rowindex][0].doClose();
+        }
+
+        var submitData = {};        
+        field.submitListField.forEach((k) => {
+          submitData[k] = rowData[k];
+        });
+
+        this.$emit('tableButtonClick', field, submitData);
+      },
       //汇总行 计算
       getSummaries(param) {
         const self = this;

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

@@ -1,41 +1,222 @@
 <template>
-  <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>
+  <div v-loading="loading" class="ct-Layout" v-if="Layout !== null && !loading">
+    <ct-layoutchildren :rowindex="rowindex" :vmodel="Layout" @click="clickHandler"></ct-layoutchildren>
+  </div>
 </template>
 <script>
   import dynamicElement from '../../mixins/dynamicElement'
-  import dynamicLayoutLabel from './dynamicLayoutLabel.vue';
-  import dynamicLayoutLine from './dynamicLayoutLine.vue';
-  import dynamicLayoutImage from './dynamicLayoutImage.vue';
   import dynamicLayoutChildren from './dynamicLayoutChildren.vue';
   export default {
     name: 'ct-layout',
     mixins: [dynamicElement],
     components: {
-      'ct-layoutlabel': dynamicLayoutLabel,
-      'ct-layoutline': dynamicLayoutLine,
-      'ct-layoutimage': dynamicLayoutImage,
       'ct-layoutchildren': dynamicLayoutChildren
     },
     props: {
+      api: String,
+      cellLayout: String,
       vmodel: Object,
       rowindex: Number,
-      forname: String,
-      forrowindex: String
+      actionRouter: Array,
+      listData: Array,
+      apiParam: Object
     },
     data() {
       return {
-        forindex: 0
+        Layout: []
       };
     },
     created() {
-      this.model = this.loaderObj.CellLayout(this.vmodel);
+      this.init();
     },
     methods: {
+      init() {
+        var self = this;
+        //初始化
+        this.loading = true;
+        this.$nextTick(function () {
+          if (typeof self.api !== 'undefined') {
+            self.loaderObj.CellLayout(self.api, self.load, this.apiParam, self.failLoad);
+          }
+          else if (typeof self.vmodel !== 'undefined') {
+            self.load(self.vmodel, self.cellLayout);
+          }
+        });
+      },
+      failLoad() {
+        this.$emit('failLoad', this.model);
+      },
+      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);
+        this.loading = false;
+      },
+      getValue(data, val) {
+        return val.split('.').reduce((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)
+          return xmlDom
+        }
+        else {
+          return new DOMParser().parseFromString(xmlString, "text/xml");
+        }
+      },
+      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);
+              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";
+        }
+        else if (xml.nodeName.toLowerCase() == "Label".toLowerCase()) {
+          obj["is"] = "ct-layoutlabel";
+        }
+        else if (xml.nodeName.toLowerCase() == "Line".toLowerCase()) {
+          obj["is"] = "ct-layoutline";
+        }
+        else if (xml.nodeName.toLowerCase() == "Image".toLowerCase()) {
+          obj["is"] = "ct-layoutimage";
+        }
+        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);
+            if (typeof (obj["fields"]) == "undefined") {
+              obj["fields"] = [];
+              obj["fields"].push(this.xmlToJson(item));
+            } else {
+              if (typeof (obj["fields"].push) == "undefined") {
+                var old = obj["fields"];
+                obj["fields"] = [];
+                obj["fields"].push(old);
+              }
+              obj["fields"].push(this.xmlToJson(item));
+            }
+          }
+        }
+        return obj;
+      },
       clickHandler(routerKey, rowindex, forname, forrowindex) {
         this.$emit('click', routerKey, rowindex, forname, forrowindex);
-      }
+      },
+
     },
     mounted() {
 
@@ -43,4 +224,7 @@
   }
 </script>
 <style>
+  .ct-Layout {
+    font-size: 12px;
+  }
 </style>

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

@@ -1,24 +1,32 @@
 <template>
-  <el-container :direction="model.orientation" :style="model.styleObject">
-    <ct-layout v-for="(item, index) in model.fields" :key="index" :rowindex="rowindex" :forrowindex="model.forrowindex" :vmodel="item" :forname="model.forname" @click="clickHandler"></ct-layout>
+  <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>
   import dynamicElement from '../../mixins/dynamicElement'
+  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-layout': () => import('./dynamicLayout.vue'),
+      'ct-layoutlabel': dynamicLayoutLabel,
+      'ct-layoutline': dynamicLayoutLine,
+      'ct-layoutimage': dynamicLayoutImage,
+      'ct-layoutchildrenfor': dynamicLayoutChildrenFor
     },
     props: {
       vmodel: Object,
-      rowindex: Number
+      rowindex: Number,
+      forname: String,
+      forrowindex: String
     },
     data() {
       return {
-        forname: '',
-        forwindex: 0
+        forindex: 0
       };
     },
     created() {

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>