centaline-data-driven 1.2.78 → 1.2.81

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') {

package/src/centaline/loader/src/ctl/lib/LibFunction.js

@@ -315,9 +315,12 @@ const LibFunction = {
         item.is = 'ct-text';
         break;
       case Enum.ControlType.RichText://富文本框
-        var router = source.actionRouters.find((v1) => {
-          return v1.key === field.fieldName1;
-        });
+        var router ={};
+        if(source.actionRouters){
+          router = source.actionRouters.find((v1) => {
+            return v1.key === field.fieldName1;
+          });
+        }
         item = RichText(field, router);
         item.is = 'ct-rich-text';
         break;

package/src/main.js

@@ -12,10 +12,10 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.13:7070/v1/form/router",
+  // baseUrl: "http://10.88.22.13:7070/v1/form/router",
   // baseUrl: "http://10.88.23.22:9999/v1/form/router",
-  // baseUrl: "http://10.88.22.69:8080/", 
-  // flagRouterSelf: true,
+  baseUrl: "http://10.88.22.69:8080/", 
+  flagRouterSelf: true,
   zindex: 999,
   showRequestErrorMessage: true,
   handler: {
@@ -23,6 +23,9 @@ Vue.use(centaline, {
     openTab: function (action) {
       alert("打开tab页:" + action)
     },
+    openTabSearch: function (field, submitData) {
+      alert("打开tab页Search:" + field.action)
+    },
     openDetail: function (action) {
       alert("打开tab页:" + action)
     },