centaline-data-driven 1.1.23 → 1.1.24

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

@@ -18,7 +18,12 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         return source.title;
       },
       set title(v) {
-        source.formTitle = v;
+        source.title = v;
+      },
+      get flagShowTitle() {
+        let v=false;
+        if(source.flagShowTitle)v=source.flagShowTitle;
+        return v;
       },
       isChanged: false,
       get isHorizontalLayout() {
@@ -116,6 +121,13 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
       get optionApi() {
         return source.parameterAction;
       },
+      _pageDisabled:false,
+      get pageDisabled() {
+        return this._pageDisabled;
+      },
+      set pageDisabled(v) {
+        this._pageDisabled = v;
+      },
       get saveButtonAction() {
         return source.saveButtonAction;
       },
@@ -247,10 +259,17 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
               }
 
               if (rowNum === 0 || (rowNum && fiedlId)) {
-                let fields = listData.rows[rowNum].field;
-                field = fields.find((v) => {
-                  return v.id === fiedlId;
-                });
+                try {
+                  let fields = listData.rows[rowNum].field;
+                  field = fields.find((v) => {
+                    return v.id === fiedlId;
+                  });
+                } catch (e) {
+                  if (listData.rows.length <= rowNum) {
+                    var checkMsg = "获取列表行索引超出界限";
+                    this.message(checkMsg);
+                  }
+                }
               }
             }
 
@@ -369,6 +388,13 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           return false;
         },
 
+        setListAttr(tableId, attrName, attrValue) {
+          let listData = this.excuteListData.find((v) => {
+            return v.id === tableId;
+          });
+          listData[attrName] = attrValue
+
+        },
 
         /**
          * @method
@@ -396,7 +422,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
                     //因为要传参，并直接执行方法，故successCallback回调里要使用formData的话，要加this
                     //若不能接受this，也可修改common.excute方法
                     //successCallback.call(formData.form.scripts, data);
-                    
+
                     //优化，不需要加this
                     formData.common.excuteFun.call(formData.form.scripts, successCallback, data);
                   }
@@ -590,7 +616,14 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         refFieldNameArr.forEach((v) => {
           submitData[v] = tempFormData[v];
         });
-
+        return submitData;
+      },
+      getParentFieldPara(parentFieldNameArr) {
+        let submitData = {};
+        var tempFormData = rtn.getFormObj();
+        parentFieldNameArr.forEach((v) => {
+          submitData[v] = tempFormData[v];
+        });
         return submitData;
       },
       //检查是否关闭tab后触发来源页面操作

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

@@ -61,6 +61,12 @@ const FormList = function (source, master) {
     get totalCols() {
       return source.totalCols;
     },
+    set tableDisabled(v) {
+      source.disabled = v;
+    },
+    get tableDisabled() {
+      return source.disabled || false;
+    },
     getFormObj() {
       let rtnFormArr = [];
       
@@ -159,7 +165,6 @@ const FormList = function (source, master) {
     currentRow: null,
     _tableData: undefined,
     get tableData() {
-      debugger
       if (this._tableData) {
         return this._tableData;
       }

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

@@ -1,5 +1,5 @@
 import base from '../../index';
-import Base from './Base';
+import Base from './Base';
 
 const HyperLink = function (source) {
   var rtn = {

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

@@ -148,7 +148,7 @@ const Mo = function (source, moreActionRouter) {
         action: apiAddrs,
         para: {
           paramName: self.paramName,
-          parentValue: self.parent && self.parent.value,
+          parentValue: rtn.getFormParentFieldPara(),
           extraData: rtn.getFormRefFieldPara()
         }
       };
@@ -174,14 +174,6 @@ const Mo = function (source, moreActionRouter) {
 
       return null;
     },
-    getFormRefFieldPara() {
-      if (rtn.form && typeof source.refFieldName !== 'undefined' && source.refFieldName.length > 0) {
-        if (typeof rtn.form.getRefFieldPara === 'function') {
-          return JSON.stringify(rtn.form.getRefFieldPara(source.refFieldName));
-        }
-      }
-      return null;
-    }
   };
   rtn = base.copy(Base(source), rtn);
   rtn = base.copy(rtn, valid.Init(rtn));

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

@@ -1,5 +1,5 @@
 import base from '../../index';
-import Base from './Base';
+import Base from './Base';
 
 const PlaceHolder = function (source) {
   var rtn = {
@@ -14,4 +14,4 @@ const PlaceHolder = function (source) {
   return rtn;
 };
 
-export default PlaceHolder;
+export default PlaceHolder;

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

@@ -32,6 +32,9 @@ const Router = function (source) {
     get isHyperLink() {
       return source.buttonType === Enum.ButtonType.HyperLink;
     },
+    get isDropdown() {
+      return source.buttonType === Enum.ButtonType.Dropdown;
+    },
     get alert() {
       return source.flagAlert === true;
     },
@@ -123,6 +126,9 @@ const Router = function (source) {
     get pageTitle() {
       return source.pageTitle;
     },
+    get pageStyle() {
+      return source.pageStyle;
+    },
     //是否附带本页面的SearchLayout
     get flagAttachSearchCondition() {
       return source.flagAttachSearchCondition === true;
@@ -176,6 +182,29 @@ const Router = function (source) {
     get flagFreshCurrentRow() {
       return source.flagFreshCurrentRow;
     },
+    get textColor() {
+      return source.textColor || '';
+    },
+    get bgColor() {
+      return source.bgColor || '';
+    },
+    get borderColor() {
+      return source.borderColor ? source.borderColor : (source.bgColor || '');
+    },
+    attrs: {
+      set class(v)
+      {
+        source.className=v
+      },
+      get class() {
+        var size = this.size ? this.size : "mini";
+        source.className=source.className||'ct-font-size-' + size;
+        return source.className;
+      }
+    },
+    get paramName() {
+      return source.paramName;
+    },
     getActionPara(data) {
       let params = {};
       if (rtn.isSubmit) {
@@ -190,6 +219,9 @@ const Router = function (source) {
       else {
         data.actionType = rtn.actionType;
         data = Object.assign(data, rtn.queryPara);
+        if(rtn.isDropdown && rtn.selectOptionCode){
+          data[rtn.paramName]=rtn.selectOptionCode;
+        }
         params = {
           action: rtn.action,
           para: data
@@ -208,7 +240,32 @@ const Router = function (source) {
       else {
         callback({ rtnCode: Enum.ReturnCode.Successful });
       }
-    }
+    },
+    selectOptionCode:'',
+    _elementOptions: [],
+    get elementOptions() {
+      return this._elementOptions;
+    },
+    set elementOptions(v) {
+      this._elementOptions = v;
+    },
+    getOptions(paramsAction) {
+      var self = this;
+      var apiAddrs = paramsAction;
+      var params = {
+        action: apiAddrs,
+        para: {
+          paramName: self.paramName,
+          parentValue: '',
+          extraData: null
+        }
+      };
+      Vue.prototype.$api.postHandler(common.globalUri(), params).then((response) => {
+        if (response.rtnCode === 200) {
+          self.elementOptions = response.content;
+        }
+      });
+    },
   };
   return rtn;
 }

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

@@ -21,7 +21,15 @@ const SearchScreen = function (source, callBack, screenPara) {
         source.content.colSpan = v;
       },
       get title() {
-        return source.content.actionTitle;
+        return source.content.title;
+      },
+      set title(v) {
+        source.content.title = v;
+      },
+      get flagShowTitle() {
+        let v=false;
+        if(source.content.flagShowTitle)v=source.content.flagShowTitle;
+        return v;
       },
       get optionApi() {
         return source.content.parameterAction;
@@ -130,6 +138,7 @@ const SearchScreen = function (source, callBack, screenPara) {
         screens.forEach((value) => {
           let item = LibFunction.GetControl(value, source, true, true);
           if (item instanceof Object) {
+            item.form = rtn;
             rtnscreens.push(item);
           }
         });
@@ -156,7 +165,28 @@ const SearchScreen = function (source, callBack, screenPara) {
             action: btn.action,
             para: submitData
           });
-      }
+      },
+      //绑定联动参数组件
+      getRefFieldPara(refFieldNameArr) {
+        let submitData = {};
+        var tempFormData = rtn.searchData;
+        refFieldNameArr.forEach((v) => {
+          tempFormData.fields.forEach((n)=>{
+            if(n.fieldName1==v)submitData[v] = n.searchValue1;
+          });
+        });
+        return submitData;
+      },
+      getParentFieldPara(parentFieldNameArr) {
+        let submitData = {};
+        var tempFormData = rtn.searchData;
+        parentFieldNameArr.forEach((v) => {
+          tempFormData.fields.forEach((n)=>{
+            if(n.fieldName1==v)submitData[v] = n.searchValue1;
+          });
+        });
+        return submitData;
+      },
     };
     return rtn;
   };
@@ -165,6 +195,8 @@ 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.title='XXXXXXXXXXX';
+          response.content.flagShowTitle=true;
           var rtn = init(response);
           if (callBack) {
             callBack(rtn);

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

@@ -14,6 +14,17 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       pageIndex: 1,
       selectIndex: 0,
       selectAll: 0,
+      get title() {
+        return source.title;
+      },
+      set title(v) {
+        source.title = v;
+      },
+      get flagShowTitle() {
+        let v=false;
+        if(source.flagShowTitle)v=source.flagShowTitle;
+        return v;
+      },
       get source() {
         return source;
       },
@@ -35,10 +46,6 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
 
           source.content.columns.forEach((v) => {
             v.columnWidth = v.columnWidth ? v.columnWidth : 'auto';
-            //if (v.dn === "物业名称") {
-            //  v.rk = '1';
-            //}
-
             var col = {
               fixedSize: 0,
               get source() {
@@ -266,10 +273,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" }
+              button.attrs = { size: "mini",class:'max-btn-gray'}
               rtn._buttons.push(button);
             });
           }
@@ -410,7 +418,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         var self = this;
         this.isLoading = true;
         if (self.searchModel) {
-          self.searchModel.setBtnLoading(true);
+          //不需要禁用查询按钮
+          // self.searchModel.setBtnLoading(true);
         }
         Vue.prototype.$api.postHandler(common.globalUri(), {
           action: data,
@@ -468,13 +477,13 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             }
 
             if (self.searchModel) {
-              self.searchModel.setBtnLoading(false);
+              // self.searchModel.setBtnLoading(false);
             }
           })
           .catch((error) => {
             self.isLoading = false;
             if (self.searchModel) {
-              self.searchModel.setBtnLoading(false);
+              // self.searchModel.setBtnLoading(false);
             }
             console.error(error);
           });
@@ -579,6 +588,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       get rowMergedColumns() {
         return source.content.rowMergedColumns || [];
       },
+      get optionApi() {
+        return source.content.parameterAction;
+      },
       setRow(rows) {
         rtn.setStyleRow(rows);
         rtn.setMergeRow(rows);
@@ -634,6 +646,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         }
       },
       doAction(response) {
+       
         if (response.responseData) {
           response = response.responseData;
         }
@@ -655,6 +668,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);
@@ -662,6 +676,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()    
             break;
           case Enum.ActionType.Update://修改
           case Enum.ActionType.CloseTabThenUpdate://修改
@@ -691,8 +706,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       checkCloseTabThen(notification) {
         var rtn = false;
         if (notification == Enum.ActionType.CloseTabThenDelete
-          || notification == Enum.ActionType.CloseTabThenDelete
-          || notification == Enum.ActionType.CloseTabThenDelete) {
+          || notification == Enum.ActionType.CloseTabThenNew
+          || notification == Enum.ActionType.CloseTabThenUpdate) {
           rtn = true;
         }
         return rtn;

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

@@ -81,7 +81,7 @@ const So = function (source, moreActionRouter) {
         action: apiAddrs,
         para: {
           paramName: self.paramName,
-          parentValue: self.parent && self.parent.value,
+          parentValue: rtn.getFormParentFieldPara(),
           extraData: rtn.getFormRefFieldPara()
         }
       };
@@ -110,14 +110,6 @@ const So = function (source, moreActionRouter) {
 
       return null;
     },
-    getFormRefFieldPara() {
-      if (rtn.form && typeof source.refFieldName !== 'undefined' && source.refFieldName.length > 0) {
-        if (typeof rtn.form.getRefFieldPara === 'function') {
-          return JSON.stringify(rtn.form.getRefFieldPara(source.refFieldName));
-        }
-      }
-      return null;
-    }
   };
   rtn = base.copy(Base(source), rtn);
   rtn = base.copy(rtn, valid.Init(rtn));

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

@@ -86,15 +86,14 @@ const Sos = function (source, moreActionRouter) {
     set searchTick(v) {
       source.searchTick = v;
     },
-    getOptions(paramsAction,key) {
-      debugger;
+    getOptions(paramsAction,key) {     
       var self = this;
       var apiAddrs = paramsAction || this.api;
       var params = {
         action: apiAddrs,
         para: {
           paramName: self.paramName,
-          parentValue: self.parent && self.parent.value,
+          parentValue: rtn.getFormParentFieldPara(),
           key: key,
           extraData: rtn.getFormRefFieldPara()
         }
@@ -121,14 +120,6 @@ const Sos = function (source, moreActionRouter) {
 
       return null;
     },
-    getFormRefFieldPara() {
-      if (rtn.form && typeof source.refFieldName !== 'undefined' && source.refFieldName.length > 0) {
-        if (typeof rtn.form.getRefFieldPara === 'function') {
-          return JSON.stringify(rtn.form.getRefFieldPara(source.refFieldName));
-        }
-      }
-      return null;
-    },
   };
   rtn = base.copy(Base(source), rtn);
   rtn = base.copy(rtn, valid.Init(rtn));

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

@@ -155,7 +155,7 @@ const Tags = function (source, moreActionRouter) {
         action: apiAddrs,
         para: {
           paramName: self.paramName,
-          parentValue: self.parent && self.parent.value,
+          parentValue: rtn.getFormParentFieldPara(),
           key: key,
           extraData: rtn.getFormRefFieldPara()
         }
@@ -182,14 +182,6 @@ const Tags = function (source, moreActionRouter) {
 
       return null;
     },
-    getFormRefFieldPara() {
-      if (rtn.form && typeof source.refFieldName !== 'undefined' && source.refFieldName.length > 0) {
-        if (typeof rtn.form.getRefFieldPara === 'function') {
-          return JSON.stringify(rtn.form.getRefFieldPara(source.refFieldName));
-        }
-      }
-      return null;
-    }
   };
   rtn = base.copy(Base(source), rtn);
   rtn = base.copy(rtn, valid.Init(rtn));

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

@@ -9,8 +9,8 @@ const TimeSelect = function (source, isRange, dateType) {
     var rtn = {
       isRange: isRange,//是否是区间
       get valueFormat() {
-        if (typeof source.valueFormat !== 'undefined') {
-          return source.valueFormat;
+        if (typeof source.format !== 'undefined') {
+          return source.format;
         }
         else {
           if (dateType === "time") {
@@ -20,24 +20,51 @@ const TimeSelect = function (source, isRange, dateType) {
         }
       },
       set valueFormat(v) {
-        source.valueFormat = v;
+        source.format = v;
+      },
+      get step() {
+        return source.step;
+      },
+      set step(v) {
+        source.step = v;
       },
       get value() {
-        if (source.code1 && Object.prototype.toString.call(source.code1) === "[object String]") source.code1 = new Date(common.formatDate(new Date(), 'yyyy-MM-dd') + ' ' + source.code1);
+        if (source.code1 && source.format !="HH:mm" && Object.prototype.toString.call(source.code1) === "[object String]") source.code1 = new Date(common.formatDate(new Date(), 'yyyy-MM-dd') + ' ' + source.code1);
         return source.code1;
       },
       set value(v) {
-        if (v && Object.prototype.toString.call(v) === "[object Date]") v = common.formatDate(v, rtn.valueFormat);
+        if (v && source.format != "HH:mm" && Object.prototype.toString.call(v) === "[object Date]") v = common.formatDate(v, rtn.valueFormat);
         source.code1 = v;
       },
       get value1() {
-        if (source.code2 && Object.prototype.toString.call(source.code2) === "[object String]") source.code2 = new Date(common.formatDate(new Date(), 'yyyy-MM-dd') + ' ' + source.code2);
+        if (source.code2 && source.format != "HH:mm" && Object.prototype.toString.call(source.code2) === "[object String]") source.code2 = new Date(common.formatDate(new Date(), 'yyyy-MM-dd') + ' ' + source.code2);
         return source.code2;
       },
       set value1(v) {
-        if (v && Object.prototype.toString.call(v) === "[object Date]") v = common.formatDate(v, rtn.valueFormat);
+        if (v && source.format != "HH:mm" && Object.prototype.toString.call(v) === "[object Date]") v = common.formatDate(v, rtn.valueFormat);
         source.code2 = v;
       },
+      get id1() {
+        return source.fieldName2;
+      },
+      getFormObj() {
+        var rtnFormObj = {};
+        Object.defineProperty(rtnFormObj, source.fieldName1, {
+          get: function () {
+            return source.code1;
+          },
+          enumerable: true,
+          configurable: true
+        });
+        Object.defineProperty(rtnFormObj, source.fieldName2, {
+          get: function () {
+            return source.code2;
+          },
+          enumerable: true,
+          configurable: true
+        });
+        return rtnFormObj;
+      },
       get attrs() {
         return {}
       }