centaline-data-driven 1.1.25 → 1.1.29

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

@@ -155,7 +155,12 @@ const Base = function (source) {
     searchObj:{
       get dataType() { return source.dearchDataTyp; },
       get fieldName1() { return source.fieldName1; },
-      get fieldName2() { return source.fieldName2; },
+      get fieldName2() { 
+        if(source.controlType === Enum.ControlType.NumericRange){
+          if(!source.fieldName2) return source.fieldName1; 
+        }
+        return source.fieldName2; 
+      },
       get groupName() { return source.groupName || source.fieldName1; },
       get operation() { return source.searchOperation; },
       get searchDataType() { return source.searchDataType; } ,
@@ -233,11 +238,19 @@ const Base = function (source) {
     getFormParentFieldPara() {
       if (rtn.form && typeof rtn.parentField !== 'undefined' && rtn.parentField.length > 0) {
         if (typeof rtn.form.getRefFieldPara === 'function') {
-          return JSON.stringify(rtn.form.getParentFieldPara(rtn.parentField));
+          return rtn.form.getParentFieldPara(rtn.parentField);
         }
       }
       return null;
     },
+    /*选择搜索条件后是否默认显示标签*/
+    get displayLabelAfterSelected() {
+      return source.displayLabelAfterSelected==undefined? false:source.displayLabelAfterSelected;
+    },
+    /*选择搜索条件后是否触发搜索*/
+    get autoSearch() {
+      return source.autoSearch==undefined? false:source.autoSearch;
+    },
   };
 
   return rtn;

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

@@ -624,7 +624,18 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         parentFieldNameArr.forEach((v) => {
           submitData[v] = tempFormData[v];
         });
-        return submitData;
+        
+        if(JSON.stringify(submitData) == "{}"){
+          return '';
+        }
+        else{
+          if(parentFieldNameArr.length>1){
+            return JSON.stringify(submitData);
+          }
+          else{
+            return submitData[parentFieldNameArr[0]];
+          }
+        }
       },
       //检查是否关闭tab后触发来源页面操作
       checkCloseTabThen(notification) {

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

@@ -3,7 +3,6 @@ import Base from './Base';
 import valid from '../../../validate/index';
 const Iti = function (source) {
   var rtn = {
-
     get clearable() {
       if (typeof source.clear === 'undefined'&&!source.locked) {
         return true;
@@ -17,10 +16,9 @@ const Iti = function (source) {
     },
     set clearable(v) {
       source.clear = v;
-    },
-    
+    },    
     get value1() {
-      return source.code2;
+      return source.code2||'';
     },
     set value1(v) {
       source.code2 = v;
@@ -60,13 +58,6 @@ const Iti = function (source) {
     set min1(v) {
       source.minValue2 = v;
     },
-    //searchObj: {
-    //  get searchValue() {
-    //    if (source.code1 || source.code2) {
-    //      return source.code1 + '^' + source.code2;
-    //    }
-    //  }
-    //},
     getFormObj() {
       var rtnFormObj = {};
       Object.defineProperty(rtnFormObj, source.fieldName1, {

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

@@ -67,6 +67,9 @@ const SearchScreen = function (source, callBack, screenPara) {
         });
 
         rtnscreens = this.initScreen(screens);
+        rtnscreens.forEach((v)=>{
+          v.action='search';
+        });
         this._screen = rtnscreens;
         return rtnscreens;
       },
@@ -106,6 +109,9 @@ const SearchScreen = function (source, callBack, screenPara) {
           return advIndex !== -1 && i > advIndex;
         });
         rtnscreens = this.initScreen(screens);
+        rtnscreens.forEach((v)=>{
+          v.action='search';
+        });
         this._highScreen = rtnscreens;
         return rtnscreens;
       },
@@ -185,7 +191,17 @@ const SearchScreen = function (source, callBack, screenPara) {
             if(n.fieldName1==v)submitData[v] = n.searchValue1;
           });
         });
-        return submitData;
+        if(JSON.stringify(submitData) == "{}"){
+          return '';
+        }
+        else{
+          if(parentFieldNameArr.length>1){
+            return JSON.stringify(submitData);
+          }
+          else{
+            return submitData[parentFieldNameArr[0]];
+          }
+        }
       },
     };
     return rtn;
@@ -195,6 +211,10 @@ const SearchScreen = function (source, callBack, screenPara) {
     Vue.prototype.$api.postHandler(common.globalUri(), { action: source, para: screenPara }).then(
       function (response) {
         if (response.rtnCode === Enum.ReturnCode.Successful) {
+          response.content.fields[0].displayLabelAfterSelected=true;
+          response.content.fields[0].autoSearch=true;
+          response.content.fields[4].autoSearch=true;
+          response.content.fields[5].autoSearch=true;
           var rtn = init(response);
           if (callBack) {
             callBack(rtn);

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

@@ -7,9 +7,8 @@ import Vue from 'vue';
 const So = function (source, moreActionRouter) {
   var rtn = {
     options: [{ code: source.code1, name: source.name1 }],
-    get text() {
-      
-      if (source.isList && source.name1 && rtn.attrs.placeholder) {
+    get text() {      
+      if (source.isList && source.name1 && rtn.attrs.placeholder && rtn.displayLabelAfterSelected) {
         return rtn.attrs.placeholder + ":" + source.name1;
       }
       return source.name1;

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

@@ -8,7 +8,7 @@ const Sos = function (source, moreActionRouter) {
   var rtn = {
     options: [{ code: source.code1, name: source.name1 }],
     get text() {
-      if (source.isList && source.name1 && rtn.attrs.placeholder) {
+      if (source.isList && source.name1 && rtn.attrs.placeholder && rtn.displayLabelAfterSelected) {
         return rtn.attrs.placeholder + ":" + source.name1;
       }
       return source.name1;
@@ -31,7 +31,6 @@ const Sos = function (source, moreActionRouter) {
     get parentName() {
       return source.parentField;
     },
-
     reset() {
       this.value = this.defaultValue;
       this.text = this.defaultText;

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

@@ -69,6 +69,9 @@ const LibFunction = {
         field.controlType === Enum.ControlType.ButtonAdvancedSearch) {
         field.width = '';
       }
+      else if (field.controlType === Enum.ControlType.NumericRange) {
+        field.width = field.width || 280;
+      }
       else {
         showLabel = false;
         field.width = field.width || 200;
@@ -145,10 +148,6 @@ const LibFunction = {
         item = Sw(field);
         item.is = 'ct-sw';
         break;
-      //case 'Time'://时间控件
-      //  item = TimeSelect(field, false);
-      //  item.is = 'ct-time-select';
-      //  break;
       case Enum.ControlType.TimeRange://时间区间
         item = TimeSelect(field, true, 'time');
         item.is = 'ct-time-select';

package/src/main.js

@@ -27,7 +27,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'faefb8a4-f885-4f49-a0fc-dc6c0943bf4a',
+        oldToken: 'd09609ec-e13a-4b97-8c15-e003b1c36cbc',
         estateId: '20210729104021C49F04B55C50F6AF58',
       };
     },