centaline-data-driven 1.5.26 → 1.5.28

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

@@ -96,7 +96,21 @@ const TimeSelect = function (source, isRange, dateType) {
         set placeholder2(v) {
           source.placeholder2 = v;
         }
-      }
+      },
+      getFormListTableShow(){
+        let formListTableShow='';
+        if(isRange){
+          if(source.code1 && source.code2){
+            formListTableShow=common.formatDate(source.code1, this.valueFormat)+'-'+common.formatDate(source.code2, this.valueFormat);
+          }
+        }
+        else{
+          if(source.code1){
+            formListTableShow=common.formatDate(source.code1, this.valueFormat);
+          }
+        }
+        return formListTableShow;
+      },
     };
     rtn = base.copy(Base(data), rtn);
     rtn = base.copy(rtn, valid.Init(rtn));

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

@@ -21,7 +21,7 @@ const Ttts = function (source) {
     },
     get labelValue() {
       if (source.code1 && source.v2)
-        return source.code1 + ' — ' + source.code2;
+        return source.code1 + '-' + source.code2;
       else
         return '';
     },

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

@@ -208,6 +208,11 @@ const Enum = {
     /// </summary>
     SensitiveEye: 41,
 
+    /// <summary>
+    /// 查询分类
+    /// </summary>
+    SearchCategory: 42,
+
     /// <summary>
     /// 复选
     /// </summary>
@@ -256,6 +261,11 @@ const Enum = {
     /// </summary>
     ContainerControl: 52,
 
+    /// <summary>
+    ///  电话拨号控件
+    /// </summary>
+    PhoneDial: 53,
+
   },
 
   //返回状态码

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

@@ -37,6 +37,7 @@ import Compound from '../Compound';
 import RichText from '../RichText';
 import DragSort from '../DragSort';
 import Container from '../Container';
+import Contact from '../Contact';
 
 
 const LibFunction = {
@@ -109,6 +110,10 @@ const LibFunction = {
         item = SosTt(field, moreActionRouter);
         item.is = 'ct-sosTt';
         break;
+      case Enum.ControlType.PhoneDial: //电话号码拨打
+        item = Contact({content:field.code1},null,null,field);
+        item.is = 'ct-contact';
+        break;
       case Enum.ControlType.GroupSplitLine: //分割线
         item = Gp(field);
         item.is = 'ct-group-line';
@@ -204,10 +209,6 @@ const LibFunction = {
         item = Dtd(field, 'datetime');
         item.is = 'ct-dtd';
         break;
-        //case 'mt':
-        //  item = Mt(field);
-        //  item.is = 'ct-mt';
-        //  break;
       case Enum.ControlType.List: //列表
         var listobj = source.list.find((v1) => {
           return v1.name === field.fieldName1;
@@ -421,7 +422,7 @@ const LibFunction = {
         get excLine() {
           return field.singleLine === true || field.controlType === Enum.ControlType.GroupSplitLine 
             || field.controlType === Enum.ControlType.List || field.controlType === Enum.ControlType.File 
-            || field.controlType === Enum.ControlType.SliceUpload 
+            || field.controlType === Enum.ControlType.SliceUpload || field.controlType === Enum.ControlType.PhoneDial 
             || field.controlType === Enum.ControlType.SearchPage;
         },
         showLabel: showLabel

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.46: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",
@@ -23,7 +23,7 @@ Vue.use(centaline, {
   // baseUrl: "http://10.88.22.69:8080/api/", 
   // baseUrl: "http://10.88.22.40:8080/api/",
   // baseUrl: "http://10.58.2.108:8080/",
-  // baseUrl: "http://tjcptest.centaline.com.cn/", 
+  baseUrl: "http://tjcptest.centaline.com.cn/", 
   // baseUrl: "http://tjcpuat.centaline.com.cn:9090/",
   flagRouterSelf: true,
   zindex: 999,
@@ -53,9 +53,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_iOif57It9povPScMjojg4UqgQSSQQ4u-AgI6eKbaYZvamli2rnUrcaJLOgrSmBkq-hqbzDFGYdTTeUuQ-fIAf86VHpODRtdAEL0COLDAKg5AT6lJrJSZVqXI5qR069mTQka7UPKxvYW1tXmJbynlfrv84d1znZ5bLwY1mzKBz7YAsjxA4FMBhymbyJhAadX8AAAD__w.WTd5dRXlft4LrZ-VT3IZEpes_Ox43KL_WvLCqMgYfZM"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO-ydVbyZ22v08WbpOEQyCFGChUiiQRC3J0ghY6eV0zxipl5wrwOUEPLjSLpLUpnHFIbHDZ9YEzCrJIJlhIf4w7-iC9HrSkG7TtsYhAkTxZZC6OQF-rbzkpqoYJyv0Kt_dYejbGqgikvu1COP2Kdy-1QHv84d1mmbVaz8jmbM2blA1IeMw4jFSTjHBNTUOoErzcAAAD__w.G0v6h6v6Lns3jQ3YdJBc8hy4mdJVKnqd5t4YZ50aQT4"}',
 
         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"}',