centaline-data-driven 1.2.27 → 1.2.30

package/src/centaline/dynamicSosTt/src/dynamicSosTt.vue

@@ -0,0 +1,312 @@
+<template>
+  <div class="field-top">
+    <div style="width:100%;display:flex">
+      <div style="flex:1;" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
+       ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
+        <div :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]">
+            {{model.label}}
+          </div>
+          <div class="ct-sostt">
+            <div  :class="[model.w1=='0'?'ct-input-editor':'ct-input-editorw']" :style="{'width':(model.w1!='0'?model.w1+'px':'auto')}">
+              <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(!model.paramName || model.lock)? 'manual' : 'click'">
+                <div>
+                  <div>
+                    <el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
+                  </div>
+                  <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
+                </div>
+                <input slot="reference" v-bind="model.attrs" readonly="readonly" v-model="model.text" :placeholder="soPlaceholder"
+                       ref="ct-input" :style="{height:inputHeight + 'px','line-height':inputLineHeight + 'px'}"
+                       @focus="focusHandle" @blur="blurHandle" @click="clickHandle" @input="inputHandler($event)" @change="changeHandler($event)"
+                       :disabled="model.lock" :class="model.lock ? 'ct-is-disabled' : 'ct-input_inner'" />
+              </el-popover>
+              <span v-if="!model.lock" class="el-input__suffix" @click="clickHandle" :class="[model.attrs.size?'el-input--'+model.attrs.size:'']">
+                <span v-if="showClear === false" class="el-input__suffix-inner">
+                  <i class="el-select__caret el-input__icon el-icon-arrow-up" :class="{'is-reverse':showDrop}"></i>
+                </span>
+                <span v-if="showClear === true" class="el-input__suffix-inner ct-close">
+                  <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event)"></i>
+                </span>
+              </span>
+            </div>
+            <div class="ml10" :class="[model.w2=='0'?'ct-input-editor':'ct-input-editorw']" :style="{'width':(model.w2!='0'?model.w2+'px':'auto')}">
+              <el-input :title="model.lock?model.value1:''" :type="model.inputType" v-model="model.value1" v-bind="model.attrs" @input="inputHandler($event);isShowClear()" @change="changeHandler($event)"
+                        class="ct-flex-div-input max-input" :class="[model.showLabel?'showLabel':'',!valid?'inputError':'']" :disabled="model.lock" :rows="model.rows"
+                        :readonly="model.readonly" :show-password="model.isPassword" autocomplete="on" :maxlength="model.max" :show-word-limit="model.showWordLimit"
+                        @keyup.enter.native="search()">
+              </el-input>
+            </div>
+          </div>
+        </div>
+      </div>
+     
+      <span v-if="model.sufLabel" class="spanMessage ct-flex-div-span">{{model.sufLabel}}</span>
+      <transition name="el-fade-in">
+        <span v-show="!valid" class="errorMessage">
+          {{validMessage}}
+        </span>
+      </transition>
+      <div v-if="!model.lock && model.popupSearchListType === 1">
+        <el-button v-if="!model.moreActionBtnName" size="mini" class="h26" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
+        <el-button v-else size="mini" type="primary" class="h26" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import dynamicElement from '../../mixins/dynamicElement'
+  import selectOption from '../../selectOption/src/selectOption'
+  import ctSelectOptionVertical from '../../selectOption/src/selectOptionVertical'
+  export default {
+    name: 'ct-sosTt',
+    mixins: [dynamicElement],
+    components: {
+      'ctSelectOption': selectOption,
+      'ctSelectOptionVertical': ctSelectOptionVertical
+    },
+    props: {
+      api: String,
+      vmodel: Object,
+      popShow: {
+        type: Boolean,
+        default: true
+      }
+    },
+    data() {
+      return {
+        focus: false,
+        showDrop: false,
+        inputHeight: 26,
+        showClear: false,
+        searchText: ""
+      }
+    },
+    created() {
+      if (typeof this.vmodel === 'undefined') {
+        this.model = this.loaderObj.SosTt(this.source);
+      }
+      else {
+        this.model = this.vmodel;
+      }
+      this.$watch('model.value', (n, o) => {
+        if (typeof this.model.child !== 'undefined') {
+          this.model.child.value = this.model.child.defaultValue || '';
+          this.model.child.text = this.model.child.defaultText || '';
+        }
+      });
+      this.inputHeight = this.inputLineHeight;
+    },
+    computed: {
+      soPlaceholder: {
+        get: function () {
+          if (this.model.value !== '') {
+            return '';
+          }
+          else {
+            return this.model.attrs.placeholder;
+          }
+        },
+        set: function (v) {
+
+        }
+      },
+      inputLineHeight: {
+        get: function () {
+          switch (this.model.attrs.size) {
+            case 'mini':
+              return 26;
+            case 'small':
+              return 32;
+            case 'medium':
+              return 36;
+            default:
+              return 40;
+          }
+        }
+      },
+      optionColSpan: function () {
+        return parseInt(24 / this.model.optionColCount);
+      },
+      optionRowCount: function () {
+        return parseInt(this.model.options.length % this.model.optionColCount > 0 ? (this.model.options.length / this.model.optionColCount) + 1 : this.model.options.length / this.model.optionColCount);
+      }
+    },
+    mounted() {
+      var self = this;
+      this.$nextTick(function () {
+        var dropdown = self.$refs["pop"];
+        self.$watch('model.options', function (newVal, oldVal) {
+          self.$nextTick(() => {
+            if (typeof dropdown.popperJS !== 'undefined' && dropdown.popperJS) {
+              dropdown.popperJS.destroy();
+              dropdown.popperJS = null;
+              dropdown.updatePopper();
+            }
+            self.$refs["searchInput"].$el.querySelector("input").focus();
+          });
+        }, { deep: true, immediate: true });
+      });
+    },
+    methods: {
+      getOptions: function () {
+        var self = this;
+        this.model.getOptions(this.api, self.searchText);
+      },
+      soChange: function () {
+        var self = this;
+        if (typeof this.model.child !== 'undefined') {
+          this.model.child.value = this.model.child.defaultValue || '';
+          this.model.child.text = this.model.child.defaultText || '';
+        }
+        var currentOption = this.model.options.find((value) => {
+          return self.model.value === value[self.model.optionAttrs.value];
+        });
+        if (currentOption) {
+          this.model.text =currentOption[self.model.optionAttrs.label];
+        }
+        else {
+          this.model.text = '';
+        }
+        this.inputHandler(self.model.value);
+        this.changeHandler(self.model.value);
+        if(this.model.autoSearch) this.$emit('click');
+      },
+      focusHandle: function () {
+        this.$set(this, 'focus', true);
+      },
+      blurHandle: function () {
+        this.$set(this, 'focus', false);
+      },
+      clickHandle: function () {
+        if (this.model.lock) {
+          return false;
+        }
+        if (this.model.paramName) {
+          this.$set(this, 'showDrop', !this.showDrop);
+          if (this.showDrop) {
+            this.getOptions();
+          }
+          this.focusHandle();
+        }
+        else if (this.model.popupSearchListType === 1) {
+          this.popupSearchListHandle();
+        }
+        else if ((this.model.popupSearchListType === 0)) {
+          this.$message.warning("请配置参数paramName1");
+        }
+      },
+      popupSearchListHandle: function () {
+        var self = this;
+       
+        self.$emit('popupSearchList', true, self.model, self.model.moreActionRouter, (option) => {
+          if (option) {
+            self.model.value = option[self.model.optionAttrs.value];
+            self.model.text = option[self.model.optionAttrs.label];
+            self.model.options.push(option);
+
+            self.soChange();
+          }
+        });
+      },
+      getOptionText: function (value) {
+        var self = this;
+        var option = this.model.options.find((v) => { return v[self.model.optionAttrs.value] === value });
+        if (option) {
+          return option[self.model.optionAttrs.label];
+        } else {
+          return value;
+        }
+      },
+      getOptionSelect(value) {
+        if (this.model.value === value) {
+          return "danger";
+        }
+        else {
+          return "success";
+        }
+      },
+      selectOption(value) {
+        if (this.model.value === value) {
+          this.$set(this, 'showDrop', false);
+          return;
+        }
+        else {
+          this.model.value = value;
+        }
+        this.soChange();
+        this.$set(this, 'showDrop', false);
+      },
+      mouseOverHandle: function () {
+        if (this.model.value !== '' && this.model.clearable) {
+          this.$set(this, 'showClear', true);
+        }
+      },
+      mouseOutHandle: function () {
+        this.$set(this, 'showClear', false);
+      },
+      //不能共用的数据校验
+      selfValidExcute: function (eventName) {
+        if (this.model.required && this.model.value1 == "") {
+          this.validMessage = "必填";
+          this.valid = false;
+          return false;
+        }
+        return true;
+      },
+      clearClickHandle: function (event) {
+        this.model.value = '';
+        this.soChange();
+        event.stopPropagation();
+      },
+      isShowClear() {
+        if (this.model.value1 !== '' && this.model.clearable) {
+          this.$set(this, 'showClear', true);
+        } else {
+          this.$set(this, 'showClear', false);
+        }
+      },
+      searchInputHandle: function () {
+        var currentSeatch = this.searchText;
+        this.searchTickControl(currentSeatch);
+      },
+      searchTickControl: function (search) {
+        var self = this;
+        setTimeout(function () {
+          if (search === self.searchText) {
+            self.getOptions(self.searchText);
+          }
+        }, self.model.searchTick);
+      }
+    }
+  }
+</script>
+<style>
+.h26{
+  height: 26px;
+}
+  .ct-so .ct-sostt {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+  }
+
+    .ct-so .ct-sostt .ct-input-editor {
+      flex: 1 0 0;
+      position: relative;
+    }
+    .ct-so .ct-sostt .ct-input-editorw {
+      position: relative;
+      display:inline-block;
+    }
+
+    .ct-so .ct-sostt .ml10 {
+    margin-left:10px;
+    }
+  .ct-sostt .showLabel input {
+    border-top-left-radius: 4px !important;
+    border-bottom-left-radius: 4px !important;
+    text-align: left !important;
+  }
+</style>

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

@@ -15,13 +15,23 @@ const ContactList = function (source,para ,callBack) {
       _columns: [],
       _columnsArr: [],
       _dataFieldcolumns: [],
+      _listData: [],
       _scripts: null,
       isMergeTitle: false,//是否合并标题    
       selectIndex: 0,
       formData: formData,
+      rowHiddenKey:'contactID',
+      rowHiddenColumns:['contactNameDesc','propertyIdentityTypeID'],
+      columnShow:'contactNoTypeDesc',
       attrs: {
         size: 'mini'
       },
+      get primaryKey() {
+        return common.initialsToUpperCase(source.content.primaryFieldName);
+      },
+      get primaryFieldMappingDBName() {
+        return source.content.primaryFieldMappingDBName;
+      },
       get buttons() {
         if (rtn._buttons !== null) {
           return rtn._buttons;
@@ -73,14 +83,24 @@ const ContactList = function (source,para ,callBack) {
         }
       },      
       get listData() {
-        if (!data.content.rows) {
-          data.content.rows = [];
+        if (rtn._listData.length<=0) {
+          if(data.content.rows && data.content.rows.length>0){
+            data.content.rows.forEach((v,i) => {
+              rtn._listData.push(v);
+              if(v.descNewRow){
+                  var newRow = {};
+                  newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
+                  newRow.descNewRow = v.descNewRow;
+                  newRow.colspan = rtn.dataFieldcolumns.length-rtn.rowMergedColumns.length;
+                  newRow.columnShow=rtn.columnShow;
+                  newRow.flagRow=true;
+                  rtn._listData.push(newRow);
+              }
+            });
+          }
         }
-        return data.content.rows;
+        return rtn._listData;
       },
-      set listData(v) {
-        data.content.rows = v;
-      }, 
       get columns() {
         var self = this;
         if (self._columns.length > 0) {
@@ -264,14 +284,87 @@ const ContactList = function (source,para ,callBack) {
         }
       },
       get rowMergedColumns() {
-        return source.content.rowMergedColumns || [];
+        return source.rowMergedColumns || [];
+      },
+      get apiRouter() {
+        return source.apiRouter;
+      },
+      getCurrentRowApiData(rtnData,router) {
+        var self = this;
+        var searchFields = self.apiRouter.getSearchPara();
+        var searchValue1=router.flagAddRowAfterAction? rtnData.content: rtn.listData[rtn.selectIndex][self.primaryKey];
+        if (self.primaryKey) {
+          searchFields.fields.push({
+            fieldName1: self.primaryFieldMappingDBName ? self.primaryFieldMappingDBName : self.primaryKey,
+            groupName: self.primaryKey,
+            operation: Enum.SearchOperation.等于,
+            searchDataType: Enum.SearchDataType.Text,
+            searchValue1: searchValue1,
+          });
+        }
+        Vue.prototype.$api.postHandler(common.globalUri(), {
+          action: rtn.apiRouter.action,
+          para: {
+            searchFields: searchFields,
+            pageAttribute: { pageIndex: 1 },
+            flagSearch: true
+          }
+        })
+        .then(function (response) {
+          if (response.rtnCode === Enum.ReturnCode.Successful) {
+            if (response.content.rows.length > 0) {
+              if(router.flagAddRowAfterAction){
+                response.content.rows.forEach((v) => {
+                  if(v.descNewRow){
+                    var newRow = {};
+                    newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
+                    newRow.descNewRow = v.descNewRow;
+                    newRow.colspan = rtn.dataFieldcolumns.length-rtn.rowMergedColumns.length;
+                    newRow.columnShow=rtn.columnShow;
+                    newRow.flagRow=true;
+                    rtn._listData.unshift(newRow);
+                  }
+                  rtn._listData.unshift(v);
+                });
+                rtn.setHiddenRow();
+              }
+              else{
+                let updateData=[];
+                response.content.rows.forEach((v) => {
+                  updateData.push(v);
+                  if(v.descNewRow){
+                    var newRow = {};
+                    newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
+                    newRow.descNewRow = v.descNewRow;
+                    newRow.colspan = rtn.dataFieldcolumns.length-rtn.rowMergedColumns.length;
+                    newRow.columnShow=rtn.columnShow;
+                    newRow.flagRow=true;
+                    updateData.push(newRow);
+                  }
+                });
+                let strat=0;
+                let count=0;
+                rtn._listData.forEach((v,i) => {
+                  if(v[rtn.rowHiddenKey]===searchValue1){
+                    if(strat===0)strat=i;
+                    count=count+1;
+                  }
+                });
+                rtn._listData.splice(strat, count,updateData);
+                rtn.setHiddenRow();
+              }
+            }
+          }
+        })
+        .catch((error) => {
+        });
       },
       doAction(response,field) {
         if (response.responseData) {
           response = response.responseData;
         }
         if(field.flagFreshCurrentRow || field.flagAddRowAfterAction){
-
+          rtn.getCurrentRowApiData(response,field);
         }
         else{
           switch (response.notification) {
@@ -280,41 +373,60 @@ const ContactList = function (source,para ,callBack) {
               var deleteRow = response.content.split(',');
               if (deleteRow) {
                 deleteRow.forEach((r) => {
-                  const dataIndex = rtn.listData.indexOf(rtn.dataDictionary[r])
-                  if (dataIndex !== -1) {
-                    rtn.listData.splice(dataIndex, 1);
-                    delete rtn.dataDictionary[r];
-                  }
+                  let strat=0;
+                  let count=0;
+                  rtn._listData.forEach((v,i) => {
+                    if(v[rtn.rowHiddenKey]===r){
+                      if(strat===0)strat=i;
+                      count=count+1;
+                    }
+                  });
+                  rtn._listData.splice(strat, count);
                 });
               }
               break;
             case Enum.ActionType.New://新增
             case Enum.ActionType.CloseTabThenNew://新增  
-              rtn.setStyleRow(response.content);
-              response.content.forEach((nr) => {
-                rtn.listData.unshift(nr);
+              response.content.forEach((v) => {
+                if(v.descNewRow){
+                  var newRow = {};
+                  newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
+                  newRow.descNewRow = v.descNewRow;
+                  newRow.colspan = rtn.dataFieldcolumns.length-rtn.rowMergedColumns.length;
+                  newRow.columnShow=rtn.columnShow;
+                  newRow.flagRow=true;
+                  rtn._listData.unshift(newRow);
+                }
+                rtn._listData.unshift(v);
               });
-              rtn.dataDictionary = response.content;  
-              rtn.$vue.calculatingRowHeight()
+              rtn.setHiddenRow();
               break;
             case Enum.ActionType.Update://修改
             case Enum.ActionType.CloseTabThenUpdate://修改
-              response.content.forEach((row) => {
-                for (var vkey in row) {
-                  rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
+              var searchValue1=rtn.listData[rtn.selectIndex][self.primaryKey];
+              let updateData=[];
+              response.content.forEach((v) => {
+                updateData.push(v);
+                if(v.descNewRow){
+                  var newRow = {};
+                  newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
+                  newRow.descNewRow = v.descNewRow;
+                  newRow.colspan = rtn.dataFieldcolumns.length-rtn.rowMergedColumns.length;
+                  newRow.columnShow=rtn.columnShow;
+                  newRow.flagRow=true;
+                  updateData.push(newRow);
                 }
               });
-              break;
-            case Enum.ActionType.Export://导出
-              var fileName = response.content.fieldName1;
-              var fileContent = window.atob(response.content.code1);
-              common.saveFile(fileName, fileContent);
-              break;
-            case Enum.ActionType.Refersh://刷新
-              rtn.$vue.getPage(1);
-              break;
-            case Enum.ActionType.RefreshParent://刷新父页面
-              rtn.$vue.$emit('refreshParent');
+              let strat=0;
+              let count=0;
+              rtn._listData.forEach((v,i) => {
+                if(v[rtn.rowHiddenKey]===searchValue1){
+                  if(strat===0)strat=i;
+                  count=count+1;
+                }
+              });
+              rtn._listData.splice(strat, count,updateData);
+              rtn.setHiddenRow();
               break;
             default:
               break;
@@ -352,6 +464,39 @@ const ContactList = function (source,para ,callBack) {
         }
         return c;
       },
+      setHiddenRow() {
+        if (rtn.rowHiddenColumns.length===0) {
+          return;
+        }
+        let lastKey='';
+        let count=1;
+        let firstIndex=0;
+        for (let i = 0; i < rtn.listData.length; i++) {
+          rtn.listData[i].$rowspan=0;
+          if(lastKey){
+            if(rtn.listData[i][rtn.rowHiddenKey]){
+              if(rtn.listData[i][rtn.rowHiddenKey]===lastKey){
+                rtn.listData[i].rowHiddenColumns=rtn.rowHiddenColumns;
+                count++;
+                if(i===rtn.listData.length-1){
+                  rtn.listData[firstIndex].$rowspan=count;
+                }
+              }
+              else{
+                rtn.listData[firstIndex].$rowspan=count;
+                lastKey=rtn.listData[i][rtn.rowHiddenKey];
+                count=1;
+                firstIndex=i;
+              }
+            }
+          }
+          else{
+            lastKey=rtn.listData[i][rtn.rowHiddenKey];
+            count=1;
+            firstIndex=i;
+          }
+        }
+      },
     };
     return rtn;
   }

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

@@ -213,6 +213,7 @@ const Router = function (source) {
     getActionPara(data) {
       let params = {};
       if (rtn.isSubmit) {
+        data = Object.assign(data, rtn.queryPara);
         params = {
           action: rtn.action,
           para: {
@@ -246,6 +247,35 @@ const Router = function (source) {
         callback({ rtnCode: Enum.ReturnCode.Successful });
       }
     },
+    getSearchPara() {
+      let params = { fields: [] };
+      if (source.queryString) {
+        var arr = source.queryString.split("&");
+        for (var i = 0; i < arr.length; i++) {
+          var res = arr[i].split("=");
+          params.fields.push({
+            fieldName1: res[0],
+            groupName: res[0],
+            operation: Enum.SearchOperation.等于,
+            searchDataType: Enum.SearchDataType.Text,
+            searchValue1: res[1],
+          });
+        }
+      }
+      return params;
+    },
+    doSearch(data, callback) {
+      if (rtn.action) {
+        Vue.prototype.$api.postHandler(common.globalUri(), data).then((response) => {
+          callback(response);
+        }).catch((ex) => {
+          callback(ex);//里面需要有data.rtnCode === 200的处理
+        });
+      }
+      else {
+        callback({ rtnCode: Enum.ReturnCode.Successful });
+      }
+    },
     selectOptionCode:'',
     _elementOptions: [],
     get elementOptions() {