centaline-data-driven 1.1.33 → 1.1.37

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-loading="loading" style="width:100%">
-    <div v-if="model !== null && !loading" class="ct-form"  :class="{'tableDisabled':model.pageDisabled}">
+    <div v-if="model !== null && !loading" class="ct-form"  :class="{'domDisabled':model.pageDisabled}">
       <!--可根据场景判断显示el-card还是el-main-->
       <component :is="model.showTitle?'el-main':'el-card'">
         <div slot="header" class="clearfix" v-if="typeof model.title !== 'undefined' && model.flagShowTitle">
@@ -523,9 +523,3 @@
     }
   }
 </script>
-<style>
-.tableDisabled {
-    pointer-events: none;
-    opacity:0.4;
-  }
-</style>

package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue

@@ -68,10 +68,8 @@
         this.model.value = '';
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);
-        console.log('clearClickHandle');
       },
       onInputHandler: function (val) {
-
         this.model.value = this.$common.numFloat(this.model.value, this.model.decimals, this.inputOld);//保留n位小数 
         if (this.model.max !== "" && parseFloat(this.model.value) > parseFloat(this.model.max)) {
           this.model.value = this.inputOld;
@@ -79,12 +77,10 @@
 
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);//todo input事件里要不要加这个事件
-        console.log('onInputHandler');
       },
       onChangeHandler: function (val) {
         this.changeHandler(this.model.value);
         this.isShowClear();
-        console.log('onChangeHandler');
       },
       onBlurHandler:function(event){
         this.model.value = this.$common.numToFloat(this.model.value, this.model.decimals);//保留n位小数

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

@@ -3,7 +3,7 @@
       ]">
     <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]">        
-        <img v-if="model.preLabel" :src="model.preLabel" style="width: 1em;height: 1em;fill: currentColor;
+        <img v-if="model.preLabel" :src="model.preLabel" style="width: 1.3em;height: 1.3em;fill: currentColor;
     overflow: hidden;vertical-align: middle;"/>
         {{model.label}}
       </div>
@@ -77,17 +77,18 @@
 }
   .ct-searchcategory .el-input-group__prepend{
     text-align: left;
-    color:#EE6B6B;
+    padding-left: 0px!important;
+    color: #ee6b6b !important;
     font-weight: Bold;
     text-shadow: 0 2px 2px rgb(121 0 4 / 10%);
-    font-size: 20px;
+    font-size: 16px;
     vertical-align: middle;
   }
   .ct-searchcategory .ct-radios {
     color: #606266;
     border-radius: 4px;
     /*border: 1px solid #dcdfe6;*/
-    line-height: 40px;
+    line-height: 30px;
     padding-left: 15px;
     text-align: right;
   }

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

@@ -1,18 +1,18 @@
 <template>
-  <div class="ct-search-list" :style="searchListStyle"> 
+  <div class="ct-search-list" :style="searchListStyle"  :class="{'domDisabled':pageDisabled}"> 
     <div slot="header" class="clearfix" v-if="typeof title !== 'undefined' && showTitle">
           <span style="font-weight:bold">{{title}}</span>
     </div>
     <ct-searchcategory v-if="searchCategoryApi" ref="category" :api="searchCategoryApi"  @loadedCategory="categoryLoaded"
     @changeCategory="categorychange" ></ct-searchcategory>
 
-    <ct-searchscreen ref="screen" :api="searchConditionApi" :key="reloadKey"
+    <ct-searchscreen ref="screen" :api="searchConditionApi" :key="reloadKeyScreen"
     @loaded="screenLoaded" :screenPara="screenPara" 
     :categoryLoaded="loaded.categoryLoaded" @search="search()" 
     @showTitle="showTitleScreenHandler"></ct-searchscreen>
 
     <ct-searchtable ref="table" :api="searchDataApi" :searchDataStatisticsApi="searchDataStatisticsApi" 
-    @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKey"
+    @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate()" 
     @showTitle="showTitleHandler"></ct-searchtable>
   </div>
 </template>
@@ -69,7 +69,10 @@
         showTitle:false,
         screenPara:null,
         reloadKey:0,
+        reloadKeyScreen:'s0',
+        reloadKeyTable:'t0',
         isReload:false,
+        pageDisabled:false,
       }
     },
     methods: {
@@ -86,15 +89,21 @@
       categorychange(param) {
         if(param)this.screenPara=param;
         this.reloadKey = this.reloadKey+1;
+        this.reloadKeyScreen='s'+this.reloadKey;
+        this.reloadKeyTable='t'+this.reloadKey;
       },
       search(btn) {
         if (this.$refs.table.model) {
+          this.pageDisabled=true;
           this.$refs.table.getPage(1);
         }
         else {
           this.$refs.table.searchComplate(this.$refs.screen.model);
         }
       },
+      searchComplate() {
+        this.pageDisabled=false;
+      },
       toolbarClickHandler(field, submitData) {
         if (field.isExport) {
           this.$refs.screen.model.export(field, submitData);

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

@@ -8,7 +8,6 @@
         </template>
         <component v-for="(col, index) in model.btnScreen" :key="index" :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
       </div>
-
       <!--<el-row>
         <el-col v-for="(col, index) in model.screen" :key="index" :span="col.colspan" style="padding:10px" v-if="col.show !== false">
           <component :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
@@ -45,11 +44,14 @@
     props: {
       api: String,
       vmodel: Object,
-      categoryLoaded:Boolean,
+      categoryLoaded:{
+        type:Boolean,
+        default:true
+      },
       screenPara: {
         type: Object,
         default: () => { }
-      }
+      },
     },
     data() {
       return {

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

@@ -169,7 +169,7 @@
     },
     activated() {
       this.$nextTick(() => {
-        this.calculatingRowHeight();
+        // this.calculatingRowHeight();
         this.setTableHeight();
       })
     },
@@ -194,6 +194,8 @@
         });
         self.isLoading = false;
         self.$forceUpdate();
+        this.model.scripts.formData = this.model.formData;
+        this.model.scripts.formData.form = this.model;
 
         self.$emit('loaded');
         self.$emit('showTitle');
@@ -332,6 +334,7 @@
             self.tableLoading = false;
             self.rowColorChange();
           }
+          self.$emit('searchComplate');
         }
         self.tableLoading = true;
         this.model.getPage(index, next);
@@ -526,10 +529,13 @@
               this.currentRow.children[i].classList.remove('select');
             }
           }
-          for (var j = 0; j < this.$refs['rows.' + index][0].children.length; j++) {
-            this.$refs['rows.' + index][0].children[j].classList.add('select');
+          if(this.$refs['rows.' + index][0])
+          {
+            for (var j = 0; j < this.$refs['rows.' + index][0].children.length; j++) {
+              this.$refs['rows.' + index][0].children[j].classList.add('select');
+            }
           }
-          this.currentRow = this.$refs['rows.' + index][0];
+          this.currentRow = this.$refs['rows.' + index][0]||null;
         }
       },
       resetScroll: function () {
@@ -644,7 +650,8 @@
         var clickAcion = function () {
           //若不是客户端方法，则直接访问接口
           if (!field.isClientFuntion) {
-            if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
+            // 外部框架tab页打开
+            if (field.isFormPageInTab || field.isSearchPageInTab) {
               submitData = field.getActionPara(submitData).para;
               if (field.pageStyle) {
                 submitData.pageStyle = field.pageStyle;
@@ -754,8 +761,10 @@
           }
           //执行客户端脚本
           else {
-            var fun = self.$clientScript[action];
-            fun(submitData);
+            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);
           }
         }
 

package/src/centaline/dynamicSensitiveEye/src/dynamicSensitiveEye.vue

@@ -4,12 +4,13 @@
       <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div" :class="[model.labelClass]">
         <span>{{model.label}}</span>
       </div>
-      <span>{{showLable==true?model.labelValue1:model.labelValue}}</span>
-      <i v-if="model.labelValue" class="el-icon-view" @click="onSensitiveEye($event)"></i>
+      <span class="eyelabel">{{showLable==true?model.labelValue1:model.labelValue}}</span>
+      <i v-if="model.labelValue" :class="[!showLable?'el-icon-view':'el-icon-eye']" @click="onSensitiveEye($event)"></i>
     </div>
   </div>
-  
+
 </template>
+
 <script>
   import dynamicElement from '../../mixins/dynamicElement'
   export default {
@@ -33,7 +34,7 @@
       }
     },
     computed: {
-     
+
     },
     methods: {
       onSensitiveEye() {
@@ -54,8 +55,20 @@
   }
 </script>
 <style>
-  .el-icon-view {
+  .el-icon-view, .el-icon-eye {
     margin-left: 5px;
     font-size: 16px;
   }
+  .eyelabel {
+    width:80px;
+  }
+  .el-icon-eye:before {
+    background: url("../../../assets/icon-eye.png") no-repeat;
+    content: '';
+    display: block;
+    width: 16px;
+    height: 16px;
+    font-size: 16px;
+    background-size: 16px;
+  }
 </style>

package/src/centaline/dynamicSw/src/dynamicSw.vue

@@ -65,8 +65,8 @@
   }
   .ct-Sw .ct-radios {
     color: #606266;
-    border-radius: 4px;
-    border: 1px solid #dcdfe6;
+    /* border-radius: 4px; */
+    /* border: 1px solid #dcdfe6; */
     padding-left: 15px;
     padding-bottom: 3px;
     padding-top: 3px;

package/src/centaline/dynamicTree/src/dynamicTreeList.vue

@@ -1,11 +1,11 @@
 <template>
   <div id="app-Tree" style="height:100%;">
-    <el-container style="height:  calc(100vh - 98px);width:100vw; border: 1px solid #eee">
-      <el-aside width="200px" style="background-color:white">
+    <el-container style="height:  calc(100vh - 98px);border: 1px solid #eee">
+      <el-aside width="14%" style="background-color:white">
         <ct-searchtree :flagsearch="true" :searchConditionApi="searchConditionApi" :searchDataApi="searchDataApi" @loaded="loaded"></ct-searchtree>
       </el-aside>
       <el-main v-if="isShowSearchlist">
-        <div style="height: calc(100vh - 98px);overflow-y: auto;">
+        <div style="height: calc(100vh - 100px);">
           <ct-searchlist :searchConditionApi="searchTableConditionApi" :searchDataApi="searchTableDataApi" :api-param="apiParam"></ct-searchlist>
         </div>
       </el-main>
@@ -69,9 +69,8 @@
   #app-Tree .el-main {
     padding: 0 0px 0px 10px;
   }
-    #app-Tree .el-main .ct-searchtable {
-      margin-top: 0px;
-    }
-
- 
+    
+  #app-Tree .el-main  .ct-table-content {
+    padding: 0 0 0 15px;
+  }
 </style>

package/src/centaline/formData/index.js

@@ -0,0 +1,279 @@
+import Vue from 'vue';
+import common from '../common';
+import Axios from 'axios';
+const formData = {
+    install(Vue) {
+        Vue.prototype.$formData = formData;
+        if (typeof window !== 'undefined') {
+        window.$formData = formData;
+        }
+    },
+    common: common,
+    Axios: Axios,
+    form: null,
+    excuteData: null,//fields
+    fieldsDic: null,//fieldsDic
+    _excuteListData: undefined,
+
+    //获取code1
+    getCode1ByField1(id) {
+        var rtn1 = this.fieldsDic[id];
+        if (rtn1) {
+            return rtn1.value;
+        }
+    },
+    //获取code2
+    getCode2ByField1(id) {
+        var rtn1 = this.fieldsDic[id];
+        if (rtn1) {
+            return rtn1.value1;
+        }
+    },
+    //获取Field的属性attrKey的值
+    getValueByFieldName(id, attrKey) {
+        attrKey = this.common.initialsToUpperCase(attrKey);
+        var rtn1 = this.fieldsDic[id];
+        if (rtn1) {
+            return rtn1.source[attrKey];
+        }
+    },
+    //设置Field的属性attrKey的值
+    setValueByFieldName(id, attrKey, attrValue) {
+        attrKey = this.common.initialsToUpperCase(attrKey);
+        var rtn1 = this.fieldsDic[id];
+        if (rtn1) {
+            rtn1.source[attrKey] = attrValue;
+            this.form.hatchHandle(id, attrKey, attrValue, rtn1);
+            //this.form.hiddenHandle(rtn1);//隐藏关联的
+
+            //用于处理源数据改动,强制更新视图数据 todo
+            if (rtn1.self.$forceUpdate) {
+                rtn1.self.$forceUpdate();
+            }
+        }
+    },
+    //设置Field的v1、v2的值
+    setV1AndV2ByField1(id, code1, code2) {
+        var rtn1 = this.fieldsDic[id];
+        if (rtn1) {
+            if (typeof rtn1.value !== 'undefined') {
+                rtn1.value = code1;
+
+                this.form.validMrf(rtn1);//验证必填关联组件
+                this.form.hiddenHandle(rtn1, true);//隐藏关联的
+            }
+            if (typeof rtn1.value1 !== 'undefined') {
+                rtn1.value1 = code2;
+            }
+
+            if (rtn1.self.$forceUpdate) {
+                rtn1.self.$forceUpdate();
+            }
+        }
+    },
+    //获取列表数据
+    get excuteListData() {
+        if (this._excuteListData) {
+        return this._excuteListData;
+        }
+        else {
+        if (this.excuteData !== null) {
+            this._excuteListData = this.excuteData.filter((v) => {
+            return typeof v.is !== undefined && v.is === 'ct-form-list-table';
+            });
+        }
+        }
+        return this._excuteListData;
+    },
+    //获取列表的Field
+    getListField(tableName, rowNum, fiedlId) {
+        let listData = this.excuteListData.find((v) => {
+        return v.id === tableName;
+        });
+        if (listData) {
+            let field = null;
+            //正在编辑的Field
+            if (rowNum === null && (fiedlId === null || listData.currentEventField.id === fiedlId)) {
+                field = listData.currentEventField;
+            }
+            //正在编辑的行
+            else if (rowNum === null && listData.currentRowIndex === 0) {
+                let fields = listData.currentRow.data;
+                field = fields[fiedlId];
+            }
+            //源数据
+            else {
+                if (rowNum === null && listData.currentRowIndex) {
+                rowNum = listData.currentRowIndex;
+                }
+
+                if (rowNum === 0 || (rowNum && 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);
+                    }
+                }
+                }
+            }
+
+            return { listData: listData, field: field };
+        }
+    },
+    //获取列表的行数（注意 这里包括列头）
+    getListCount(tableName) {
+        tableName = tableName ? tableName : this.form.scripts.$fd;
+        let data = this.getListField(tableName, null, null);
+        if (data) {
+            return data.listData.rows.length;
+        }
+    },
+    //获取表格某行某列的值
+    getListFieldValue(tableName, rowNum, fiedlId, attrName, defaultValue) {
+        tableName = tableName ? tableName : this.form.scripts.$fd;
+
+        let data = this.getListField(tableName, rowNum, fiedlId);
+
+        attrName = this.common.initialsToUpperCase(attrName);
+        attrName = attrName ? attrName : 'code1';
+
+        if (!fiedlId) {
+            fiedlId = data.listData.currentEventField.id;
+        }
+        if (fiedlId && rowNum === null && fiedlId === data.listData.currentEventField.id) {
+            data.field = data.listData.currentEventField;
+        }
+        rowNum = rowNum !== null ? rowNum : data.listData.currentRowIndex;
+
+        //若该行正在编辑，则取编辑状态的。
+        if (data && data.listData && data.listData.currentRow.data && data.listData.currentRow.data[fiedlId]
+        && data.listData.currentRow.data.$sourceIndex === rowNum && data.listData.currentRow.isSet) {
+            return data.listData.currentRow.data[fiedlId].source[attrName];
+        }
+        else if (data && data.field) {
+            if (typeof defaultValue !== 'undefined' && data.listData.rows[rowNum].deleted) {//若该行被删除时，则直接返回默认值
+                return defaultValue;
+            }
+            return data.field.source[attrName];
+        }
+    },
+    //设置表格某行某列的值
+    setListFieldValue(value, tableName, rowNum, fiedlId, attrName) {
+        value = value.toString();
+        tableName = tableName ? tableName : this.form.scripts.$fd;
+        let data = this.getListField(tableName, rowNum, fiedlId);
+
+        attrName = this.common.initialsToUpperCase(attrName);
+        attrName = attrName ? attrName : 'code1';
+
+        if (!fiedlId) {
+        fiedlId = data.listData.currentEventField.id;
+        }
+        if (fiedlId && !rowNum && fiedlId === data.listData.currentEventField.id) {
+        //data.field = data.listData.currentEventField;
+        }
+        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 (typeof currentField.self.$forceUpdate === "function") {
+            currentField.self.$forceUpdate();
+            }
+        }
+
+        //如果有汇总列，触发重新计算汇总
+        if (data.listData.showSummary) {
+            data.listData.tableData.push({});
+            data.listData.tableData.pop();
+        }
+
+        return true;
+        }
+        return false;
+    },
+    //设置表格属性值
+    setListAttr(tableId, attrName, attrValue) {
+        let listData = this.excuteListData.find((v) => {
+            return v.id === tableId;
+        });
+        listData[attrName] = attrValue
+    },
+    //获取后台数据，并返回脚本。
+    execServerScript(action, object, successCallback) {
+        let formData = this;//作用域保存
+
+        //是否是行内触发的
+        let data = this.getListField(this.form.scripts.$fd, null, null);
+        object.editMode = data ? 1 : 0;
+
+        Vue.prototype.$api.postHandler(this.common.globalUri(), { action: action, para: object }).then(
+        function (response) {
+            if (response.rtnCode === Enum.ReturnCode.Successful) {
+            var data = response.content;
+            if (response.clientActionType === Enum.ClientActionType.ExcuteScript && data) {
+                formData.common.excute.call(formData.form.scripts, data);
+            }
+            else
+                if (response.clientActionType === Enum.ClientActionType.None && data && successCallback) {
+                //因为要传参，并直接执行方法，故successCallback回调里要使用formData的话，要加this
+                //若不能接受this，也可修改common.excute方法
+                //successCallback.call(formData.form.scripts, data);
+
+                //优化，不需要加this
+                formData.common.excuteFun.call(formData.form.scripts, successCallback, data);
+                }
+            }
+        }
+        );
+    },
+    //消息提示 type主题:success/warning/info/error。 duration 显示时间, 毫秒。设为 0 则不会自动关闭。 showClose 是否显示关闭按钮。
+    message(message, type, center, duration, showClose, dangerouslyUseHTMLString) {
+        if (typeof center === 'undefined') {
+        center = true;
+        }
+        if (typeof duration === 'undefined') {
+        duration = 1500;
+        }
+        if (typeof showClose === 'undefined') {
+        showClose = false;
+        }
+
+        Vue.prototype.$message({
+        message: message,//消息文字
+        dangerouslyUseHTMLString: dangerouslyUseHTMLString || false,
+        type: type || 'error',//主题:success/warning/info/error
+        center: center,//是否居中
+        duration: duration, //显示时间, 毫秒。设为 0 则不会自动关闭
+        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) {
+  window.Vue.use(formData);
+}
+
+export default formData;