centaline-data-driven 1.6.7 → 1.6.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/release-log.md

@@ -1,3 +1,10 @@
+# v1.6.8
+2024-05-08
+
+优化
+
+单行文本框在查询列表传值到API时，自动去掉前后空格、TAB符和换行符
+
 # v1.6.7
 2024-04-25
 

package/src/SearchList.vue

@@ -68,11 +68,11 @@
 
     <!-- <ct-searchlist :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" :searchStatsApi="'/PropertyPublishList/getListStatsForRET'" :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'"></ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/PropertyRETList/getListStats'">
-    </ct-searchlist> -->
+    </ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'" :appRootUrl="appRootUrl"
       :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"
@@ -122,7 +122,7 @@
 
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/OvertimeList/getLayoutOfSearch'" :searchDataApi="'/OvertimeList/getListOfSearchModel'"></ct-searchlist> -->
 
-    <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/TrainingAllowanceTotalList/getLayoutOfSearch'" :searchDataApi="'/TrainingAllowanceTotalList/getListOfSearchModel'"></ct-searchlist>
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/TrainingAllowanceTotalList/getLayoutOfSearch'" :searchDataApi="'/TrainingAllowanceTotalList/getListOfSearchModel'"></ct-searchlist> -->
 
     <ct-dialog-list></ct-dialog-list>
   </div>

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

@@ -276,7 +276,17 @@ const Base = function (source) {
       get groupName() { return source.groupName || source.fieldName1; },
       get operation() { return source.searchOperation; },
       get searchDataType() { return source.searchDataType; } ,
-      get searchValue1() { return source.code1; },
+      get searchValue1() {
+        if(source.controlType === Enum.ControlType.TextBox){
+          if(source.code1) {
+            let rtn = source.code1.trim();
+            rtn = rtn.replace(/\n/g, '');
+            rtn = rtn.replace(/\t/g, '');
+            return rtn; 
+          }
+        }
+        return source.code1; 
+      },
       get searchValue2() { return source.code2; }
     },
     get searchDataType() {//检索的数据类型 

package/src/main.js

@@ -23,7 +23,7 @@ Vue.use(centaline, {
   // baseUrl: "http://10.25.10.69:8080/",
   // baseUrl: "https://ccesutest.centaline.com.cn/service-api/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
-  baseUrl: "http://10.88.22.42:9999/service-api/",
+  // baseUrl: "http://10.88.22.42:9999/service-api/",
   // baseUrl: "http://10.1.245.111:31574/service-api/",
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // baseUrl: "https://shccai.centaline.com.cn/api/",
@@ -55,15 +55,15 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '763fb249-88a4-460e-a5f3-f73421436baf',
+        oldToken: '686f748d-ac9a-457d-99be-bc959c08c1e0',
         token:'1080-1762727915918856192',
-        authObject: '{token:"1080-1778612338593763328"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjksKAjEMQO_StYEkTZp2dq3TbjzE0JERxpX4AUW8u4qHcPd4m_ee7nKb3eDYxio1EJRKHoTFf8gzIKqOJbdajKfUssYRBZhTAWnWICbzoJR8xhhLLTLFLRIjE-g2G4hlhawtga9BLKKNWNht3HI_uYGMlFkl8cat_foT5BN-xe2ynHfL4x9zx-v6yRKbCR4QYp87SEeFzr1D2Hfbk4ZwQHOvNwAAAP__.WXDbBaPltpYZXolspry93UzYBfcZrKEmjpvrgrVTWFM"}',
 
         // originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"23112217144782E4C3D5F8164CB2AE3E","estateName":"%E9%93%B8%E5%B1%B1%E7%85%AE%E6%B5%B7","estDeptPath":"009.007.001.002"}',
         estateId: '',
 
-        authObject: '{"currentEstate":{"estateId":"23112217144782E4C3D5F8164CB2AE3E","estateName":"%E9%93%B8%E5%B1%B1%E7%85%AE%E6%B5%B7","estDeptPath":"009.007.001.002"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"d2131a034036ffd8415011c894807824","token":"","random":"UXhMhQ","time":1714015400375,"sign":"c3be796d30d5a04d4f1037e8a12bd5b1","systemSource":"CCESU","empNo":"zhangtm","empId":"20201030134831BAA0AC5CDC9344B21E"}',
+        // authObject: '{"currentEstate":{"estateId":"23112217144782E4C3D5F8164CB2AE3E","estateName":"%E9%93%B8%E5%B1%B1%E7%85%AE%E6%B5%B7","estDeptPath":"009.007.001.002"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"d2131a034036ffd8415011c894807824","token":"","random":"UXhMhQ","time":1714015400375,"sign":"c3be796d30d5a04d4f1037e8a12bd5b1","systemSource":"CCESU","empNo":"zhangtm","empId":"20201030134831BAA0AC5CDC9344B21E"}',
         AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE2MjI4MGZlLTdkMWMtNDZiNS1hYTA4LTBjMDhmNTdlNDU0MSJ9.GBTB2O5oLnvhjrexjS_SO5F9YWZks7qoVPYYuPBsxzgMuwBZ095A2SD_ELf05jPl9Bxt2zwhz99pIfoSS-2DWA',
       };
     },

package/wwwroot/static/centaline/centaline-data-driven.js

@@ -6842,6 +6842,14 @@ var Base = function Base(source) {
         return source.searchDataType;
       },
       get searchValue1() {
+        if (source.controlType === __WEBPACK_IMPORTED_MODULE_2__ctl_lib_Enum__["default"].ControlType.TextBox) {
+          if (source.code1) {
+            var _rtn = source.code1.trim();
+            _rtn = _rtn.replace(/\n/g, '');
+            _rtn = _rtn.replace(/\t/g, '');
+            return _rtn;
+          }
+        }
         return source.code1;
       },
       get searchValue2() {