centaline-data-driven 1.1.63 → 1.1.67

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

@@ -10,6 +10,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       $vue: null,
       isLoading: false,
       searchModel: searchModel,
+      searchStats: [],
       tableHeight: 350,
       defaultSearchData: defaultSearchData,
       pageIndex: 1,
@@ -22,8 +23,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         source.title = v;
       },
       get flagShowTitle() {
-        let v=false;
-        if(source.flagShowTitle)v=source.flagShowTitle;
+        let v = false;
+        if (source.flagShowTitle) v = source.flagShowTitle;
         return v;
       },
       get source() {
@@ -274,11 +275,11 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         else {
           rtn._buttons = [];
           if (source.content.toolButtons) {
-          
+
             source.content.toolButtons.forEach((v) => {
               var button = Router(v);
               button.is = "ct-btn";
-              button.attrs = { size: "mini",class:'max-btn-gray'}
+              button.attrs = { size: "mini", class: 'max-btn-gray' }
               rtn._buttons.push(button);
             });
           }
@@ -422,10 +423,18 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
           //不需要禁用查询按钮
           // self.searchModel.setBtnLoading(true);
         }
+        var newSearchModel = common.deepClone(this.searchModel.searchData ? this.searchModel.searchData : {});
+        if (self.searchStats && self.searchStats.searchData && self.searchStats.searchData.fields) {
+
+          self.searchStats.searchData.fields.forEach((v) => {
+            newSearchModel.fields.push( v );
+          });
+        }
+
         Vue.prototype.$api.postHandler(common.globalUri(), {
           action: data,
           para: {
-            searchFields: this.searchModel ? this.searchModel.searchData : {},
+            searchFields: newSearchModel ? newSearchModel: {},
             pageAttribute: this.pageData,
             flagSearch: true
           }
@@ -494,7 +503,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         var searchFields = this.searchModel ? this.searchModel.searchData : { fields: [] };
         if (self.primaryKey) {
           searchFields.fields.push({
-            fieldName1: self.primaryFieldMappingDBName?self.primaryFieldMappingDBName:self.primaryKey,
+            fieldName1: self.primaryFieldMappingDBName ? self.primaryFieldMappingDBName : self.primaryKey,
             groupName: self.primaryKey,
             operation: 2,
             searchDataType: 3,
@@ -505,7 +514,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
           action: data,
           para: {
             searchFields: searchFields,
-            pageAttribute: { pageIndex: 1},
+            pageAttribute: { pageIndex: 1 },
             flagSearch: true
           }
         })
@@ -671,7 +680,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             break;
           case Enum.ActionType.New://新增
           case Enum.ActionType.CloseTabThenNew://新增
-         
+
             rtn.setStyleRow(response.content);
             response.content.forEach((nr) => {
               rtn.listData.unshift(nr);
@@ -679,7 +688,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             rtn.dataDictionary = response.content;
 
             source.page.rows = source.page.rows + response.content.length;
-            rtn.$vue.calculatingRowHeight()    
+            rtn.$vue.calculatingRowHeight()
             break;
           case Enum.ActionType.Update://修改
           case Enum.ActionType.CloseTabThenUpdate://修改
@@ -739,24 +748,24 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             rtn._scripts = base.common.eval(source.scripts);
             return rtn._scripts;
           }
-          else{
-            rtn._scripts={};
+          else {
+            rtn._scripts = {};
             return rtn._scripts;
           }
         }
       },
-      formData:formData,
+      formData: formData,
       get tdClass() {
-        let c='';
+        let c = '';
         if (source.content.lineType !== undefined && source.content.lineType !== null) {
-          if (source.content.lineType===Enum.LineType.Vertical) {
-            c='ct-td1';
+          if (source.content.lineType === Enum.LineType.Vertical) {
+            c = 'ct-td1';
           }
-          else if (source.content.lineType===Enum.LineType.Horizon) {
-            c='ct-td2';
+          else if (source.content.lineType === Enum.LineType.Horizon) {
+            c = 'ct-td2';
           }
-          else if (source.content.lineType===Enum.LineType.Both) {
-            c='ct-td3';
+          else if (source.content.lineType === Enum.LineType.Both) {
+            c = 'ct-td3';
           }
         }
         return c;

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

@@ -215,6 +215,8 @@ const Enum = {
     /// 复选
     /// </summary>
     CheckBox: 43,
+    /*带标签的超链接列表*/
+    HyperlinkListWithLabel:44,
   },
 
   //返回状态码

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

@@ -26,6 +26,7 @@ import Base from '../Base';
 import GM from '../GM';
 import File from '../File';
 import HyperLink from '../HyperLink';
+import HyperLinkList from '../HyperLinkList';
 import PlaceHolder from '../PlaceHolder';
 import SensitiveEye from '../SensitiveEye';
 import Cb from '../Cb';
@@ -74,6 +75,13 @@ const LibFunction = {
       else if (field.controlType === Enum.ControlType.NumericRange) {
         field.width = field.width || 280;
       }
+      else if (field.controlType === Enum.ControlType.RadioButton) {
+        if(!field.displayLabelAfterSelected){
+          showLabel = false;
+        }
+        field.width = field.width || 300;
+        field.placeholder1 = field.placeholder1 || field.controlLabel || '';
+      }
       else {
         showLabel = false;
         field.width = field.width || 200;
@@ -287,6 +295,10 @@ const LibFunction = {
         item = HyperLink(field, moreActionRouter);
         item.is = 'ct-hyperLink';
         break;
+      case Enum.ControlType.HyperlinkListWithLabel://带标签的超链接列表
+          item = HyperLinkList(field);
+          item.is = 'ct-hyperLinkList';
+          break;
       case Enum.ControlType.PlaceHolder://占位控件
         item = PlaceHolder(field);
         item.is = 'ct-ph';

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

@@ -19,6 +19,7 @@ const loader = {
   Button: require("./ctl/Button.js").default,
   SearchScreen: require("./ctl/SearchScreen.js").default,
   SearchTable: require("./ctl/SearchTable.js").default,
+  SearchStats: require("./ctl/SearchStats.js").default,
   Form: require("./ctl/Form.js").default,
   Router: require("./ctl/Router.js").default,
   Tabs: require("./ctl/Tabs.js").default,
@@ -30,6 +31,7 @@ const loader = {
   Tree: require("./ctl/Tree.js").default,
   SearchCategory: require("./ctl/SearchCategory.js").default,
   HyperLink: require("./ctl/HyperLink.js").default,
+  HyperLinkList: require("./ctl/HyperLinkList.js").default,
   Detail: require("./ctl/Detail.js").default,
 };