centaline-data-driven 1.5.21 → 1.5.22

package/src/centaline/dynamicSearchList/src/dynamicSearchList.vue

@@ -1,6 +1,6 @@
 <template>
   <div ref="main" style="width: 100%;height: 100%;display: flex;" :class="{'domDisabled':pageDisabled}">
-    <div class="ct-search-list" :style="{'height': pageHeight? pageHeight:'100%','width':searchWidth?searchWidth+'px':'100%'}" > 
+    <div class="ct-search-list" :style="{'height': pageHeightReal? pageHeightReal:'100%','width':searchWidth?searchWidth+'px':'100%'}" > 
       <div slot="header" class="clearfix" v-if="typeof title !== 'undefined' && showTitle">
         <span style="font-weight:bold">{{title}}</span>
       </div>
@@ -22,6 +22,7 @@
     :style="{'height': pageHeight? pageHeight:'100%','width':sideBarWidth+'px',right:sideBarRight+'px'}" 
     class="sidebar">
       <ct-Detail ref="detail" :api="sideBarApi" :apiParam="sideBarApiParam" :pageType="sideBarPageType" 
+      :searchConditionApi="sideBarSearchConditionApi" :searchStatsApi="sideBarSearchStatsApi" :searchDataApi="sideBarSearchDataApi" :listHeight="listHeight"
       :selectIndex="selectIndex" :rowCount="rowCount" :key="detailKey" :drowerClose="drowerClose"
       @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
       @closeSideHandler="closeSideHandler"></ct-Detail>
@@ -77,35 +78,6 @@
         default:false,
       },
     },
-    data() {
-      return {
-        drowerClose:'',
-      }
-    },
-    created() {
-      this.model = this.vmodel;
-      this.screenPara=this.apiParam;
-      if(this.searchCategoryApi){
-        this.loaded.categoryLoaded=false;
-      }
-      if(this.apiParam && this.apiParam.isIframe && this.apiParam.isIframe=='true'){
-        this.isIframe=true;
-      }
-    },
-    computed: {
-    },
-    activated() {
-      this.$nextTick(() => {
-        if(this.$refs.detail){
-          if(this.$refs.detail.$children && this.$refs.detail.$children.length>0){
-            this.$refs.detail.$children[0].refreshPage();
-          }
-        }
-        if(this.$refs.table){
-          this.$refs.table.resetScrollActivated();
-        }
-      })
-    },
     data() {
       return {
         loaded: {
@@ -138,7 +110,49 @@
         rowCount:0,
         detailKey:0,
         isIframe: false,
+        
+        drowerClose:'',
+        listHeight:0,
+        pageHeightReal: '',
+      }
+    },
+    created() {
+      this.model = this.vmodel;
+      this.screenPara=this.apiParam;
+      if(this.pageHeight) {
+        this.pageHeightReal=this.pageHeight;
       }
+      if(this.searchCategoryApi){
+        this.loaded.categoryLoaded=false;
+      }
+      if(this.apiParam && this.apiParam.isIframe && this.apiParam.isIframe=='true'){
+        this.isIframe=true;
+      }
+    },
+    computed: {
+    },
+    mounted() {
+      var self=this;
+      this.$nextTick(() => {
+        if(this.$refs.main){
+          this.listHeight=this.$refs.main.offsetHeight;
+        }
+      })
+    },
+    activated() {
+      this.$nextTick(() => {
+        if(this.$refs.main){
+          this.listHeight=this.$refs.main.offsetHeight;
+        }
+        if(this.$refs.detail){
+          if(this.$refs.detail.$children && this.$refs.detail.$children.length>0){
+            this.$refs.detail.$children[0].refreshPage(this.listHeight);
+          }
+        }
+        if(this.$refs.table){
+          this.$refs.table.resetScrollActivated();
+        }
+      })
     },
     methods: {
       screenLoaded(defaultSearch) {
@@ -210,6 +224,14 @@
             this.searchWidth=this.$refs.main.clientWidth-this.sideBarWidth;
           }
         }
+        if(this.$refs.main){
+          this.listHeight=this.$refs.main.offsetHeight;
+          if(this.$refs.detail){
+            if(this.$refs.detail.$children && this.$refs.detail.$children.length>0){
+              this.$refs.detail.$children[0].refreshPage(this.listHeight);
+            }
+          }
+        }
       },
       showTitleHandler() {
         if (this.$refs.table.model && this.$refs.table.model.flagShowTitle) {
@@ -235,6 +257,9 @@
 
           if(this.$refs.table.model.rowSelectRouter){
             this.sideBarApi=this.$refs.table.model.rowSelectRouter.action;
+            this.sideBarSearchConditionApi=this.$refs.table.model.rowSelectRouter.actionForSearchLayout;
+            this.sideBarSearchStatsApi=this.$refs.table.model.rowSelectRouter.actionForSearchStats;
+            this.sideBarSearchDataApi=this.$refs.table.model.rowSelectRouter.actionForSearch;
             this.sideBarPageType=this.$refs.table.model.rowSelectRouter.actionSource;
           }
           else{
@@ -273,6 +298,7 @@
           this.searchWidth=0;
         }
         this.$emit('tableLoaded', this.$refs.table.model);
+        this.$emit('loaded', this.$refs.table.model);
       },
       rowClickHandle() {
         var self = this;
@@ -326,6 +352,14 @@
         window.localStorage.setItem(this.sideBarPageType+"key", this.sideBarStatus);
         this.$refs.table.setTableHeight();
       },
+      refreshPage(pageHeight) {
+        if(pageHeight){
+          this.pageHeightReal=pageHeight+'px';
+        }
+        if(this.$refs.table){
+          this.$refs.table.setTableHeight();
+        }
+      },
       closeSideHandler() {
         this.$refs.sideMenu.clickHandler();
       },

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -458,6 +458,8 @@ export default {
           {
             var submitData={'columnName':col.id,columnWidth:col.width}
             self.model.getAction(self.model.columnWidthSaveAction, submitData);
+          }else if(!self.model.columnWidthSaveAction){
+            window.localStorage.setItem(self.model.title+"_"+ col.id, col.width);
           }
 
           //如果是高度可变的列，重新计算整个表的高度
@@ -512,7 +514,7 @@ export default {
         document.addEventListener("mousemove", MouseMoveHandle, false);
       }
     },
-    getPage(index) {      
+    getPage(index,flagRefreshRowHandle) {      
       var self = this;
       if (typeof self.$refs.tableParent !== "undefined") {
         self.$refs.tableParent.scrollTop = 0;
@@ -522,6 +524,9 @@ export default {
       }
       var next = function (rtn) {
         if (rtn) {
+          if(flagRefreshRowHandle){
+            self.$emit('refreshRowHandle');
+          }
           self.$forceUpdate();
           self.$nextTick(() => {
             if (self.$refs.tableParent && self.$refs.tableParent.scrollHeight <= self.$refs.tableParent.offsetHeight) {
@@ -693,7 +698,7 @@ export default {
           var h6 = this.$refs.listFooter.$el.offsetHeight | 0;
           var h7 = this.$refs.tableStats ? (this.$refs.tableStats.$el.offsetHeight + 7) | 0 : 0;
           var h8 = this.$refs.popupButton ? this.$refs.popupButton.offsetHeight + 21 : 0;
-          let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 - 22;
+          let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 - 8;
           this.model.tableHeight = tableHeight < 40 ? 350 : tableHeight;
           this.$nextTick(() => {
             self.getScrollAttr();
@@ -733,6 +738,8 @@ export default {
             let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 - 290 -7;
             if(this.flagAppMode){
               tableHeight = tableHeight + 40;
+            }else{
+              tableHeight = tableHeight  - 40;
             }
             if (h2 == 0) {
               tableHeight = tableHeight + 15;
@@ -1186,6 +1193,7 @@ export default {
                       height: field.dialogHeight + "px",
                       documentHeight: self.documentHeight,
                       documentWidth: self.documentWidth,
+                      flagScroll:true,
                     },
                     on: {
                       submit(ev) {
@@ -1368,7 +1376,6 @@ export default {
     routerCellClickHandler(field, submitData, action, rowindex, forname, forrowindex) {
       let self = this;
       action = action || field.action;
-
       var clickAcion = function () {
         //若不是客户端方法，则直接访问接口
         if (!field.isClientFuntion) {
@@ -1486,6 +1493,7 @@ export default {
                       showTitle: false,
                       width: field.dialogWidth + "px",
                       height: field.dialogHeight + "px",
+                      flagScroll:true,
                     },
                     on: {
                       submit(ev) {
@@ -1573,6 +1581,16 @@ export default {
                   self.model.currentCallTelrouter = "router" + forname + forrowindex;
                   self.callTelClick(self.$refs["layout" + rowindex][0], data, forname, forrowindex);
                 }
+                else {
+                  if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
+                    self.model.doAction({ responseData: data });
+                    self.$emit("refreshRowHandle");
+                  }
+                  self.$forceUpdate();
+                  self.tableComplate = true;
+                  self.updateCurrentRow(field, data);
+                  self.tableComplate = false;
+                }
               });
             }
           }
@@ -1732,10 +1750,7 @@ export default {
       }
 
       //合并行
-      if (
-        row.$rowspan !== 0 &&
-        this.model.rowMergedColumns.indexOf(column.id) > -1
-      ) {
+      if ( row.$rowspan !== 0 && this.model.rowMergedColumns.indexOf(column.id) > -1 ) {
         return row.$rowspan;
       }
 
@@ -1747,10 +1762,7 @@ export default {
       }
 
       //合并行
-      if (
-        row.$rowspan === 0 &&
-        this.model.rowMergedColumns.indexOf(column.id) > -1
-      ) {
+      if ( row.$rowspan === 0 && this.model.rowMergedColumns.indexOf(column.id) > -1) {
         return false;
       }
 
@@ -1774,7 +1786,7 @@ export default {
       self.model.searchStats = m;
       if (flagRefreshTable) {
         self.disabledStats=true;
-        self.getPage(1);
+        self.getPage(1,true);
       }
     },
     getRowRouterShow(row) {
@@ -2108,7 +2120,7 @@ export default {
   border-color: #faecd8;
   width: 100%;
   box-shadow: 0 2px 10px 0 rgb(0 0 0 / 10%);
-  margin-bottom: 8px;
+  margin-bottom: 4px;
 }
 .theadLine {
             position: relative;

package/src/centaline/dynamicSeg/src/dynamicSeg.vue

@@ -2,7 +2,7 @@
   <div class="field-top">
     <div style="width:100%;display:flex" v-if="model !== null" class="ct-Seg" :class="[model.attrs.size?'ct-Seg-'+model.attrs.size:'']">
       <div style="flex:1;" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
-        <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
+        <div v-if="model.showLabel && model.label" class="el-input-group__prepend Seg-line-feed" :class="[model.labelClass]">
           {{model.label}}
         </div>
         <div class="ct-radios" :class="[model.showLabel?'showLabel':'',model.value !== ''?'hasValue':'']">
@@ -132,4 +132,8 @@
   .ct-Seg .ct-radios .ct-Seg-label {
     margin-right: 15px;
   }
+  .ct-form .ct-Seg .Seg-line-feed {
+    word-wrap: break-word;
+  white-space: normal;
+}
 </style>

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

@@ -30,6 +30,26 @@ const CellLayout = function (source, actionRouter,rowdata, forname, forrowindex)
         return '0';
       }
       else {
+        if (typeof source.visibility !== "undefined") {
+          if (source.visibility.indexOf('!=') > -1) {
+            var str = source.visibility.split('!=')
+            if ((',' + str[1] + ',').indexOf(',' + str[0] + ',') > -1) {
+              return '0';
+            }
+            else {
+              return '1';
+            }
+          }
+          else if (source.visibility.indexOf('=') > -1) {
+            var str = source.visibility.split('=')
+            if ((',' + str[1] + ',').indexOf(',' + str[0] + ',') > -1) {
+              return '1';
+            }
+            else {
+              return '0';
+            }
+          }
+        }
         return source.visibility;
       }
     },
@@ -191,9 +211,6 @@ const CellLayout = function (source, actionRouter,rowdata, forname, forrowindex)
           self._styleObject.backgroundImage = 'linear-gradient(' + source.gradientColor.replace(/-/g, ",") + ')';
         }
       }
-      if (typeof source.visibility !== 'undefined') {
-        self._styleObject.visibility = source.visibility;
-      }
       if (typeof source.weight !== 'undefined') {
         self._styleObject.flex = source.weight;
       }

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

@@ -0,0 +1,208 @@
+import base from '../../index';
+import Base from './Base';
+import LibFunction from './lib/LibFunction';
+import Router from './Router';
+import Enum from './lib/Enum';
+
+const Container = function (source, sourceParent) {
+  var rtn = {
+    get label() {
+      let l = '';
+      if (source.controlLabel) {
+        l = source.controlLabel;
+      }
+      if (source.labelDelimiter) {
+        l = l + source.labelDelimiter;
+      }
+      return l;
+    },
+    isChanged: false,
+    set label(v) {
+      source.controlLabel = v;
+    },
+    _buttons: null,
+    get buttons() {
+      if (rtn._buttons !== null) {
+        return rtn._buttons;
+      }
+      else {
+        rtn._buttons = [];
+        if (sourceParent.buttons) {
+          sourceParent.buttons.forEach((v) => {
+            var button = Router(v);
+            button.is = "ct-btn";
+            rtn._buttons.push(button);
+          });
+        }
+        return rtn._buttons;
+      }
+    },
+    _links: null,
+    get links() {
+      if (rtn._links !== null) {
+        return rtn._links;
+      }
+      else {
+        rtn._links = [];
+        if (sourceParent.links) {
+          sourceParent.links.forEach((v) => {
+            var button = Router(v);
+            button.is = "ct-btn";
+            if (button.show) {
+              rtn._links.push(button);
+            }
+          });
+        }
+        return rtn._links;
+      }
+    },
+    _actionRouters: null,
+    get actionRouters() {
+      if (rtn._actionRouters !== null) {
+        return rtn._actionRouters;
+      }
+      else {
+        rtn._actionRouters = [];
+        if (sourceParent.actionRouters) {
+          sourceParent.actionRouters.forEach((v) => {
+            var button = Router(v);
+            button.is = "ct-btn";
+            rtn._actionRouters.push(button);
+          });
+        }
+        return rtn._actionRouters;
+      }
+    },
+    getFormObj() {
+      var rtnFormObj = {};
+      rtn.fields.forEach((f) => {
+        if (typeof f.id !== 'undefined') {
+          Object.assign(rtnFormObj, f.getFormObj());
+        }
+      });
+      return rtnFormObj;
+    },
+    _compoundfieldsDic: null,//字典，方便取值
+    get compoundfieldsDic() {
+      if (rtn._compoundfieldsDic !== null) {
+        return rtn._compoundfieldsDic;
+      }
+      rtn._compoundfieldsDic = {};
+      if (source.compoundFields) {
+        source.compoundFields.forEach((f) => {
+          let item = LibFunction.GetControl(f, sourceParent, false, false);
+          rtn._compoundfieldsDic[item.id] = item;
+        });
+      }
+      return rtn._compoundfieldsDic;
+    },
+    _fields: null,//数组，方便遍历 
+    get fields() {
+      if (rtn._fields !== null) {
+        return rtn._fields;
+      }
+      let Index = 0;
+      rtn._fields = [];
+      source.compoundFields.forEach((v) => {
+        Index++;
+        let showLabel = true;
+        let item = LibFunction.GetControl(v, sourceParent, showLabel, false);
+        if (item instanceof Object) {
+          item.width = v.width;
+          item.form = rtn;
+          if (Index == 1 && item.label == "") {
+            item.label = rtn.label;
+          }
+          rtn.hiddenHandle(item);//是否隐藏关联组件
+          rtn._fields.push(item);
+        }
+      });
+      rtn.allRequiredHandle();//必填关联组件
+      return rtn._fields;
+    },
+    //隐藏关联组件
+    hiddenHandle(item, update) {
+      if (item.id) {
+        let sign = false;
+        let field = null;
+
+        for (var i in source.compoundFields) {
+          if (source.compoundFields[i].hiddenRelationField === item.id) {
+            field = source.compoundFields[i];
+            if (field) {
+              let hiddenValueArr = field.hiddenRelationFieldValue.split(',');
+              if (hiddenValueArr.indexOf(item.code1) > -1) {
+                field.show = false;
+              }
+              else {
+                field.show = true;
+              }
+              sign = true;
+
+              if (update && rtn.self && sign) {
+                rtn.self.$forceUpdate();
+              }
+            }
+          }
+        }
+
+      }
+    },
+    //验证必填关联组件
+    validMrf(item) {
+      let field = rtn.fields[item.mrf];
+
+      if (field && field.self) {
+        if (field.type === Enum.ControlType.List) {
+          //f.required = '0';
+        }
+        else {
+          field.self.validExcute();
+        }
+      }
+    },
+    allRequiredHandle() {
+      rtn.fields.forEach(v => {
+        rtn.requiredHandle(v, null, false);
+      });
+    },
+    //处理必填关联组件
+    requiredHandle(item, update, doMrf) {
+      if (item.id) {
+        let field = null;
+        for (var i in source.compoundFields) {
+          if (source.compoundFields[i].requiredRelationField === item.id) {
+            field = source.compoundFields[i];
+            let f = rtn.compoundfieldsDic[field.fieldName1];
+
+            if (field) {
+              let hiddenValueArr = field.requiredRelationFieldValue.split(',');
+              if (hiddenValueArr.indexOf(item.value) > -1) {
+                field.required = true;
+              }
+              else {
+                field.required = false;
+              }
+
+              if (f && f.self && f.self.$forceUpdate) {
+                f.self.$forceUpdate();
+              }
+
+              if (update && rtn.self) {
+                rtn.self.$forceUpdate();
+              }
+            }
+          }
+        }
+
+        if (doMrf !== false) {
+          rtn.validMrf(item);
+        }
+      }
+    },
+   
+  };
+  rtn = base.copy(Base(source), rtn);
+  return rtn;
+};
+export default Container;

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

@@ -55,6 +55,13 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
                 });
               }
             }
+            // else if (f.type == Enum.ControlType.ContainerControl) {
+            //   if (f.compoundFields) {
+            //     f.compoundFields.forEach((v) => {
+            //       rtn._fieldsDic[v.id] = v;
+            //     });
+            //   }
+            // }
             rtn._fieldsDic[f.id] = f;
           });
         }
@@ -774,6 +781,11 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         parentFieldNameArr.forEach((v) => {
           let vs=v.split('.');
           submitData[vs[vs.length-1]] = tempFormData[v];
+          if(submitData[vs[vs.length-1]]==undefined){
+            if(rtn.self && rtn.self.parentModelForm){
+              submitData[vs[vs.length-1]] = rtn.self.parentModelForm.getFormObj()[v];
+            }
+          }
         });
         
         if(JSON.stringify(submitData) == "{}"){

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

@@ -376,10 +376,11 @@ const FormList = function (source, master) {
                   "text": "提交",
                   "buttonType": Enum.ButtonType.Submit
                 }
-              ]
+              ],
             },
             width: rtn.pageWidth+'px',
-            height: rtn.pageHeight+'px'
+            height: rtn.pageHeight+'px',
+            parentModelForm:self.$self.parentModel,
           },
           on: {
             submit: function (ev) {
@@ -452,7 +453,8 @@ const FormList = function (source, master) {
               ]
             },
             width: rtn.pageWidth+'px',
-            height: rtn.pageHeight+'px'
+            height: rtn.pageHeight+'px',
+            parentModelForm:self.$self.parentModel,
           },
           on: {
             submit: function (ev) {

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

@@ -23,6 +23,9 @@ const Router = function (source) {
     get actionForSearch() {
       return source.actionForSearch;
     },
+    get actionForSearchStats() {
+      return source.actionForSearchStats;
+    },
     get actionSource() {
       return source.actionSource;
     },

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

@@ -56,6 +56,14 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
 
             source.content.columns.forEach((v) => {
               v.columnWidth = v.columnWidth ? v.columnWidth : 'auto';
+              var colWidth ;
+              if (!self.columnWidthSaveAction) {
+                colWidth =window.localStorage.getItem(self.title+"_"+ common.initialsToLowerCase(v.fieldName)) ;
+                colWidth =colWidth ? colWidth : v.columnWidth;
+                  v.columnWidth = colWidth;
+              }
+              
+
               var col = {
                 fixedSize: 0,
                 get source() {
@@ -788,7 +796,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                 let rowMerged = rtn.rowMergedColumns[j];
                 if (row[rowMerged] === rtn._lastRowspan[rowMerged]) {
                   equalNum++;
-                } else {
+                } 
+                else {
                   break;
                 }
               }
@@ -797,11 +806,13 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               if (equalNum === rtn.rowMergedColumns.length) {
                 row.$rowspan = 0;
                 rtn._lastRowspan.$rowspan++;
-              } else {
+              } 
+              else {
                 row.$rowspan = 1;
                 rtn._lastRowspan = row;
               }
-            } else {
+            } 
+            else {
               row.$rowspan = 1;
               rtn._lastRowspan = row;
             }
@@ -845,9 +856,6 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             }
 
             source.page.rows = source.page.rows - deleteRow.length;
-            if (rtn.cellLayout) {
-              rtn.$vue.$delete(rtn.listData, rtn.selectIndex);
-            }
             break;
 
           case Enum.ActionType.New: //新增

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

@@ -240,15 +240,22 @@ const Enum = {
     /// 表单
     /// </summary>
     From: 49,
+
     /// <summary>
     ///  列表的的自定义列
     /// </summary>
     CustomizeColumns: 50,
+
     /// <summary>
     ///  分片上传
     /// </summary>
     SliceUpload: 51,
 
+    /// <summary>
+    ///  容器控件（包含一组 Field ，显示容器样式 布局遵循表单的几列布局模式）
+    /// </summary>
+    ContainerControl: 52,
+
   },
 
   //返回状态码

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

@@ -36,7 +36,7 @@ import Repeat from '../Repeat';
 import Compound from '../Compound';
 import RichText from '../RichText';
 import DragSort from '../DragSort';
-
+import Container from '../Container';
 
 
 const LibFunction = {
@@ -237,6 +237,10 @@ const LibFunction = {
         item = Compound(field, source);
         item.is = 'ct-compound';
         break;
+      case Enum.ControlType.ContainerControl: //容器控件
+        item = Container(field, source);
+        item.is = 'ct-container';
+        break;
       case Enum.ControlType.Hidden: //隐藏控件
         item = Hd(field);
         break;