centaline-data-driven 1.3.49 → 1.3.52

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

@@ -46,6 +46,15 @@ const Base = function (source) {
     set code1(v) {
       source.code1 = v;
     },
+    set code2(v) {
+      source.code2 = v;
+    },
+    set code3(v) {
+      source.code3 = v;
+    },
+    set code4(v) {
+      source.code4 = v;
+    },
     get value() {
       return source.code1;
     },

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

@@ -9,6 +9,9 @@ const box = function (source, callBack) {
     var rtn = {
       get options() {
         return source.selectItems1;
+      },
+	   get width1() {
+        return source.width1;
       },
       checkedIsInit: false,
       get checkedItemArr() {

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

@@ -426,7 +426,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         if (this.flagMoreData && this.flagMoreData !== false) {
           this.pageIndex++;
           this.apiData(callback);
-        } else {
+        } 
+        else {
           if (typeof callback !== 'undefined') {
             callback(false);
           }
@@ -505,7 +506,6 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                   rtn.listData.push(nr);
                 });
                 rtn.dataDictionary = response.content.rows;
-                //self.listData = self.listData.concat(response.content.Rows);
               }
               rtn.getSelectAll();
               source.page.rows = response.page.rows;
@@ -533,8 +533,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               }
               if (typeof callback !== 'undefined') {
                 if (response.content.rows.length > 0) {
-                  callback(true);
-                } else {
+                  callback(true,response);
+                } 
+                else {
                   callback(false);
                 }
               }

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

@@ -64,25 +64,35 @@ const LibFunction = {
     if (isList) {
       if (field.controlType === Enum.ControlType.Date) {
         field.width = field.width || 250;
-      } else if (field.controlType === Enum.ControlType.DateTime) {
+      } 
+      else if (field.controlType === Enum.ControlType.DateTime) {
         field.width = field.width || 280;
-      } else if (field.controlType === Enum.ControlType.DateRange) {
+      } 
+      else if (field.controlType === Enum.ControlType.DateRange) {
         field.width = field.width || 300;
-      } else if (field.controlType === Enum.ControlType.DateTimeRange) {
+      } 
+      else if (field.controlType === Enum.ControlType.DateTimeRange) {
         field.width = field.width || 350;
-      } else if (field.controlType === Enum.ControlType.ButtonSearch ||
+      } 
+      else if (field.controlType === Enum.ControlType.ButtonSearch ||
         field.controlType === Enum.ControlType.ButtonReset ||
         field.controlType === Enum.ControlType.ButtonAdvancedSearch) {
         field.width = '';
-      } else if (field.controlType === Enum.ControlType.NumericRange) {
+      } 
+      else if (field.controlType === Enum.ControlType.NumericRange) {
         field.width = field.width || 280;
-      } else if (field.controlType === Enum.ControlType.RadioButton) {
+      } 
+      else if (field.controlType === Enum.ControlType.RadioButton) {
         if (!field.displayLabelAfterSelected) {
           showLabel = false;
         }
         field.width = field.width || 300;
         field.placeholder1 = field.placeholder1 || field.controlLabel || '';
-      } else {
+      } 
+      else if (field.controlType === Enum.ControlType.CheckBox) {
+        showLabel = true;
+      }
+      else {
         showLabel = false;
         field.width = field.width || 200;
         field.placeholder1 = field.placeholder1 || field.controlLabel || '';

package/src/main.js

@@ -12,11 +12,11 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.46:7070/v1/form/router",
-  // baseUrl: "http://10.88.23.22:9999/v1/form/router",
+  // baseUrl: "http://10.88.22.13:7070/v1/form/router",
+  // baseUrl: "http://10.88.23.25:9999/v1/form/router",
   // baseUrl: "http://10.88.22.40:8080/", 
-  // baseUrl: "http://tjcptest.centaline.com.cn/", 
-  // flagRouterSelf: true,
+  baseUrl: "http://tjcptest.centaline.com.cn/", 
+  flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
@@ -41,10 +41,13 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '8ce4e917-2183-40d9-8b87-53ae45e1fc59',
+        oldToken: '2a10f2e1-de17-4ceb-a3cf-b33a7b18515e',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEKg0AQRP9laxe8u3X31i6epslHyMkpmCpEhYSQf48h2tnnFa8YBmZeMC0dlCAbeKCdVjfwQDutMaRiuMGTSkBicuhN8BiIA53rxoWqhgz6xw1Kw5w7ESeUwRjnX2A112-wTP390j__ce46j-vsIAN5ch1alrSWhTCqRiRbJEtc-MQM7w8AAAD__w.dYqgv0MHo3uvKDGcRKsCZt4UCdSl1qVTNQt628giu6k',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
-        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE2OGI1YThjLThiZTUtNDQyZi04NTA4LWMyODY4N2NkYmEzMSJ9.Rk26QdZSUzDVdjdRxGxDApOt5W6KYjmyjmsXpWeZb5E5NwZjpXnHYwhYkKjNxIeyg--OV2UrzFa2SxGzZ-Wneg',
+        estateId: '20210729104021C49F04B55C50F6AF58',
+        authObject: '{"currentEstate":{"estateId":"20111122105652A2A701D48134542934","estateName":"%E9%BE%99%E5%85%89%E5%9F%8E"},"platform":1,"OSVersion":"","clientVersion":"","machineCode":""}',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjdjZjU3ZDhlLTUzNDItNGFhZC1iYThjLTg3OGNjNTcwZTc5MCJ9.X_b6c_D69_IX8dvQ90cfOqIXi-hTy449sJvzFw_rsXbyVc9obiybHSDycdJ6bgdbJW94XRjbqj9hPwiWyL3XSg',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作