centaline-data-driven 1.2.79 → 1.2.82

package/build/centaline/centaline.path.js

@@ -3,7 +3,6 @@ const paths = {
     "dynamicD": "./src/centaline/dynamicD/index.js",//日期组件
     "dynamicGp": "./src/centaline/dynamicGp/index.js",//分组标签组件
     "dynamicIti": "./src/centaline/dynamicIti/index.js",//数字区域组件
-    "dynamicLs": "./src/centaline/dynamicLs/index.js",//表单列表组件
     "dynamicMt": "./src/centaline/dynamicMt/index.js",//多行文本组件
     "dynamicSo": "./src/centaline/dynamicSo/index.js",//单选下拉菜单
     "dynamicSos": "./src/centaline/dynamicSos/index.js",//单选搜索下拉菜单
@@ -11,7 +10,6 @@ const paths = {
     "dynamicT": "./src/centaline/dynamicT/index.js",//文本input组件
     "dynamicL": "./src/centaline/dynamicL/index.js",//文本label组件
     "dynamicTags": "./src/centaline/dynamicTags/index.js",//多选搜索下拉菜单组件
-    "dynamicLabel": "./src/centaline/dynamicLabel/index.js",//标签组件
     "dynamicForm": "./src/centaline/dynamicForm/index.js",//表单组件
     "dynamicDrop": "./src/centaline/dynamicDrop/index.js",//快捷下拉输入组件
     "dynamicSearchList": "./src/centaline/dynamicSearchList/index.js",//查询表单组件  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.79",
+  "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/css/max.css

@@ -248,4 +248,7 @@
 .max.el-button.el-button--mini{
     height: 26px;
 }
-
+.ct-text .showLabel label{
+    display: inline-block;
+    line-height: 27px!important;
+  }

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/index.js

@@ -1,7 +1,5 @@
 import dynamicForm from './src/dynamicForm'
 import dynamicInput from '../dynamicInput/index'
-import dynamicLabel from '../dynamicLabel/index'
-import dynamicLs from '../dynamicLs/index'
 import api from '../api/index'
 import common from '../common/index'
 import validate from '../validate/index'
@@ -9,8 +7,6 @@ import validate from '../validate/index'
 dynamicForm.install = function (Vue) {
   Vue.component(dynamicForm.name, dynamicForm);
   Vue.component(dynamicInput.name, dynamicInput);
-  Vue.component(dynamicLabel.name, dynamicLabel);
-  Vue.component(dynamicLs.name, dynamicLs);
 
   Vue.use(api);
   Vue.use(common);

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

@@ -30,6 +30,12 @@
                 <span v-else-if="v.is=='ct-sensitiveeye'">
                   <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.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>
@@ -281,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,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 :rowindex="rowindex" :vmodel="Layout" @click="clickHandler"></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,69 @@
       },
       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]);
+        this.Layout = this.xmlToJson(xmlDOM);
         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 +120,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 +169,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,178 +213,10 @@
         }
         return obj;
       },
-      rolRouterClickHandler(routerKey, rowindex) {
-        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];
-        });
-
-        let action = field.action;
-        if (field.actionField) {
-          action = rowData[field.actionField];
-        }
-        this.routerClickHandler(field, submitData, action);
+      clickHandler(routerKey, rowindex, forname, forrowindex) {
+        this.$emit('click', routerKey, rowindex, forname, forrowindex);
       },
-      routerClickHandler(field, submitData, action) {
-        let self = this;
-        action = action || field.action;
-       
-        var clickAcion = function () {
-          //若不是客户端方法，则直接访问接口
-          if (!field.isClientFuntion) {
-            // 外部框架tab页打开
-            if (field.isFormPageInTab) {
-              submitData = field.getActionPara(submitData).para;
-              if (field.pageStyle) {
-                submitData.pageStyle = field.pageStyle;
-              }
-              self.$common.getDataDrivenOpts().handler.openTab(action, submitData, field.pageTitle, self.model, field.dialogWidth);
-            }
-            else if (field.isSearchPageInTab) {// 外部框架tab页打开
-              submitData = field.getActionPara(submitData).para;
-              self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
-            }
-            else if (field.isBrowserNewTab) {// 浏览器打开
-              submitData = field.getActionPara(submitData).para;
-              let query = self.$common.objectToQueryStr(submitData);
-              window.open(action + query, "_blank");
-            }
-            else {
-              //self.operationLoading = true;
 
-              //Form
-              if (field.isOpenForm) {
-                var dialogOption = {
-                  title: field.pageTitle,
-                  pane: self.$common.getParentPane(self),
-                  content: [{
-                    component: field.navToNewPageName,
-                    attrs: {
-                      //source: data.content,
-                      api: action,
-                      apiParam: field.getActionPara(submitData).para,
-                      showTitle: false,
-                      width: field.dialogWidth + 'px',
-                      height: field.dialogHeight + 'px'
-                    },
-                    on: {
-                      submit(ev) {
-                        if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
-                          self.model.doAction(ev);
-                        }
-                        self.$forceUpdate();
-                        self.$refs.footer.$forceUpdate();
-                        self.$common.closeDialog(dialogOption.dialog);
-                        self.updateCurrentRow(field, ev);
-                      },
-                      refreshParent() {
-                        self.getPage(1);
-                        self.$common.closeDialog(dialogOption.dialog);
-                      },
-                      closeDialog() {
-                        self.updateCurrentRow(field);
-                      }
-                    }
-                  }]
-                };
-                self.$common.openDialog(dialogOption);
-              }
-              //SearchList
-              else if (field.isOpenList) {
-                var dialogOption = {
-                  title: field.pageTitle,
-                  pane: self.$common.getParentPane(self),
-                  content: [{
-                    component: field.navToNewPageName,
-                    attrs: {
-                      searchConditionApi: field.actionForSearchLayout,
-                      searchDataApi: field.actionForSearch,
-                      apiParam: submitData,
-                      width: field.dialogWidth + 'px',
-                      height: field.dialogHeight + 'px'
-                    },
-                    on: {
-                      refreshParent() {
-                        self.getPage(1);
-                        self.$common.closeDialog(dialogOption.dialog);
-                      },
-                      closeDialog() {
-                        self.updateCurrentRow(field);
-                      }
-                    }
-                  }]
-                };
-                self.$common.openDialog(dialogOption);
-              }
-              //Tabs
-              else if (field.isOpenTabs) {
-                var dialogOption = {
-                  title: field.pageTitle,
-                  pane: self.$common.getParentPane(self),
-                  content: [{
-                    component: field.navToNewPageName,
-                    attrs: {
-                      searchConditionApi: field.actionForSearchLayout,
-                      searchDataApi: field.actionForSearch,
-                      apiParam: submitData,
-                      width: field.dialogWidth + 'px',
-                      height: field.dialogHeight + 'px'
-                    },
-                    on: {
-                    }
-                  }]
-                };
-                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.$forceUpdate();
-                  self.$refs.footer.$forceUpdate();
-                  self.updateCurrentRow(field, data);
-                })
-              }
-            }
-          }
-          //执行客户端脚本
-          else {
-            // let parm={submitData:submitData,field:field}
-            // self.$common.excuteFunStr.call(self.model.scripts, field.action,parm);
-            let title = field.pageTitle == undefined ? field.label : field.pageTitle;
-            submitData.actionType = field.actionType;
-            var fun = self.$common.getDataDrivenOpts().handler[action];
-            fun(submitData, title, self.model);
-            // var fun = self.model.scripts.formData[action];
-            // fun(submitData,field);
-          }
-        }
-
-        if (field.alert) {
-          self.$common.confirm(field.alertMsg, field.alertCaption, {
-            confirmButtonText: field.alertOKButtonText,
-            cancelButtonText: field.alertCancelButtonText,
-            //type: 'warning'
-            center: field.alertCenter
-          }).then(() => {
-            clickAcion();
-          }).catch(() => {
-          });
-        }
-        else {
-          clickAcion();
-        }
-      },
     },
     mounted() {