centaline-data-driven 1.5.67 → 1.5.69

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

@@ -691,7 +691,7 @@ export default {
             break;
           } 
           else {
-            topHeigth = topHeigth + this.model.listData[index].$heigth;
+            topHeigth = topHeigth + this.model.listData[index].$heigth||31;
           }
         }
         this.firstRow = index - 1;
@@ -852,6 +852,7 @@ export default {
           }
         }
         this.currentRow = this.$refs["rows." + index][0] || null;
+        this.$emit("rowClickHandle");
       }
     },
     rowMergedColorChange(oldIndex,newIndex) {
@@ -993,20 +994,33 @@ export default {
       let self = this;
       let submitData = {};
       let action = field.action;
+      let jsonData = [];
 
       var tempListData = self.model.getSelectRowData(field);
-      if (tempListData != null) {
+      if (tempListData != null) {        
         field.submitListField.forEach((k) => {
           if (field.isMulti) {
             submitData[k] = [];
             for (var ri = 0; ri < tempListData.length; ri++) {
-              submitData[k].push(tempListData[ri][k]);
+              submitData[k].push(self.$common.getDataOfUpperLower(tempListData[ri], k));
             }
-          } else {
+          } 
+          else {
             submitData[k] = tempListData[0][k];
           }
         });
 
+        tempListData.forEach((row)  => {
+          if (field.isMulti) {
+            let jsonModel={};
+            field.submitListField.forEach((k) => {
+              jsonModel[self.$common.initialsToLowerCase(k)]=self.$common.getDataOfUpperLower(row, k);
+            });
+            jsonData.push(jsonModel);
+          }
+        });
+        if(jsonData.length>0)submitData['jsonData']=jsonData;
+
         if (field.isSingle && tempListData.length > 0 && field.actionField) {
           action = tempListData[0][field.actionField];
         }
@@ -1206,7 +1220,54 @@ export default {
           else if (field.isExport || field.flagAsync) {
             if (field.flagAsync) {
               field.doAction(submitData, (res) => {
-                if (res.content && res.content.action) {
+                if(res.rtnCode && res.rtnCode===202 && res.rtnMsg){
+                  self.$common.confirm(res.rtnMsg, '提示', {confirmButtonText: '确定',cancelButtonText: '取消',type: 'warning'}).then(() => {
+                    submitData.flagHaveAlert=1;
+                    field.doAction(submitData, (res) => {
+                      if (res.content && res.content.action) {
+                        var dialogOption = {
+                          title: field.pageTitle || field.label,
+                          content: [{
+                            component: 'ct-progress',
+                            attrs: {
+                              progressAction: res.content.action,
+                              progressKey: res.content.key,
+                              progressType: field.isExport ? 'export' : 'import',
+                              width: '350px',
+                              height: '165px'
+                            },
+                            on: {
+                              finished(data) {
+                                self.$common.closeDialog(dialogOption.dialog);
+                                if (data.rtnMsg) {
+                                  self.$message({
+                                    message: data.rtnMsg,
+                                    type: 'success',
+                                    showClose:true,
+                                  });
+                                }
+                                if(!field.isExport){
+                                  self.getPage(1);
+                                }                          
+                              },
+                              error(data) {
+                                self.$common.closeDialog(dialogOption.dialog);
+                                self.$message({
+                                  message: data.rtnMsg,
+                                  type: 'warning',
+                                  showClose:true,
+                                });
+                              }
+                            }
+                          }]
+                        };
+                        self.$common.openDialog(dialogOption);
+                      }
+                    });
+                  })
+                  .catch(() => { });
+                }
+                else if (res.content && res.content.action) {
                   var dialogOption = {
                     title: field.pageTitle || field.label,
                     content: [{
@@ -1262,23 +1323,50 @@ export default {
                 }
               }
               else {
-                field.doAction(submitData, (data) => {
-                  if (data.content) {
-                    if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
-                      if(data.action.indexOf(".zip") > -1){
-                        window.location.href = encodeURI(data.action);
-                      }
-                      else{
-                        if (data.content.indexOf("?") > -1) {
-                          self.downloadUrl = data.content + "&" + Math.random();
+                field.doBlobAction(submitData, (data,headers) => {
+                  if(data.type=="application/json"){
+                    const reader = new FileReader();
+                    reader.readAsText(data, 'utf-8');
+                    reader.onload=function(){
+                      data = JSON.parse(reader.result);
+                      if (data.content) {
+                        if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
+                          if(data.content.indexOf(".zip") > -1){
+                            window.location.href = encodeURI(data.action);
+                          }
+                          else{
+                            if (data.content.indexOf("?") > -1) {
+                              self.downloadUrl = data.content + "&" + Math.random();
+                            }
+                            else {
+                              self.downloadUrl = data.content + "?" + Math.random();
+                            }
+                          }
                         }
                         else {
-                          self.downloadUrl = data.content + "?" + Math.random();
                         }
                       }
+                    };
+                  }
+                  else{
+                    if(!headers['content-disposition']){
+                      self.$message({
+                        message: '返回结果headers必须包含Access-Control-Expose-Headers和Content-Disposition！',
+                        type: 'error',
+                        showClose:true,
+                      });
+                      return false;
                     }
-                    else {
-                    }
+
+                    let blob = new Blob([data],{type:"application/octet-stream;"})
+                    const url = window.URL.createObjectURL(blob);
+                    const link = document.createElement('a');
+                    let fileName=decodeURIComponent(escape(headers['content-disposition'].split('filename=')[1]));                    
+                    link.href = url;
+                    link.setAttribute('download',fileName);
+                    document.body.appendChild(link);
+                    link.click();
+                    document.body.removeChild(link);
                   }
                 });
               }

package/src/centaline/dynamicTree/src/dynamicTreeList.vue

@@ -88,7 +88,12 @@ export default {
         });
       }
     },
-
+  setsearchtreeHeight(){
+     if(self.$refs.tree_left.$el)
+        {
+        self.searchtreeHeight = self.$refs.tree_left.$el.offsetHeight;
+      }
+  }
   },
   created() {  
     this.model = this.vmodel;
@@ -97,15 +102,15 @@ export default {
     let self = this;
     window.addEventListener('resize', function () {
       self.$nextTick(() => {
-        self.searchtreeHeight = self.$refs.tree_left.$el.offsetHeight;
+       self.setsearchtreeHeight();
       })
     })
-    self.searchtreeHeight = self.$refs.tree_left.$el.offsetHeight;
+     self.setsearchtreeHeight();
   },
   activated(){
       let self = this;
       self.$nextTick(() => {
-        self.searchtreeHeight = self.$refs.tree_left.$el.offsetHeight;
+       self.setsearchtreeHeight();
       })
     }
 }

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

@@ -201,7 +201,7 @@ const Base = function (source) {
           this.value = this.defaultFormat[0];
           this.value1 = this.defaultFormat[1];
         }
-        else if(this.type===Enum.ControlType.CheckBox || this.type===Enum.ControlType.CheckBoxList){
+        else if(this.type===Enum.ControlType.CheckBoxList){
           this.value = this.defaultValue;
           this.forceUpdate();
         }
@@ -235,7 +235,7 @@ const Base = function (source) {
           this.value = '';
           this.value1 = '';
         }
-        else if(this.type===Enum.ControlType.CheckBox || this.type===Enum.ControlType.CheckBoxList){
+        else if(this.type===Enum.ControlType.CheckBoxList){
           this.checkedItemArr = [];
           this.updateCode1();
         }

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

@@ -1,7 +1,7 @@
 import base from '../../index';
-import Base from './Base';
-import common from '../../../common';
-import Router from './Router';
+import Base from './Base';
+import common from '../../../common';
+import Router from './Router';
 import Vue from 'vue';
 const Button = function (source, router) {
   var rtn = {
@@ -15,7 +15,7 @@ const Button = function (source, router) {
     },
     set label(v) {
       source.controlLabel = v;
-    },
+    },
     get routerKey() {
       return source.routerKey;
     },
@@ -24,8 +24,8 @@ const Button = function (source, router) {
         return router.isHyperLink;
       }
       return false;
-    },
-    get isSearchRouterKey() {
+    },
+    get isSearchRouterKey() {
       if (source.controlType == 16 && source.routerKey) {
         return true;
       }
@@ -48,10 +48,10 @@ const Button = function (source, router) {
     get borderColor() {
       return source.borderColor ? source.borderColor + '' : (source.bgColor ? source.bgColor + '' : '');
     },
-    icon: '',
-    getApiData(callback, field) {
+    icon: '',
+    getApiData(callback, field) {
       var params = {
-        action: field.actionForSearch,
+        action: field.actionForSearch,
         para: {
           searchFields: field.getSearchPara(),
           pageAttribute: {
@@ -59,11 +59,11 @@ const Button = function (source, router) {
           },
           flagSearch: true
         }
-      };
+      };
       Vue.prototype.$api.postHandler(common.globalUri(), params).then((response) => {
-        if (response.rtnCode === 200) {
-          var Buttons = [];
-          if (response.content.toolButtons) {
+        if (response.rtnCode === 200) {
+          var Buttons = [];
+          if (response.content.toolButtons) {
             response.content.toolButtons.forEach((v) => {
               var button = Router(v);
               button.is = "ct-btn";
@@ -72,11 +72,11 @@ const Button = function (source, router) {
                 class: 'max-btn-gray'
               }
               Buttons.push(button);
-            });
-          }
+            });
+          }
           callback(response.content, Buttons);
         }
-      });
+      });
     },
   };
   if(router){

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

@@ -0,0 +1,107 @@
+import base from '../../index';
+import Vue from 'vue';
+import common from '../../../common';
+import Router from './Router';
+import Enum from './lib/Enum';
+
+const Canlendar = function (source, param,flagSearch,callBack) {
+  var self = this;
+  var init = function (source) {
+    let rtn = {
+      get source() {
+        return source;
+      },
+      set source(v) {
+        source = v;
+      },
+      get listData() {
+        if (!source.rows) {
+          source.rows = [];
+        }
+        return source.rows;
+      },
+      set listData(v) {
+        source.rows = v;
+      },
+      get columns() {
+        if (!source.columns) {
+          source.columns = [];
+        }
+        return source.columns;
+      },
+   
+      set columns(v) {
+        this._columns = [];
+        source.content.columns = v;
+      },
+      get modelCanlendar() {
+        var canlendarData = [];
+        source.content.rows.forEach(v => {
+          v.day = rtn.rowRouterKey("day");
+          v.date = rtn.rowRouterKey("date");
+          v.labelName = rtn.rowRouterKey("labelName");
+          canlendarData.push(v);
+        });
+        return canlendarData;
+      },
+      rowRouterKey(key) {
+        var obj = { action: "" };
+        if (rtn.rowRouter) {
+          var rowRouter = rtn.rowRouter;
+          for (var i = 0; i < rowRouter.length; i++) {
+            if (rowRouter[i].id == key) {
+              obj = rowRouter[i];
+              break;
+            }
+          }
+          return obj;
+        }
+      },
+      _tabs: null,
+      get tabs() {
+        if (this._tabs !== null) {
+          return this._tabs;
+        }
+
+        this._tabs = [];
+        source.Tabs.forEach(v => {
+          var tab = Router(v);
+          this._tabs.push(tab);
+        });
+
+        return this._tabs;
+      }
+    };
+
+    //valid.InitForm(rtn);
+    return rtn;
+  };
+  if (typeof source === 'string') {
+    var apiData = param ? param.searchData : {};
+    Vue.prototype.$api.postHandler(common.globalUri(),
+    {
+      action: source,
+      para:
+      {
+        searchFields: apiData,
+        pageAttribute: { pageIndex: 1 },
+        flagSearch: flagSearch
+      }
+    }).then( 
+      function (response) {
+        if (response.rtnCode === Enum.ReturnCode.Successful) {
+          var data = response.content;
+          var rtn = init(data);
+          if (callBack) {
+            callBack(rtn);
+          }
+        }
+      }
+    );
+  }
+  else {
+    var data = source;
+    return init(data);
+  }
+};
+export default Canlendar;

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

@@ -17,7 +17,7 @@ const FormList = function (source, master) {
       return master.controlType;
     },
     get label() {
-      return master.dn || '';
+      return master.controlLabel || '';
     },
     get source() {
       return source;
@@ -389,7 +389,7 @@ const FormList = function (source, master) {
               let isRepeat = rtn.isDuplicated(rtn.fieldsToTableData(ev.formData.source.fields), index);
 
               if (!isRepeat) {
-                for (let findex = 0; findex < row.length; findex++) {//循环所在行的列
+                for (let findex = 0; findex < row.length; findex++) {//循环所在行的列                  
                   Vue.set(row[findex], 'code1', ev.formData.source.fields[findex].code1);
                   Vue.set(row[findex], 'name1', ev.formData.source.fields[findex].name1);
                   switch(ev.formData.source.fields[findex].controlType){

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

@@ -25,7 +25,9 @@ const Mo = function (source, moreActionRouter) {
       else {
         this._value = [];
         this.options.forEach((v) => {
-          this._value.push(v[this.optionAttrs.value]);
+          if(!v.flagDeleted && v.flagDeleted !== 1){
+            this._value.push(v[this.optionAttrs.value]);
+          }
         });
         return this._value;
       }
@@ -79,7 +81,7 @@ const Mo = function (source, moreActionRouter) {
       if (source.code1) {
         var rtnLabelValue = '';
         JSON.parse(source.code1).forEach((op) => {
-          if (op.flagDeleted !== 1) {
+          if (!op.flagDeleted && op.flagDeleted !== 1) {
             rtnLabelValue += op[rtn.optionAttrs.label] + '   ';
           }
         });

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

@@ -1,5 +1,5 @@
 import base from '../../index';
-import Base from './Base';
+import Base from './Base';
 
 const PlaceHolder = function (source) {
   var rtn = {
@@ -14,4 +14,4 @@ const PlaceHolder = function (source) {
   return rtn;
 };
 
-export default PlaceHolder;
+export default PlaceHolder;

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

@@ -308,6 +308,20 @@ const Router = function (source) {
         });
       }
     },
+    doBlobAction(data, callback, scripts) {
+      if (rtn.action) {
+        Vue.prototype.$api.postBlobHandler(common.globalUri(), rtn.getActionPara(data), scripts).then((response) => {
+          callback(response.data,response.headers);
+        }).catch((ex) => {
+          // callback(ex); //里面需要有data.rtnCode === 200的处理
+        });
+      } 
+      else {
+        callback({
+          rtnCode: Enum.ReturnCode.Successful
+        });
+      }
+    },
     getSearchPara() {
       let params = {
         fields: []

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

@@ -30,7 +30,9 @@ const TimeSelect = function (source, isRange, dateType) {
       },
       get value() {
         if (source.code1 && source.format !="HH:mm" && Object.prototype.toString.call(source.code1) === "[object String]") {
-          source.code1 = new Date(common.formatDate(new Date(), 'yyyy-MM-dd') + ' ' + source.code1);
+          if(source.code1.length<=8){
+            source.code1 = new Date(common.formatDate(new Date(), 'yyyy-MM-dd') + ' ' + source.code1);
+          }
         }
         return source.code1;
       },
@@ -42,7 +44,9 @@ const TimeSelect = function (source, isRange, dateType) {
       },
       get value1() {
         if (source.code2 && source.format != "HH:mm" && Object.prototype.toString.call(source.code2) === "[object String]") {
-          source.code2 = new Date(common.formatDate(new Date(), 'yyyy-MM-dd') + ' ' + source.code2);
+          if(source.code2.length<=8){
+            source.code2 = new Date(common.formatDate(new Date(), 'yyyy-MM-dd') + ' ' + source.code2);
+          }
         }
         return source.code2;
       },

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

@@ -37,6 +37,7 @@ import RichText from '../RichText';
 import DragSort from '../DragSort';
 import Container from '../Container';
 import Contact from '../Contact';
+import  Canlendar from '../Canlendar';
 
 
 const LibFunction = {

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

@@ -43,6 +43,7 @@ const loader = {
   Contact: require("./ctl/Contact.js").default,
   CellLayout: require("./ctl/CellLayout.js").default,
   Container: require("./ctl/Container.js").default,
+  Canlendar: require("./ctl/Canlendar.js").default,
 };
 
 export default loader;

package/src/main.js

@@ -14,8 +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.1.245.111:38028",
+  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",
@@ -54,9 +53,9 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '2b6283ce-3840-41ba-baed-b863494b4c20',
+        oldToken: '11c12506-253c-4995-83fb-84cf51cb23a0',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOwjAMRe_iuZaS2knsbo3bLhyialGGMiFoJRDi7oCAjZ03_OEt79_gvM3QQCetYxsIra8DcpcCtkMSzCbicp2Is4z6AX_Ml9F71uRjj60mQ45MKN4EjaPx0PVkuYMKyuUIjY_KniJRqGCZ1rdwrPoS27mcduX6j3OHdXlmKTkKtGfkpIQ8zwW1DgmJJ4qOvEwc4f4AAAD__w.13BsUTcpp5bM-wZHc7B-IiabxaSne4yLtw5g5rOXPTw"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVbyZ71ep4vtpOEQUQiOFCpEEgmEuDsgoKNnildMM-8Gy7aHGrI0ilJnMbXGIWXvsOm8YEwiKhpvKUofPuCP-dJrTcFrbrEJPiExWRSdBBNxoi63NsUMFZTLCWrNwoGtElvBPKxvIZ75JbalnHfl-o9zx3V-Zt1QggTrUJkwIE1qQlGjQ2dkJPGGlRzg_gAAAP__.AvGloBOPe6P0tfZZUrjROEl8nOpm1A0ih43ut1I75w8"}',
 
         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"}',

package/src/router/index.js

@@ -7,7 +7,7 @@ import Form from '@/Form'
 import Tabs from '@/Tabs'
 import Detail from '@/Detail'
 import Tree from '@/SearchTree'
-
+import EmployeeClassList from '@/EmployeeClassList'
 Vue.use(Router)
 
 export default new Router({
@@ -46,6 +46,11 @@ export default new Router({
       path: '/SearchTree',
       name: 'Tree',
       component: Tree
+    }, 
+    {
+      path: '/EmployeeClassList',
+      name: 'EmployeeClassList',
+      component: EmployeeClassList
     }
   ]
 })