centaline-data-driven 1.5.66 → 1.5.68

package/src/centaline/dynamicViewerFile/src/dynamicViewerFile.vue

@@ -172,7 +172,7 @@
                 &&(itemFile.mediaTypeID+'').toLowerCase()!='vr')"
                    class="magnify-btn el-icon-download"
                    title="下载"
-                   @click="handDownload(resultObject)"></a>
+                   @click="handDownload(resultObject,itemFile)"></a>
 
 
               </div>
@@ -271,10 +271,24 @@
           return url;
         }
       },
-      handDownload(url) {
-        let self = this;
-        self.downloadLoading = true; 
-        if (url.indexOf("?") > -1) {
+      handDownload(url, itemFile) {
+      let self = this;
+      self.downloadLoading = true;
+      if (itemFile.downloadLogAction) {
+        this.$api.postHandler(this.$common.globalUri(), { action: itemFile.downloadLogAction, para: {} }).then(
+          function (response) {
+            if (response.rtnCode === 200) {
+              self.handDownloadUrl(url);
+            }
+          }
+        );
+      } else {
+        self.handDownloadUrl(url);
+      }
+    },
+    handDownloadUrl(url){
+      let self = this;
+      if (url.indexOf("?") > -1) {
           self.downloadUrl = self.getDownloadUrl(url) + "&" + Math.random();
         }
         else {
@@ -283,8 +297,7 @@
         setTimeout(function () {
           self.downloadLoading = false;
         }, 1000);
-
-      },
+    },
       handleMouse(e) {
         e.preventDefault();
       },

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

@@ -192,15 +192,16 @@ const Base = function (source) {
       return bind;
     },
     reset() {
-      if(this.type!==Enum.ControlType.Hidden 
-        && this.isScreen
-        && this.type!==Enum.ControlType.Label 
-        && this.type!==Enum.ControlType.MultiLineLabel){
+      if(this.type===Enum.ControlType.Hidden 
+        || this.type===Enum.ControlType.Label 
+        || this.type===Enum.ControlType.MultiLineLabel){
+      }
+      else if(this.isScreen){
         if(this.type===Enum.ControlType.DateRange || this.type===Enum.ControlType.DateTimeRange){
           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();
         }
@@ -234,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/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/main.js

@@ -14,18 +14,20 @@ 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.46:6060/onecard-api/",
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
+  // baseUrl: "http://10.88.22.13:6060/onecard-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",
+  // baseUrl: "http://10.25.10.63:9999/service-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:8080/",
-  // baseUrl: "http://10.88.22.42:9999/service-api/v1/form/router", 
+  // baseUrl: "http://10.88.22.42:30403/service-api/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
-  // baseUrl: "http://10.88.22.40:8080/api/",
+  // baseUrl: "http://10.88.22.16:8080/",
   // baseUrl: "http://10.58.2.108:8080/",
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // baseUrl: "http://tjcpuat.centaline.com.cn:9090/",
+  // baseUrl: "http://10.88.22.42:8080/",
   flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
@@ -38,6 +40,9 @@ Vue.use(centaline, {
     openTabSearch: function (field, submitData) {
       alert("打开tab页Search:" + field.action)
     },
+    openTabSearchRouter: function (action) {
+      alert("打开tab页:" + action)
+    },
     openDetail: function (action) {
       alert("打开tab页:" + action)
     },
@@ -54,16 +59,16 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '2b6283ce-3840-41ba-baed-b863494b4c20',
+        oldToken: '27517ab2-58ea-42c8-97d1-3385278b1314',
         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:"1080-1710827614035382272"}',
 
         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"}',
-        estateId: '201806071109550C867184E8BCA56EC3',
+        estateId: '20210729104021C49F04B55C50F6AF58',
 
-        // authObject: '{"currentEstate":{"estateId":"20191114134322C29C9B83A84F192964","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"ce04f173da7df2e78a9da25595111387","token":"","random":"XNEYyu","time":1683686365201,"sign":"79be68006872c6a088eb49f7e3dab45a"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjYyOTk5ZDhjLTYwY2MtNGM0OS05MzM4LWY1MTBhNjI5OGVjYiJ9.A7lCMb4mBHjse6DlvFLVV5jEQSWzREtlbeZJ6StCW4kVyyRG4RlkhRl2FJvaBZEdtoEItI52IEgBsX4X_H1m4w',
+        // authObject: '{"currentEstate":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"470cac848b892484b949c6135dff97d6","token":"","random":"IVMfRJ","time":1689822719042,"sign":"19a04c54292bd44dfa5187983e27c530"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImNhYmM2OGMyLTIyMTctNDcwZi05N2NhLWJjODBiYzY0OTc4OSJ9.D1pwuj_lWGINENGQp5LDHefzVJOAAzYW9d8Tn4V-8rZS2kXf7AAZltQtTXtSb7h-EnRnAuIuNIwHREXZm0RPQA',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作