centaline-data-driven 1.2.80 → 1.2.81

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

@@ -133,9 +133,9 @@
           </tbody>
         </table>
       </div>
-      <div v-else>
-        <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 class="ct-Layout" v-else>
+        <div v-for="(row,rowindex) in model.layoutData" :key="rowindex">
+          <ct-layout :ref="'layoutrows.'+rowindex" :vmodel="row"  :rowindex="rowindex" @click="rolRouterCellClickHandler"></ct-layout>
         </div>
       </div>
     </div>
@@ -879,6 +879,193 @@
           clickAcion();
         }
       },
+      rolRouterCellClickHandler(routerKey, rowindex, forname, forrowindex) {
+        var self = this;
+        var submitData = {};
+        var rowData = self.model.listData[rowindex];
+        var actionRouter = self.model.actionRouter;
+        let field = actionRouter.find(b => {
+          return b.id === routerKey;
+        });
+        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.routerCellClickHandler(field, submitData, action, rowindex, forname, forrowindex);
+      },
+      routerCellClickHandler(field, submitData, action, rowindex, forname, forrowindex) {
+        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.$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 {
+                field.doAction(submitData, (data) => {
+                  self.model.doAction(data, field);
+                  if (field.actionType === 19) {
+                    self.callTelClick(self.$refs['layout' + rowindex].$refs.layoutchildren, data, forname, forrowindex)
+                  }
+                })
+              }
+            }
+          }
+          //执行客户端脚本
+          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();
+        }
+      },
+      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;
+            }
+          }
+        }
+      },
       selectAll($ev) {
         this.model.listData.forEach((ro) => {
           if (!this.model.rightMulti || ro[this.model.rightMulti] == 1) {
@@ -1211,4 +1398,7 @@
   .el-popover1 {
     min-width: inherit !important;
   }
+  .ct-Layout {
+    font-size: 12px;
+  }
 </style>

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

@@ -10,6 +10,13 @@ const CellLayout = function (source) {
       return source.is;
     },
     get value() {
+      if (source.scale) {
+        var reg = /\d+(\.\d+)?/;
+        if (reg.test(source.value)) {
+          return parseFloat(source.value).toFixed(source.scale); ;
+        }
+        return source.value;
+      }
       return source.value;
     },
     get routerKey() {
@@ -18,6 +25,15 @@ const CellLayout = function (source) {
     get orientation() {
       return source.orientation;
     },
+    get placeholder() {
+      return source.placeholder;
+    },
+    get errorPlaceholder() {
+      return source.errorPlaceholder;
+    },
+    get errorPlaceholder() {
+      return source.errorPlaceholder;
+    },
     get forname() {
       return source.for;
     },
@@ -77,7 +93,6 @@ const CellLayout = function (source) {
           self._styleObject.width = "100%";
         }
         else if (source.width == "-1") {
-
         }
         else {
           self._styleObject.width = source.width + "px";
@@ -89,6 +104,7 @@ const CellLayout = function (source) {
           self._styleObject.height = "100%";
         }
         else if (source.height == "-1") {
+         
         }
         else {
           self._styleObject.height = source.height + "px";
@@ -133,11 +149,45 @@ const CellLayout = function (source) {
         }
 
       }
+      if (typeof source.shadowWidth !== 'undefined' && typeof source.shadowColor !== 'shadowColor') {
+        if (source.shadowWidth.trim().indexOf(" ") != -1) {
+          self._styleObject.boxShadow = source.shadowWidth.replace(/\s+/g, "px ") + 'px ' + source.shadowColor;
+        }
+        else {
+          self._styleObject.boxShadow = source.shadowWidth + 'px ' + source.shadowWidth + 'px ' + source.shadowColor;
+        }
+      }
+      if (typeof source.gradientColor !== 'undefined') {
+        if (typeof source.gradientDirection !== 'undefined') {
+          if (source.gradientDirection == 'vertical') {
+            self._styleObject.backgroundImage = 'linear-gradient(to right,' + source.gradientColor.replace(/-/g, ",") + ')';
+          }
+          else {
+            self._styleObject.backgroundImage = 'linear-gradient(' + source.gradientColor.replace(/-/g, ",") + ')';
+          }
+         
+        }
+        else {
+          self._styleObject.backgroundImage = 'linear-gradient(' + source.gradientColor.replace(/-/g, ",") + ')';
+        }
+      }
+      if (typeof source.visibility !== 'undefined') {
+        self._styleObject.visibility = source.visibility;
+      }
+      if (typeof source.weight !== 'undefined') {
+        self._styleObject.flex = source.weight;
+      }
+      if (typeof source.maxLines !== 'undefined') {
+        self._styleObject.WebkitLineClamp = source.maxLines;
+        self._styleObject.WebkitBoxOrient = "vertical";
+        self._styleObject.display = "-webkit-box";
+        self._styleObject.overflow = "hidden";
+      }
       return self._styleObject;
     },
     getCurrentRowApiData(rtnData, router) {
       var self = this;
-      var searchFields = self.apiRouter.getSearchPara();
+      var searchFields = router.getSearchPara();
       var searchValue1 = router.flagAddRowAfterAction ? rtnData.content : rtn.listData[rtn.selectIndex][self.primaryKey];
       if (self.primaryKey) {
         searchFields.fields.push({
@@ -190,7 +240,7 @@ const CellLayout = function (source) {
             break;
           case Enum.ActionType.Update://修改
           case Enum.ActionType.CloseTabThenUpdate://修改
-
+           
             break;
           default:
             break;

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

@@ -466,38 +466,85 @@ const FormList = function (source, master) {
     insertOrUpdateRow(row) {
       if(row){
         if(rtn.primaryKeys && rtn.primaryKeys.length>0){
+          let iRow = this.initRow(row);
+          let flagAdd=true;
           rtn.rows.forEach((r,i) => {
-            console.log(r)
-  
+            let countKey=0;
+            rtn.primaryKeys.forEach((k) => {
+              let fieldOld=r.field.find((v) => {
+                return v.id === k;
+              });
+              let fieldNew=iRow.field.find((v) => {
+                return v.id === k;
+              });
+              if(fieldOld.code1===fieldNew.code1){
+                countKey++;
+              }
+            })
+            if(countKey===rtn.primaryKeys.length){
+              flagAdd=false;
+              if(iRow.deleted){
+                rtn.tableData.forEach((d,index) => {
+                  if(d.$sourceIndex===r.$sourceIndex){
+                    rtn.tableData.splice(index, 1);
+                  }
+                });                
+                if (r.isNewFlag) {
+                  rtn.rows.splice(i, 1);
+                  source.rows.splice(i, 1);
+                }
+                else {
+                  rtn.rows[i].deleted = true;
+                }
+              }
+              else{
+                rtn.rows.splice(i, 1,iRow);
+              }
+            }
           });
+          if(flagAdd){         
+            let rows=[];
+            rows.push(row);
+            rtn.insertRow(rows)
+          }
         }
         else{
           let rows=[];
           rows.push(row);
           rtn.insertRow(rows)
         }
-        // source.rows.push(r);
-        // let iRow = this.initRow(r);
-        // iRow.isNewFlag = true;
-        // rtn._rows.push(iRow);
-        // Vue.set(r, 'edit', iRow.edit);
-        // Vue.set(r, 'delete', iRow.delete);
-        // r.$sourceIndex = rtn._rows.length - 1;
-
-        // let rowData = rtn.rowsItemToTableData(iRow)
-        // rowData.$sourceIndex = rtn._rows.length - 1;      
-        // rowData.edit = iRow.edit;
-        // rowData.delete = iRow.delete;
-        // rtn._tableData.push(rowData);
       }
     },
     delRow(row) {
-      debugger
       if(row && rtn.primaryKeys && rtn.primaryKeys.length>0){
+        let iRow = this.initRow(row);
         rtn.rows.forEach((r,i) => {
-          debugger
-          console.log(r)
-
+          let countKey=0;
+          rtn.primaryKeys.forEach((k) => {
+            let fieldOld=r.field.find((v) => {
+              return v.id === k;
+            });
+            let fieldNew=iRow.field.find((v) => {
+              return v.id === k;
+            });
+            if(fieldOld.code1===fieldNew.code1){
+              countKey++;
+            }
+          })
+          if(countKey===rtn.primaryKeys.length){
+            rtn.tableData.forEach((d,index) => {
+              if(d.$sourceIndex===r.$sourceIndex){
+                rtn.tableData.splice(index, 1);
+              }
+            });                
+            if (r.isNewFlag) {
+              rtn.rows.splice(i, 1);
+              source.rows.splice(i, 1);
+            }
+            else {
+              rtn.rows[i].deleted = true;
+            }
+          }
         });
       }
     },

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

@@ -236,6 +236,24 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       set listData(v) {
         source.content.rows = v;
       },
+      _LayoutData: null,
+      get layoutData() {
+        var cellLayout = source.content.cellLayout;
+        if (rtn._LayoutData !== null) {
+          return rtn._LayoutData;
+        }
+        else {
+          rtn._LayoutData = [];
+          if (cellLayout!='') {
+            source.content.rows.forEach((data) => {
+              var Layout = rtn.xmlToJsonCell(data,cellLayout);
+              rtn._LayoutData.push(Layout);
+            });
+          }
+          return rtn._LayoutData;
+        }
+        
+      },
       get isMulti() {//是否多选
         if (this.isMergeTitle) {
           return false;//合并表头暂不支持多选
@@ -572,16 +590,17 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             console.error(error);
           });
       },
-      getCurrentRowApiData(callback,rtnData,router) {
+      getCurrentRowApiData(callback, rtnData, router) {
         var self = this;
         var searchFields = this.searchModel ? this.searchModel.searchData : { fields: [] };
+        var searchValue1 = router.flagAddRowAfterAction ? rtnData.responseData.content : rtn.listData[rtn.selectIndex][self.primaryKey];
         if (self.primaryKey) {
           searchFields.fields.push({
             fieldName1: self.primaryFieldMappingDBName ? self.primaryFieldMappingDBName : self.primaryKey,
             groupName: self.primaryKey,
             operation: 2,
             searchDataType: 3,
-            searchValue1: router.flagAddRowAfterAction? rtnData.responseData.content: rtn.listData[rtn.selectIndex][self.primaryKey],
+            searchValue1: searchValue1,
           });
         }
         Vue.prototype.$api.postHandler(common.globalUri(), {
@@ -605,12 +624,17 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                   source.page.rows = source.page.rows + response.content.rows.length;
                   rtn.$vue.calculatingRowHeight()
                 }
-                else{
-                  response.content.rows.forEach((row) => {
-                    for (var vkey in row) {
-                      rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
-                    }
-                  });
+                else {
+                  if (rtn.cellLayout != "") {
+                    rtn.doUpdateCell(response.content, searchValue1);
+                  }
+                  else {
+                    response.content.rows.forEach((row) => {
+                      for (var vkey in row) {
+                        rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
+                      }
+                    });
+                  }
                 }
               }
 
@@ -778,6 +802,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             break;
           case Enum.ActionType.Update://修改
           case Enum.ActionType.CloseTabThenUpdate://修改
+            debugger
             response.content.forEach((row) => {
               for (var vkey in row) {
                 rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
@@ -868,12 +893,194 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       get sideBarWidth() {
         return source.content.sideBarWidth || 360;
       },
+      getValue(data, val) {
+        return val.split('.').reduce((data, currentVal) => {
+          var rtn = data[currentVal];
+          if (typeof rtn !== 'undefined') {
+            rtn = rtn.toString().replace(/"/g, "'");
+            rtn = rtn.replace(/>/g, ">");
+            rtn = rtn.replace(/</g, "&lt;");
+          }
+          else {
+            rtn = "";
+          }
+          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 = rtn.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-layout";
+        }
+        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-layoutchildren";
+              }
+              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.listData[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(rtn.xmlToJson(item));
+            }
+          }
+        }
+        return obj;
+      },
+      xmlToJsonCell(data,cellLayout) {
+        var str = '';
+        var cellLayoutNew = cellLayout;
+        if (cellLayoutNew.indexOf("for=") != -1) {
+          var cellxmlDOM = rtn.loadXML(cellLayoutNew);
+          var listxml = rtn.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 = rtn.xmlToString(listxml)
+
+                var celllistNew = rtn.loadXML(celllist);
+                var newAtt = celllistNew.createAttribute("forrowindex");
+                newAtt.nodeValue = "{{forrowindex}}";
+                var x = celllistNew.getElementsByTagName("Layout");
+                x[0].setAttributeNode(newAtt);
+                var cellstr = rtn.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 rtn.getValue(list[i], args[1])
+                    });
+                  }
+                }
+                cellLayoutNew = cellLayoutNew.replace(/\n/g, '').trim() //去除换行 和头尾空格
+                let replacer = function (match, p1, p2, p3, offset) {
+                  return p1 + p3
+                }
+                cellLayoutNew = cellLayoutNew.replace(/(>)(\s*)(<)/g, replacer) //把 > 和 < 之间的空格去除
+                cellLayoutNew = cellLayoutNew.replace(/ +/g, ' ')
+                cellLayoutNew = cellLayoutNew.replace(celllist, liststr)
+              }
+            }
+          }
+        }
+        if (typeof data !== 'undefined') {
+          str = cellLayoutNew.replace(/\{\{(.+?)\}\}/g, (...args) => {
+            return rtn.getValue(data, args[1])
+          });
+        }
+        var xmlDOM = rtn.loadXML(str);
+        return rtn.xmlToJson(xmlDOM);
+      },
+      doUpdateCell(data, searchValue1) {
+        var self = this;
+        var rowindex = 0;
+        rtn.listData.forEach((v) => {
+          if (v[rtn.primaryKey] == searchValue1) {
+            return
+          }
+          rowindex++
+        });
+        rtn.layoutData[rowindex] = rtn.xmlToJsonCell(data.rows[0], data.cellLayout);
+
+      },
     };
     if (rtn.template) {
       var tempLoader = template.loader(rtn.template).default;
       tempLoader.init(rtn);
     }
     rtn.dataDictionary = rtn.listData;
+
     return rtn;
   };
   if (typeof data === 'string') {