centaline-data-driven 1.2.71 → 1.2.74

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

@@ -20,20 +20,21 @@
          @scroll="scrollHandle($event)" :v-focus="model.flagFocus"
          @keydown.up="rowKeyDownHandle($event,0)" @keydown.down="rowKeyDownHandle($event,1)"
          tabindex="-1">
-      <div class="ct-table-content">
+      <div class="ct-table-content" v-if="!isLayout">
         <table border="0" cellpadding="0" cellspacing="0"
                :class="['ct-table',model.attrs.size?'ct-table-'+model.attrs.size:'']">
           <!--表头-->
           <thead ref="tableHead">
             <tr class="ct-tr" ref="headTr" v-for="(columns,columnsIndex) in model.columnsArr" :key="columnsIndex">
               <th v-if="model.isMulti && columnsIndex === 0" ref="headLeftThs" class="ct-td left-fixation-th checkbox-td" :class="[model.tdClass]">
-                <label class="el-checkbox"><span class="el-checkbox__input" :class="model.selectAllType">
-                  <span class="el-checkbox__inner"></span>
-                  <input type="checkbox" @click="selectAll($event)" v-model="model.selectAll" class="el-checkbox__original checkbox-td-1" aria-hidden="false" />
+                <label class="el-checkbox">
+                  <span class="el-checkbox__input" :class="model.selectAllType">
+                    <span class="el-checkbox__inner"></span>
+                    <input type="checkbox" @click="selectAll($event)" v-model="model.selectAll" class="el-checkbox__original checkbox-td-1" aria-hidden="false" />
                   </span>
                 </label>
               </th>
-              <th :ref="column.fixed?(column.fixed==='left'?'headLeftThs':'headRightThs'):'headThs'" 
+              <th :ref="column.fixed?(column.fixed==='left'?'headLeftThs':'headRightThs'):'headThs'"
                   v-for="(column,colIndex) in columns" :key="colIndex"
                   v-if="column.show" class="ct-td ct-searchtable-th"
                   :rowspan="column.rowspan"
@@ -55,8 +56,8 @@
               </th>
 
               <!--<th v-if="model.rowRouter.length > 0" class="ct-td tdFiexd" :class="[-1 === rightShadow?'shadowRight':null]" :style="{'min-width':'20px','transform':'translate('+scrollRight+'px, '+scrollTop+'px)'}">
-                操作
-              </th>-->
+            操作
+          </th>-->
             </tr>
           </thead>
           <!--表体-->
@@ -68,11 +69,12 @@
                 class="ct-tr"
                 :style="row.$style">
               <td v-if="model.isMulti" class="ct-td tdFiexd left-fixation checkbox-td" :class="[model.tdClass]" align="center">
-                <label v-if="!model.rightMulti || row[model.rightMulti] == 1" class="el-checkbox is-checked"><span class="el-checkbox__input" :class="rowCheckClass(row)">
-                 <span class="el-checkbox__inner"></span>
-                 <input  type="checkbox" v-model="row.$select" @change="selectOne($event)" class="el-checkbox__original checkbox-td-1" />
-                </span>
-              </label>
+                <label v-if="!model.rightMulti || row[model.rightMulti] == 1" class="el-checkbox is-checked">
+                  <span class="el-checkbox__input" :class="rowCheckClass(row)">
+                    <span class="el-checkbox__inner"></span>
+                    <input type="checkbox" v-model="row.$select" @change="selectOne($event)" class="el-checkbox__original checkbox-td-1" />
+                  </span>
+                </label>
               </td>
               <td :ref="column.fixed?(column.fixed==='left'?'headLeftTds':'headRightTds'):null"
                   v-for="(column,colIndex) in model.dataFieldcolumns" :key="colIndex"
@@ -88,17 +90,17 @@
                   v-bind="column.attrs">
                 <!--操作列-->
                 <div v-if="column.id==='operation'" class="div_allinline" :class="column.autoRowHeight ? 'lineFeedCell':'cell'">
-                  <ct-tablecurrency v-for="(router,rowRouterIndex) in getRowRouterShow(row)" :key="rowRouterIndex" 
-                    v-if="!router.rightField || row[router.rightField] == 1" :isOperationalColumn="true"
-                    :router="router" :colValue="router.label" :rowData="row" @click="rolRouterClickHandler">
+                  <ct-tablecurrency v-for="(router,rowRouterIndex) in getRowRouterShow(row)" :key="rowRouterIndex"
+                                    v-if="!router.rightField || row[router.rightField] == 1" :isOperationalColumn="true"
+                                    :router="router" :colValue="router.label" :rowData="row" @click="rolRouterClickHandler">
                   </ct-tablecurrency>
                   <el-popover v-if="getRowRouterDisplay(row).length>0" :ref="'popover'+rowindex" :append-to-table="option.appendId?option.appendId:''" class="Stats-popover" popper-class="el-popover1"
-                    :placement="option.placement?option.placement:'left'" 
-                    :trigger="option.trigger?option.trigger:''">
+                              :placement="option.placement?option.placement:'left'"
+                              :trigger="option.trigger?option.trigger:''">
                     <div class="tab-list" style="border-bottom:none">
-                      <ct-tablecurrency v-for="(router,rowRouterIndex) in getRowRouterDisplay(row)" :key="rowRouterIndex" 
-                        v-if="!router.rightField || row[router.rightField] == 1" :isOperationalColumn="true" :isShowImg="false" :rowindex="rowindex"
-                        :router="router" :colValue="router.label" :rowData="row" @click="rolRouterClickHandler">
+                      <ct-tablecurrency v-for="(router,rowRouterIndex) in getRowRouterDisplay(row)" :key="rowRouterIndex"
+                                        v-if="!router.rightField || row[router.rightField] == 1" :isOperationalColumn="true" :isShowImg="false" :rowindex="rowindex"
+                                        :router="router" :colValue="router.label" :rowData="row" @click="rolRouterClickHandler">
                       </ct-tablecurrency>
                     </div>
                     <span :slot="getRowRouterDisplay(row).length>0?'reference':''" class="icon-more"></span>
@@ -112,7 +114,7 @@
 
 
                 <!--正常的列-->
-                <div v-else-if="column.flagHtml" v-html="row[column.id]" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" :style="column.style ? column.style:''">                  
+                <div v-else-if="column.flagHtml" v-html="row[column.id]" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" :style="column.style ? column.style:''">
                 </div>
                 <div v-else-if="typeof column.template === 'undefined'" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" :style="column.style ? column.style:''">
                   {{row[column.id]}}
@@ -120,10 +122,10 @@
 
                 <!--模版列(启用)-->
                 <!--<component v-else :is="column.template(row).component" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" :vmodel="column.template(row)" :style="{'width': column.width + 'px'}">
-                  <template slot="value">
-                    {{row[column.id]}}
-                  </template>
-                </component>-->
+              <template slot="value">
+                {{row[column.id]}}
+              </template>
+            </component>-->
               </td>
             </tr>
             <!--适配滚动条-->
@@ -131,9 +133,12 @@
           </tbody>
         </table>
       </div>
+      <div v-else>
+        <ct-layout ref="CellLayout" :vmodel="model.source.content"></ct-layout>
+      </div>
     </div>
-    <ct-tabletip ref="listFooter" class="ct-search-table-list-footer" :tip="model.listFooter" v-if="!isLoading"></ct-tabletip>
-    <ct-tabletip ref="footer" class="ct-search-table-footer" :tip="model.footer" v-if="!isLoading"></ct-tabletip>
+    <ct-tabletip ref="listFooter" class="ct-search-table-list-footer" :tip="model.listFooter" v-if="!isLoading&&!isLayout"></ct-tabletip>
+    <ct-tabletip ref="footer" class="ct-search-table-footer" :tip="model.footer" v-if="!isLoading&&!isLayout"></ct-tabletip>
     <div v-if="isLoading && searchLoading" v-loading="isLoading" style="top:30px;">
     </div>
   </div>
@@ -143,13 +148,15 @@
   import dynamicTableTip from './dynamicTableTip.vue';
   import dynamicTableToolbar from './dynamicTableToolbar.vue';
   import dynamicTableStats from './dynamicTableStats.vue';
+  import dynamicLayout from '../../dynamicLayout/src/dynamicLayout.vue';
   export default {
     name: 'ct-searchtable',
     mixins: [dynamicElement],
     components: {
       'ct-tabletip': dynamicTableTip,
       'ct-tabletoolbar': dynamicTableToolbar,
-      'ct-tableStats': dynamicTableStats
+      'ct-tableStats': dynamicTableStats,
+      'ct-layout': dynamicLayout
     },
     props: {
       vmodel: Object,
@@ -171,6 +178,7 @@
       return {
         currentTh: null,
         isLoading: true,
+        isLayout: false,
         searchLoading: true,
         tableLoading: false,//表格等待
         operationLoading: false,//操作等待
@@ -229,7 +237,9 @@
             self.colHasWidth[vi] = 'nowidth';
           }
         });
-
+        if (typeof self.model.cellLayout !== 'undefined') {
+          self.isLayout = true;
+        }
         self.isLoading = false;
         self.$forceUpdate();
         this.model.scripts.formData = this.model.formData;
@@ -253,7 +263,7 @@
           window.addEventListener("resize", (ev) => {
             self.setTableHeight();
           });
-          //self.rowColorChange();
+          self.rowColorChange();
           self.fiexdHead();
 
           //当表格没有占满表格框时，主动请求下一页
@@ -520,22 +530,35 @@
       setTableHeight() {
         var self = this;
         this.$nextTick(() => {
-          if (this.$refs.searchTable && this.$refs.toolbar && this.$refs.searchTable.parentElement) {
+          if (this.$refs.searchTable && this.$refs.toolbar && this.$refs.searchTable.parentElement && !self.isLayout) {
             var h1 = this.$refs.searchTable.parentElement.offsetHeight | 0;
             var h2 = this.$refs.searchTable.offsetTop | 0;
             var h3 = this.$refs.toolbar.$el.offsetHeight | 0;
             var h4 = this.$refs.footer.$el.offsetHeight | 0;
             var h5 = this.$refs.listHeader.$el.offsetHeight | 0;
             var h6 = this.$refs.listFooter.$el.offsetHeight | 0;
-            var h7 =  this.$refs.tableStats?(this.$refs.tableStats.$el.offsetHeight+7 | 0):0;
-            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7-22;
+            var h7 = this.$refs.tableStats ? (this.$refs.tableStats.$el.offsetHeight + 7 | 0) : 0;
+            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - 22;
             this.model.tableHeight = tableHeight < 40 ? 350 : tableHeight;
             this.$nextTick(() => {
               self.getScrollAttr();
             });
           }
+          else {
+            var h1 = document.body.offsetHeight | 0;
+            if (this.$parent.$parent.$vnode.componentOptions.tag === 'ct-PropertySimpleDetailRET') {
+              var h2 = this.$parent.$parent.$refs.contact.offsetHeight | 0;
+              var h3 = this.$parent.$parent.$refs.title.offsetHeight | 0;
+              let tableHeight = h1 - h2-h3 - 300;
+              this.model.tableHeight = tableHeight;
+              this.$nextTick(() => {
+                self.getScrollAttr();
+              });
+            }
+
+          }
         });
-      },
+      },      
       scrollHandle(ev) {
         var self = this;
         if ((this.$refs.tableParent.scrollTop + this.$refs.tableParent.clientHeight) >= (this.$refs.tableParent.scrollHeight - 5)) {
@@ -817,12 +840,12 @@
           else {
             // let parm={submitData:submitData,field:field}
             // self.$common.excuteFunStr.call(self.model.scripts, field.action,parm);
+            // var fun = self.model.scripts.formData[action];
+            // fun(submitData,field);
             let title = field.pageTitle == undefined ? field.label : field.pageTitle;
             submitData.actionType = field.actionType;
             var fun = self.$common.getDataDrivenOpts().handler[action];
-            fun(submitData, title, self.model);
-            // var fun = self.model.scripts.formData[action];
-            // fun(submitData,field);
+            fun(submitData, title, self.$parent);
           }
         }
 

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

@@ -176,6 +176,10 @@
 </style>
 
 <style>
+.ct-table-Statistics{
+  height: 20px;
+  margin-bottom: 10px;
+}
   .tab-list {
     position: relative;
     margin-bottom: 10px;

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -67,6 +67,8 @@
       },
       clearClickHandle: function (event) {
         this.model.value = '';
+        this.inputHandler(this.model.value);
+        this.changeHandler(this.model.value);
         this.isShowClear();
         event.stopPropagation();
       },

package/src/centaline/formData/index.js

@@ -73,6 +73,7 @@ const formData = {
             }
         }
     },
+
     //获取列表数据
     get excuteListData() {
         if (this._excuteListData) {
@@ -183,7 +184,7 @@ const formData = {
         attrName = attrName ? attrName : 'code1';
 
         if (!fiedlId) {
-        fiedlId = data.listData.currentEventField.id;
+            fiedlId = data.listData.currentEventField.id;
         }
         if (fiedlId && !rowNum && fiedlId === data.listData.currentEventField.id) {
         //data.field = data.listData.currentEventField;
@@ -191,32 +192,32 @@ const formData = {
         rowNum = rowNum ? rowNum : data.listData.currentRowIndex;
 
         if (data) {
-        if (data.field) {
-            data.field.source[attrName] = value;
-            data.listData.updateListField(data.listData.refFieldsLabel, rowNum, fiedlId);
-        }
-        //data.field.self.$forceUpdate();
-
-        //正在编辑的行
-        if (data.listData.currentRow.data && data.listData.currentRow.data[fiedlId] && data.listData.currentRow.data.$sourceIndex === rowNum) {
-            let currentField = data.listData.currentRow.data[fiedlId];
-            currentField.source[attrName] = value;
-            //校验自己
-            if (currentField.self && currentField.self.validExcute) {
-            currentField.self.validExcute();
+            if (data.field) {
+                data.field.source[attrName] = value;
+                data.listData.updateListField(data.listData.refFieldsLabel, rowNum, fiedlId);
             }
-            if (typeof currentField.self.$forceUpdate === "function") {
-            currentField.self.$forceUpdate();
+            //data.field.self.$forceUpdate();
+
+            //正在编辑的行
+            if (data.listData.currentRow.data && data.listData.currentRow.data[fiedlId] && data.listData.currentRow.data.$sourceIndex === rowNum) {
+                let currentField = data.listData.currentRow.data[fiedlId];
+                currentField.source[attrName] = value;
+                //校验自己
+                if (currentField.self && currentField.self.validExcute) {
+                    currentField.self.validExcute();
+                }
+                if (typeof currentField.self.$forceUpdate === "function") {
+                    currentField.self.$forceUpdate();
+                }
             }
-        }
 
-        //如果有汇总列，触发重新计算汇总
-        if (data.listData.showSummary) {
-            data.listData.tableData.push({});
-            data.listData.tableData.pop();
-        }
+            //如果有汇总列，触发重新计算汇总
+            if (data.listData.showSummary) {
+                data.listData.tableData.push({});
+                data.listData.tableData.pop();
+            }
 
-        return true;
+            return true;
         }
         return false;
     },
@@ -227,6 +228,28 @@ const formData = {
         });
         listData[attrName] = attrValue
     },
+    //新增表格数据
+    insertRow(tableId,rows) {    
+        let listData = this.excuteListData.find((v) => {
+            return v.id === tableId;
+        });
+        listData.insertRow(rows);
+    },
+    //新增或替换表格数据
+    insertOrUpdateRow(tableId,row) {    
+        let listData = this.excuteListData.find((v) => {
+            return v.id === tableId;
+        });
+        listData.insertOrUpdateRow(row);
+    },
+    //清空表格数据
+    clear(tableId) {
+        let listData = this.excuteListData.find((v) => {
+            return v.id === tableId;
+        });
+        listData.deleteAll();
+    },
+
     //获取后台数据，并返回脚本。
     execServerScript(action, object, successCallback) {
         let formData = this;//作用域保存
@@ -276,11 +299,6 @@ const formData = {
         showClose: showClose,//是否显示关闭按钮
         });
     },
-    //打开商铺房源详情页
-    openPropertyDetailRET(parm){
-        let title=parm.field.pageTitle==undefined ?parm.field.label:parm.field.pageTitle;
-        common.getDataDrivenOpts().handler.openPropertyDetailRET(parm.submitData, title,this.form);
-    },
 };
 
 if (typeof window !== 'undefined' && window.Vue) {

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

@@ -38,6 +38,9 @@ const Button = function (source, router) {
     },
     icon:'',
   };
+  if(router){
+    rtn=base.copy(rtn,router);
+  }
   rtn = base.copy(Base(source), rtn);
   return rtn;
 }

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

@@ -0,0 +1,135 @@
+import Vue from 'vue';
+import Enum from './lib/Enum';
+import common from '../../../common';
+const CellLayout = function (source, callBack, apiParam, failCallBack) {
+  var init = function (source) {
+    var rtn = source;
+    var _styleObject = {};
+    if (typeof source.fontWeight !== 'undefined') {
+      _styleObject.fontWeight = source.fontWeight;
+    }
+    if (typeof source.fontSize !== 'undefined') {
+      _styleObject.fontSize = source.fontSize + "px";
+    }
+    if (typeof source.textColor !== 'undefined') {
+      _styleObject.color = source.textColor;
+    }
+    if (typeof source.textColor !== 'undefined') {
+      _styleObject.color = source.textColor;
+    }
+    if (typeof source.margin !== 'undefined') {
+      _styleObject.margin = source.margin.replace(/\s+/g, "px ") + 'px';
+    }
+    if (typeof source.marginTop !== 'undefined') {
+      _styleObject.marginTop = source.marginTop + "px";
+    }
+    if (typeof source.marginLeft !== 'undefined') {
+      _styleObject.marginLeft = source.marginLeft + "px";
+    }
+    if (typeof source.marginRight !== 'undefined') {
+      _styleObject.marginRight = source.marginRight + "px";
+    }
+    if (typeof source.marginBottom !== 'undefined') {
+      _styleObject.marginBottom = source.marginBottom + "px";
+    }
+    if (typeof source.padding !== 'undefined') {
+      _styleObject.padding = source.padding.replace(/\s+/g, "px ") + 'px';
+    }
+    if (typeof source.paddingTop !== 'undefined') {
+      _styleObject.paddingTop = source.paddingTop + "px";
+    }
+    if (typeof source.paddingLeft !== 'undefined') {
+      _styleObject.paddingLeft = source.paddingLeft + "px";
+    }
+    if (typeof source.paddingRight !== 'undefined') {
+      _styleObject.paddingRight = source.paddingRight + "px";
+    }
+    if (typeof source.paddingBottom !== 'undefined') {
+      _styleObject.paddingBottom = source.paddingBottom + "px";
+    }
+    if (typeof source.width !== 'undefined') {
+      if (source.width == "0") {
+        _styleObject.width = "100%";
+      }
+      else if (source.width == "-1") {
+
+      }
+      else {
+        _styleObject.width = source.width + "px";
+        _styleObject.flex = "0 0 "+source.width + "px";
+      }
+    }
+    if (typeof source.height !== 'undefined') {
+      if (source.height == "0") {
+        _styleObject.height = "100%";
+      }
+      else if (source.height == "-1") {
+      }
+      else {
+        _styleObject.height = source.height + "px";
+      }
+    }
+    if (typeof source.background !== 'undefined') {
+      _styleObject.background = source.background;
+    }
+    if (typeof source.textAlign !== 'undefined') {
+      _styleObject.textAlign = source.textAlign;
+    }
+    if (typeof source.textDecoration !== 'undefined') {
+      if (source.textDecoration == "overline") {
+        _styleObject.textDecoration = "line-through";
+      }
+      else {
+        _styleObject.textDecoration = source.textDecoration;
+      }
+    }
+    if (typeof source.borderRadius !== 'undefined') {
+      _styleObject.borderRadius = source.borderRadius + "px";
+    }
+    if (typeof source.borderWidth !== 'undefined') {
+      _styleObject.borderWidth = source.borderWidth + "px";
+    }
+    if (typeof source.borderColor !== 'undefined') {
+      _styleObject.borderColor = source.borderColor;
+    }
+    if (typeof source.valign !== 'undefined') {
+      _styleObject.justifyContent = source.valign;
+    }
+    if (typeof source.align !== 'undefined') {
+      if (source.valign == "bottom") {
+        _styleObject.alignItems = "end"
+      }
+      else {
+        _styleObject.alignItems = source.align;
+      }
+
+    }
+    rtn.styleObject = _styleObject;
+    return rtn;
+  }
+  if (typeof source === 'string') {
+    apiParam = apiParam ? apiParam : {};
+    Vue.prototype.$api.postHandler(common.globalUri(), { "action": source, "para": apiParam }).then(
+      function (response) {
+        if (response.rtnCode === Enum.ReturnCode.Successful) {
+          var data = response.content;
+          var rtn = init(data);
+          if (callBack) {
+            callBack(rtn);
+          }
+        }
+        else {
+          if (failCallBack) {
+            failCallBack();
+          }
+        }
+      }
+    );
+  }
+  else {
+    var data = source;
+    return init(data);
+  }
+};
+
+export default CellLayout;