centaline-data-driven 1.2.78 → 1.2.81

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

@@ -1,135 +1,254 @@
 import Vue from 'vue';
 import Enum from './lib/Enum';
 import common from '../../../common';
-const CellLayout = function (source, callBack, apiParam, failCallBack) {
-  var init = function (source) {
-    var rtn = source;
-    var _styleObject = {};
-    if (typeof source.fontWeight !== 'undefined') {
-      _styleObject.fontWeight = source.fontWeight;
-    }
-    if (typeof source.fontSize !== 'undefined') {
-      _styleObject.fontSize = source.fontSize + "px";
-    }
-    if (typeof source.textColor !== 'undefined') {
-      _styleObject.color = source.textColor;
-    }
-    if (typeof source.textColor !== 'undefined') {
-      _styleObject.color = source.textColor;
-    }
-    if (typeof source.margin !== 'undefined') {
-      _styleObject.margin = source.margin.replace(/\s+/g, "px ") + 'px';
-    }
-    if (typeof source.marginTop !== 'undefined') {
-      _styleObject.marginTop = source.marginTop + "px";
-    }
-    if (typeof source.marginLeft !== 'undefined') {
-      _styleObject.marginLeft = source.marginLeft + "px";
-    }
-    if (typeof source.marginRight !== 'undefined') {
-      _styleObject.marginRight = source.marginRight + "px";
-    }
-    if (typeof source.marginBottom !== 'undefined') {
-      _styleObject.marginBottom = source.marginBottom + "px";
-    }
-    if (typeof source.padding !== 'undefined') {
-      _styleObject.padding = source.padding.replace(/\s+/g, "px ") + 'px';
-    }
-    if (typeof source.paddingTop !== 'undefined') {
-      _styleObject.paddingTop = source.paddingTop + "px";
-    }
-    if (typeof source.paddingLeft !== 'undefined') {
-      _styleObject.paddingLeft = source.paddingLeft + "px";
-    }
-    if (typeof source.paddingRight !== 'undefined') {
-      _styleObject.paddingRight = source.paddingRight + "px";
-    }
-    if (typeof source.paddingBottom !== 'undefined') {
-      _styleObject.paddingBottom = source.paddingBottom + "px";
-    }
-    if (typeof source.width !== 'undefined') {
-      if (source.width == "0") {
-        _styleObject.width = "100%";
-      }
-      else if (source.width == "-1") {
-
+const CellLayout = function (source) {
+  var rtn = {
+    get fields() {
+      return source.fields;
+    },
+    get is() {
+      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;
       }
-      else {
-        _styleObject.width = source.width + "px";
-        _styleObject.flex = "0 0 "+source.width + "px";
+      return source.value;
+    },
+    get routerKey() {
+      return source.routerKey;
+    },
+    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;
+    },
+    get forrowindex() {
+      return source.forrowindex;
+    },
+    get rightRouter() {
+      return source.rightRouter;
+    },
+    _styleObject: {},
+    get styleObject() {
+      var self = this;
+      if (typeof source.fontWeight !== 'undefined') {
+       self._styleObject.fontWeight = source.fontWeight;
       }
-    }
-    if (typeof source.height !== 'undefined') {
-      if (source.height == "0") {
-        _styleObject.height = "100%";
+      if (typeof source.fontSize !== 'undefined') {
+        self._styleObject.fontSize = source.fontSize + "px";
       }
-      else if (source.height == "-1") {
+      if (typeof source.textColor !== 'undefined') {
+        self._styleObject.color = source.textColor;
       }
-      else {
-        _styleObject.height = source.height + "px";
-      }
-    }
-    if (typeof source.background !== 'undefined') {
-      _styleObject.background = source.background;
-    }
-    if (typeof source.textAlign !== 'undefined') {
-      _styleObject.textAlign = source.textAlign;
-    }
-    if (typeof source.textDecoration !== 'undefined') {
-      if (source.textDecoration == "overline") {
-        _styleObject.textDecoration = "line-through";
+      if (typeof source.textColor !== 'undefined') {
+        self._styleObject.color = source.textColor;
       }
-      else {
-        _styleObject.textDecoration = source.textDecoration;
-      }
-    }
-    if (typeof source.borderRadius !== 'undefined') {
-      _styleObject.borderRadius = source.borderRadius + "px";
-    }
-    if (typeof source.borderWidth !== 'undefined') {
-      _styleObject.borderWidth = source.borderWidth + "px";
-    }
-    if (typeof source.borderColor !== 'undefined') {
-      _styleObject.borderColor = source.borderColor;
-    }
-    if (typeof source.valign !== 'undefined') {
-      _styleObject.justifyContent = source.valign;
-    }
-    if (typeof source.align !== 'undefined') {
-      if (source.valign == "bottom") {
-        _styleObject.alignItems = "end"
+      if (typeof source.margin !== 'undefined') {
+        self._styleObject.margin = source.margin.replace(/\s+/g, "px ") + 'px';
       }
-      else {
-        _styleObject.alignItems = source.align;
+      if (typeof source.marginTop !== 'undefined') {
+        self._styleObject.marginTop = source.marginTop + "px";
+      }
+      if (typeof source.marginLeft !== 'undefined') {
+        self._styleObject.marginLeft = source.marginLeft + "px";
+      }
+      if (typeof source.marginRight !== 'undefined') {
+        self._styleObject.marginRight = source.marginRight + "px";
       }
+      if (typeof source.marginBottom !== 'undefined') {
+        self._styleObject.marginBottom = source.marginBottom + "px";
+      }
+      if (typeof source.padding !== 'undefined') {
+        self._styleObject.padding = source.padding.replace(/\s+/g, "px ") + 'px';
+      }
+      if (typeof source.paddingTop !== 'undefined') {
+        self._styleObject.paddingTop = source.paddingTop + "px";
+      }
+      if (typeof source.paddingLeft !== 'undefined') {
+        self._styleObject.paddingLeft = source.paddingLeft + "px";
+      }
+      if (typeof source.paddingRight !== 'undefined') {
+        self._styleObject.paddingRight = source.paddingRight + "px";
+      }
+      if (typeof source.paddingBottom !== 'undefined') {
+        self._styleObject.paddingBottom = source.paddingBottom + "px";
+      }
+      if (typeof source.width !== 'undefined') {
+        if (source.width == "0") {
+          self._styleObject.width = "100%";
+        }
+        else if (source.width == "-1") {
+        }
+        else {
+          self._styleObject.width = source.width + "px";
+          self._styleObject.flex = "0 0 " + source.width + "px";
+        }
+      }
+      if (typeof source.height !== 'undefined') {
+        if (source.height == "0") {
+          self._styleObject.height = "100%";
+        }
+        else if (source.height == "-1") {
+         
+        }
+        else {
+          self._styleObject.height = source.height + "px";
+        }
+      }
+      if (typeof source.background !== 'undefined') {
+        self._styleObject.background = source.background;
+      }
+      if (typeof source.textAlign !== 'undefined') {
+        self._styleObject.textAlign = source.textAlign;
+      }
+      if (typeof source.textDecoration !== 'undefined') {
+        if (source.textDecoration == "overline") {
+          self._styleObject.textDecoration = "line-through";
+        }
+        else {
+          self._styleObject.textDecoration = source.textDecoration;
+        }
+      }
+      if (typeof source.borderRadius !== 'undefined') {
+        if (source.borderRadius.trim().indexOf(" ") != -1) {
+          self._styleObject.borderRadius = source.borderRadius.replace(/\s+/g, "px ") + 'px';
+        }
+        else {
+          self._styleObject.borderRadius = source.borderRadius + "px";
+        }
 
-    }
-    rtn.styleObject = _styleObject;
-    return rtn;
-  }
-  if (typeof source === 'string') {
-    apiParam = apiParam ? apiParam : {};
-    Vue.prototype.$api.postHandler(common.globalUri(), { "action": source, "para": apiParam }).then(
-      function (response) {
-        if (response.rtnCode === Enum.ReturnCode.Successful) {
-          var data = response.content;
-          var rtn = init(data);
-          if (callBack) {
-            callBack(rtn);
+      }
+      if (typeof source.borderWidth !== 'undefined' && typeof source.borderColor !== 'undefined') {
+        self._styleObject.border = source.borderWidth + "px" + " solid " + source.borderColor;
+      }
+
+      if (typeof source.valign !== 'undefined') {
+        self._styleObject.justifyContent = source.valign;
+      }
+      if (typeof source.align !== 'undefined') {
+        if (source.align == "bottom") {
+          self._styleObject.alignItems = "end"
+        }
+        else {
+          self._styleObject.alignItems = source.align;
+        }
+
+      }
+      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 {
-          if (failCallBack) {
-            failCallBack();
+          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 = router.getSearchPara();
+      var searchValue1 = router.flagAddRowAfterAction ? rtnData.content : rtn.listData[rtn.selectIndex][self.primaryKey];
+      if (self.primaryKey) {
+        searchFields.fields.push({
+          fieldName1: self.primaryFieldMappingDBName ? self.primaryFieldMappingDBName : self.primaryKey,
+          groupName: self.primaryKey,
+          operation: Enum.SearchOperation.等于,
+          searchDataType: Enum.SearchDataType.Text,
+          searchValue1: searchValue1,
+        });
+      }
+      Vue.prototype.$api.postHandler(common.globalUri(), {
+        action: rtn.apiRouter.action,
+        para: {
+          searchFields: searchFields,
+          pageAttribute: { pageIndex: 1 },
+          flagSearch: true
+        }
+      })
+        .then(function (response) {
+          if (response.rtnCode === Enum.ReturnCode.Successful) {
+            if (response.content.rows.length > 0) {
+              if (router.flagAddRowAfterAction) {
+                rtn.doNew(response.content.rows);
+              }
+              else {
+                rtn.doUpdate(response.content.rows, searchValue1);
+              }
+            }
           }
+        })
+        .catch((error) => {
+        });
+    },
+    doAction(response, field) {
+      if (response.responseData) {
+        response = response.responseData;
+      }
+      if (field.flagFreshCurrentRow || field.flagAddRowAfterAction) {
+        rtn.getCurrentRowApiData(response, field);
+      }
+      else {
+        switch (response.notification) {
+          case Enum.ActionType.Delete://删除
+          case Enum.ActionType.CloseTabThenDelete://删除
+
+            break;
+          case Enum.ActionType.New://新增
+          case Enum.ActionType.CloseTabThenNew://新增  
+
+            break;
+          case Enum.ActionType.Update://修改
+          case Enum.ActionType.CloseTabThenUpdate://修改
+           
+            break;
+          default:
+            break;
         }
       }
-    );
-  }
-  else {
-    var data = source;
-    return init(data);
-  }
+    },
+  };
+    return rtn;
 };
 
 export default CellLayout;

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

@@ -392,10 +392,17 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         },
         //新增或替换表格数据
         insertOrUpdateRow(tableId,row) {    
-            let listData = this.excuteListData.find((v) => {
-                return v.id === tableId;
-            });
-            listData.insertOrUpdateRow(row);
+          let listData = this.excuteListData.find((v) => {
+              return v.id === tableId;
+          });
+          listData.insertOrUpdateRow(row);
+        },
+        //删除表格数据
+        deleteRow(tableId,row) {    
+          let listData = this.excuteListData.find((v) => {
+              return v.id === tableId;
+          });
+          listData.delRow(row);
         },
         //清空表格数据
         clear(tableId) {

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

@@ -465,19 +465,87 @@ const FormList = function (source, master) {
     },
     insertOrUpdateRow(row) {
       if(row){
-        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);
+        if(rtn.primaryKeys && rtn.primaryKeys.length>0){
+          let iRow = this.initRow(row);
+          let flagAdd=true;
+          rtn.rows.forEach((r,i) => {
+            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)
+        }
+      }
+    },
+    delRow(row) {
+      if(row && rtn.primaryKeys && rtn.primaryKeys.length>0){
+        let iRow = this.initRow(row);
+        rtn.rows.forEach((r,i) => {
+          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/RichText.js

@@ -16,6 +16,9 @@ const RichText = function (source, router) {
     get action() {
       return router &&router.action ? router.action : "";//上传完整地址
     },
+    set action(v) {
+      source.action = v;
+    },
   };
   rtn = base.copy(Base(source), rtn);
   rtn = base.copy(rtn, valid.Init(rtn));

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

@@ -204,28 +204,28 @@ const SearchScreen = function (source, callBack, screenPara) {
         }
         return result;
       },
-       // 1 是字符串 2是数字
-       getDataType(searchDataType)
-       {
-         let dataType=1;
-         switch(searchDataType)
-         {
-           case 2:
-           case 6:
-            dataType=2;
-             break;
-            case 1:
-            case 3:
-            case 4:
-            case 5:
-               dataType=1;
-                break;
-           default:
-                dataType=1;
-               break; 
-         }
-         return dataType;
-       },
+      // 1 是字符串 2是数字
+      getDataType(searchDataType)
+      {
+        let dataType=1;
+        switch(searchDataType)
+        {
+          case 2:
+          case 6:
+          dataType=2;
+            break;
+          case 1:
+          case 3:
+          case 4:
+          case 5:
+              dataType=1;
+              break;
+          default:
+              dataType=1;
+              break; 
+        }
+        return dataType;
+      },
       initScreen(screens) {
         var rtnscreens = [];