centaline-data-driven 1.5.31 → 1.5.32

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

@@ -5,7 +5,7 @@ import Router from './Router';
 import Enum from './lib/Enum';
 import Vue from 'vue';
 
-const Repeat = function (source, master, formobj) {
+const Repeat = function (source, master, formobj) {
   var rtn = {
     form: null,
     refField: Object,
@@ -25,9 +25,9 @@ const Repeat = function (source, master, formobj) {
     get master() {
       return master;
     },
-    get title() {
+    get title() {
       return master.controlLabel || '';
-    },
+    },
     get labelClass() {
       if (master.required) {
         return 'requiredLabel'
@@ -51,25 +51,25 @@ const Repeat = function (source, master, formobj) {
     },
     get primaryKeys() {
       return source.primaryKeys;
-    },
-    get max() {
+    },
+    get max() {
       if (typeof master.maxValue1 !== "undefined") {
         return master.maxValue1;
       }
       return 999999;
     },
-    get min() {
+    get min() {
       if (typeof master.minValue1 !== "undefined") {
         return master.minValue1;
       }
       return 0;
-    },
+    },
     get flagHideSaveLine() {
       return master.flagHideSaveLine;
-    },
+    },
     get lock() {
       return master.locked;
-    },
+    },
     get createText() {
       let t = "新增";
       if (rtn.disabled) {
@@ -193,14 +193,14 @@ const Repeat = function (source, master, formobj) {
         value.onChanged = value.onChange ? value.onChange : source.rows[0].columns[rowIndex].onChanged;//事件使用第一条的
         value.onBlur = value.onBlur ? value.onBlur : source.rows[0].columns[rowIndex].onBlur;//事件使用第一条的
         rowIndex++;
-        let showLabel = true;
-        if (typeof master.spanCols !== "undefined") {
-          source.colSpan = master.spanCols;
-        }
-        else {
-          source.colSpan = formobj.colSpan;
-        }
-        let item = LibFunction.GetControl(value, source, showLabel, false);
+        let showLabel = true;
+        if (typeof master.spanCols !== "undefined") {
+          source.colSpan = master.spanCols;
+        }
+        else {
+          source.colSpan = formobj.colSpan;
+        }
+        let item = LibFunction.GetControl(value, source, showLabel, false);
         if (item instanceof Object) {
           item.form = rtn.form;
           row.field.push(item);
@@ -253,7 +253,7 @@ const Repeat = function (source, master, formobj) {
       Vue.prototype.$common.confirm("确定删除？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-      }).then(() => {
+      }).then(() => {
         if (rtn.rows[index].isNewFlag) {
           rtn.rows.splice(index, 1);
           source.rows.splice(index, 1);

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

@@ -5,14 +5,14 @@ import Router from './Router';
 import valid from '../../../validate/index';
 import common from '../../../common';
 import Axios from 'axios';
-import Vue from 'vue';
-import formData from '../../../formData';
-
+import Vue from 'vue';
+import formData from '../../../formData';
+
 const SearchScreen = function (source, callBack, screenPara) {
   var init = function (source) {
     var rtn = {
-      $vue: null,
-      formData: formData,
+      $vue: null,
+      formData: formData,
       enableRelationFields: true,
       get source() {
         return source;
@@ -31,7 +31,7 @@ const SearchScreen = function (source, callBack, screenPara) {
       },
       set title(v) {
         source.content.title = v;
-      },
+      },
       get onload() {
         return source.content.onload;
       },
@@ -59,50 +59,50 @@ const SearchScreen = function (source, callBack, screenPara) {
               button.is = "ct-btn";
               rtn._actionRouters.push(button);
             });
-          }
-          else if (source.content.actionRouters) {
-            source.content.actionRouters.forEach((v) => {
+          }
+          else if (source.content.actionRouters) {
+            source.content.actionRouters.forEach((v) => {
               v.actionType = 2;
-              var button = Router(v);
+              var button = Router(v);
               button.is = "ct-btn";
               rtn._actionRouters.push(button);
-            });
+            });
           }
           return rtn._actionRouters;
         }
-      },
-      getSearchData(searchModel, field, LabelName) {
-        var newSearchModel = common.deepClone(searchModel.searchData ? searchModel.searchData : {});
-        if (field) {
-          field.getSearchPara().fields.forEach((f) => {
+      },
+      getSearchData(searchModel, field, LabelName) {
+        var newSearchModel = common.deepClone(searchModel.searchData ? searchModel.searchData : {});
+        if (field) {
+          field.getSearchPara().fields.forEach((f) => {
             newSearchModel.fields.push(f);
-          });
-        }
-        if (LabelName) {
+          });
+        }
+        if (LabelName) {
           newSearchModel.fields.push({
             fieldName1: 'LabelName',
             groupName: 'LabelName',
             operation: Enum.SearchOperation.等于,
             searchDataType: Enum.SearchDataType.Text,
             searchValue1: LabelName,
-          });
-        }
+          });
+        }
         return newSearchModel;
-      },
+      },
       getFormObj(LabelName) {
         var rtnFormObj = {};
         rtn.screen.forEach((f) => {
-          if (typeof f.id !== 'undefined' && f.value!='') {
+          if (typeof f.id !== 'undefined' && f.value!='') {
             Object.assign(rtnFormObj, f.getFormObj());
           }
-        });
-        if (LabelName) {
-          Object.assign(rtnFormObj, { LabelName: LabelName});
+        });
+        if (LabelName) {
+          Object.assign(rtnFormObj, { LabelName: LabelName});
         }
         return rtnFormObj;
-      },
+      },
       _scripts: null,
-      get scripts() {
+      get scripts() {
         if (rtn._scripts !== null) {
           return rtn._scripts;
         }
@@ -110,13 +110,13 @@ const SearchScreen = function (source, callBack, screenPara) {
           if (typeof source.scripts !== 'undefined') {
             rtn._scripts = base.common.eval(source.scripts);
             return rtn._scripts;
-          }
-          else {
+          }
+          else {
             rtn._scripts = base.common.eval("");
-            return rtn._scripts;
+            return rtn._scripts;
           }
         }
-      },
+      },
 
       _screen: null,
       _btnScreen: null,
@@ -166,16 +166,16 @@ const SearchScreen = function (source, callBack, screenPara) {
         });
         this._screen = rtnscreens;
         return rtnscreens;
-      },
+      },
       _screenDic: null,//字典，方便取值
-      get screenDic() {
-        rtn._screenDic = {};
-        rtn.screen.forEach((f) => {
+      get screenDic() {
+        rtn._screenDic = {};
+        rtn.screen.forEach((f) => {
           rtn._screenDic[f.id] = f;
-        });
-        rtn.highScreen.forEach((f) => {
+        });
+        rtn.highScreen.forEach((f) => {
           rtn._screenDic[f.id] = f;
-        });
+        });
         return rtn._screenDic;
       },
       //"搜索"到"高级搜索"的中间的控件
@@ -298,7 +298,7 @@ const SearchScreen = function (source, callBack, screenPara) {
           }
         });
         return rtn;
-      },
+      },
       get searchDataOfShow() {
         let that = this;
         var rtn = {
@@ -519,19 +519,19 @@ const SearchScreen = function (source, callBack, screenPara) {
             }
           }
         }
-      },
+      },
       //验证必填关联组件
       validMrf(item) {
        
-      },
-      hatchHandle(itemId, attrName, attrValue, item) {
+      },
+      hatchHandle(itemId, attrName, attrValue, item) {
         switch (attrName) {
-          case 'code1':
-            if (item.type === Enum.ControlType.CheckBoxList) {
+          case 'code1':
+            if (item.type === Enum.ControlType.CheckBoxList) {
               item._checkedItemArr = item.getCheckedItemArr();
               item.checkedItemArr = item.getCheckedItemArr();
-            }
-            else if (item.type === Enum.ControlType.SearchListBox) {
+            }
+            else if (item.type === Enum.ControlType.SearchListBox) {
               item.enableRelationFields = rtn.enableRelationFields;
             }
             rtn.validMrf(item);//验证必填关联组件
@@ -539,7 +539,7 @@ const SearchScreen = function (source, callBack, screenPara) {
             break;
           default:
             break;
-        }
+        }
       },
     };
     return rtn;

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

@@ -6,7 +6,7 @@ import common from '../../../common';
 import Vue from 'vue';
 const Sos = function (source, moreActionRouter) {
   var rtn = {
-    options: [{ code: source.code1, name: source.name1 }],
+    options: [{ code: source.code1, name: source.name1 }],
     enableRelationFields: true,
     get text() {
       if (source.isList && source.name1 && rtn.attrs.placeholder && rtn.displayLabelAfterSelected) {
@@ -31,7 +31,7 @@ const Sos = function (source, moreActionRouter) {
     },
     get parentName() {
       return source.parentField;
-    },
+    },
     reset() {
       this.value = this.defaultValue;
       this.text = this.defaultText;

package/src/main.js

@@ -14,7 +14,7 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.66:17070/max-uplink-api/",
+  baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:9999/service-api/v1/form/router",
@@ -37,6 +37,9 @@ Vue.use(centaline, {
     openTabSearch: function (field, submitData) {
       alert("打开tab页Search:" + field.action)
     },
+    openTabRouter: function (action) {
+      alert("打开tab页:" + action)
+    },
     openDetail: function (action) {
       alert("打开tab页:" + action)
     },
@@ -53,9 +56,9 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '11c12506-253c-4995-83fb-84cf51cb23a0',
+        oldToken: 'f9baa4f5-069e-4bae-8438-a89365fb067e',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOwjAQBP_iOif57LPvTBfbScMjIpI4UqgQSSQQ4u-AgI6eKbaYZvamlq1XO5Wl1pRaC6kxDiizg7plgZhEdDRsKUoXPsCP-dIhUmD0DdSBE5AnC4JJIJFP1ObGpphVpcrlpHboJaBhjVSp-bC-hSbtX2Jbynlfrv84d1znZ3YaLE5lFBCxBYgDQRgnB8y9k2EoaKSo-wMAAP__.gcCSu4kiRSWrgW2qLLmdLTf2GjW1LZTym26ZayFdf70"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgjAURf-lMy9p-x7tKxttYfEjSFsgwckIJBrjv6tRN3fPcIeznHsT655FIyK3kkKPEDpdA0VbQ9tbBh-YpdcWyfPgPsCP-TIoRc4q00HrbAAyhMAqMAQygfrYYfBRVGK6nESjDDulsSZXiSVtbyHRqpfY1-l8mK7_OHfclmc2jSMpqQ1kxBkIZ4JckgPUxaXMXEptxf0BAAD__w.yb_P0UjgJEHUMipFMJIHEge9cR5lopQH8Wvz1qvQQos"}',
 
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201806071109550C867184E8BCA56EC3","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',