centaline-data-driven 1.1.23 → 1.1.24

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

@@ -1,21 +1,20 @@
 <template>
   <div class="field-top">
-    <div v-if="model !== null" class="ct-text ct-flex-div" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']"
-    @mouseover="mouseOverHandle" @mouseout="mouseOutHandle"
-    >
-      <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div" :class="[model.labelClass]">
+    <div v-if="model !== null" class="ct-text ct-flex-div max-flex-div" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']"
+         @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
+      <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div max-input-group" :class="[model.labelClass]">
         <span>{{model.label}}</span>
       </div>
       <el-input :title="model.lock?model.value:''" :type="model.inputType" v-model="model.value" v-bind="model.attrs" @input="inputHandler($event);isShowClear()" @change="changeHandler($event)"
-                class="ct-flex-div-input" :class="[model.showLabel?'showLabel':'',!valid?'inputError':'']" :disabled="model.lock" :rows="model.rows"
+                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">
         <span slot="suffix" v-if="model.unitName" class="ct-unitname">{{model.unitName}}</span>
-        
-         <span slot="suffix" class="el-input__suffix el-input--mini" v-if="showClear" :class="model.unitName?'ct-right-10':'ct-right-0'">
-            <span  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>
+
+        <span slot="suffix" class="el-input__suffix el-input--mini" v-if="showClear" :class="model.unitName?'ct-right-10':'ct-right-0'">
+          <span 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>
       </el-input>
 
       <span v-if="model.sufLabel" class="spanMessage ct-flex-div-span">{{model.sufLabel}}</span>
@@ -38,7 +37,7 @@
     },
     data() {
       return {
-        showClear:false,
+        showClear: false,
       }
     },
     created() {
@@ -49,10 +48,8 @@
         this.model = this.vmodel;
       }
     },
-    methods:{
-
+    methods: {
       mouseOverHandle: function () {
-    
         if (this.model.value !== '' && this.model.clearable) {
           this.$set(this, 'showClear', true);
         }
@@ -60,21 +57,19 @@
       mouseOutHandle: function () {
         this.$set(this, 'showClear', false);
       },
-       clearClickHandle: function (event) {
+      clearClickHandle: function (event) {
         this.model.value = '';
         this.isShowClear();
         event.stopPropagation();
       },
-      isShowClear()
-      {
-         if (this.model.value !== '' && this.model.clearable) {
+      isShowClear() {
+        if (this.model.value !== '' && this.model.clearable) {
           this.$set(this, 'showClear', true);
-        }else
-        {
-           this.$set(this, 'showClear', false);
+        } else {
+          this.$set(this, 'showClear', false);
         }
       },
     },
-}</script>
+  }</script>
 <style>
 </style>

package/src/centaline/dynamicTimeSelect/src/dynamicTimeSelect.vue

@@ -5,13 +5,44 @@
         <div v-if="model.showLabel && model.label" class="el-input-group__prepend">
           {{model.label}}
         </div>
-        <div class="ct-datepicker" style="width:100%" v-if="model !== null" :class="[model.showLabel?'showLabel':'']">
+        <div class="ct-datepicker" style="width:100%" v-if="model !== null&&model.valueFormat=='HH:mm'" :class="[model.showLabel?'showLabel':'']">
+          <el-time-select class="ct-date-picker-editor" v-model="model.value"
+                          v-bind="model.attrs"
+                          @change="changeModel($event)"
+                          @clear="changeModel($event)"
+                          :placeholder="model.placeholder"
+                          :disabled="model.lock"
+                          :picker-options="{
+                            start:  model.min,
+                              step: model.step,
+                            end:  model.max
+                           }">
+          </el-time-select>
+          <span v-if="model.isRange" class="ct-date-picker-span">-</span>
+          <el-time-select v-if="model.isRange" class="ct-date-picker-editor" v-model="model.value1"
+                          v-bind="model.attrs"
+                          @change="changeModel($event)"
+                          @clear="changeModel($event)"
+                          :placeholder="model.placeholder1"
+                          :disabled="model.lock"
+                          :picker-options="{
+                            start: model.min,
+                            step: model.step,
+                            end: model.max,
+                            minTime: model.value
+                           }">
+          </el-time-select>
+        </div>
+        <div class="ct-datepicker" style="width:100%" v-else-if="model !== null" :class="[model.showLabel?'showLabel':'']">
           <el-time-picker class="ct-date-picker-editor" v-model="model.value"
                           v-bind="model.attrs"
                           @change="changeModel($event)"
                           @clear="changeModel($event)"
                           :placeholder="model.placeholder"
-                          :disabled="model.lock">
+                          :disabled="model.lock"
+                          :picker-options="{
+                            selectableRange:model.min + '-' + model.max
+                           }">
           </el-time-picker>
           <span v-if="model.isRange" class="ct-date-picker-span">-</span>
           <el-time-picker v-if="model.isRange" class="ct-date-picker-editor" v-model="model.value1"
@@ -19,7 +50,10 @@
                           @change="changeModel($event)"
                           @clear="changeModel($event)"
                           :placeholder="model.placeholder1"
-                          :disabled="model.lock">
+                          :disabled="model.lock"
+                          :picker-options="{
+                            selectableRange:model.min + '-' + model.max
+                           }">
           </el-time-picker>
         </div>
       </div>

package/src/centaline/dynamicTree/index.js

@@ -0,0 +1,11 @@
+import dynamicTree from './src/dynamicTreeList'
+
+dynamicTree.install = function (Vue) {
+  Vue.component(dynamicTree.name, dynamicTree);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(dynamicTree);
+}
+
+export default dynamicTree;

package/src/centaline/dynamicTree/src/dynamicSearchTree.vue

@@ -0,0 +1,66 @@
+<template>
+  <div>
+    <ct-searchtreescreen ref="treescreen" :api="searchConditionApi" :screenPara="screenPara" @search="search"></ct-searchtreescreen>
+    <ct-tree ref="tree" :api="searchDataApi" @loaded="loaded"></ct-tree>
+  </div>
+</template>
+
+<script>
+  import dynamicElement from '../../mixins/dynamicElement'
+  import dynamicTreeScreen from '../../dynamicSearchList/src/dynamicSearchScreen.vue';
+  import dynamicTree from './dynamicTree.vue';
+  export default {
+    name: 'ct-searchtree',
+    mixins: [dynamicElement],
+    components: {
+      'ct-tree': dynamicTree,
+      'ct-searchtreescreen': dynamicTreeScreen
+    },
+    props: {
+      vmodel: Object,
+      searchConditionApi: String,
+      searchDataApi: String,
+      flagsearch: Boolean,
+      screenPara: {
+        type: Object,
+        default: () => { }
+      }
+    },
+    data() {
+      return {
+
+      };
+    },
+    methods: {
+      search() {
+        this.$refs.tree.search(this.$refs.treescreen.model);
+      },
+      loaded(data) {
+        try {
+          this.$emit('loaded', data);
+        } catch (e) {
+        }
+      },
+    },
+    mounted() {
+      if (this.flagsearch) {
+        this.$watch('$refs.treescreen.model.searchData', function (newVal, oldVal) {
+          // 做点什么
+          if (oldVal != undefined) {
+            this.search();
+          }
+        }, {
+          deep: true,
+        });
+      }
+    },
+    watch: {
+      //filterText(val) {
+      //  this.$refs.trees.filter(val);
+      //}
+    },
+    created() {
+      this.model = this.vmodel;
+    }
+  }
+</script>

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

@@ -0,0 +1,213 @@
+<template>
+  <div class='mytree'>
+    <el-tree :data="treeData"
+             class="tree-line"
+             :props="defaultProps"
+             :load="loadNode"
+             :indent="0"
+             :expand-on-click-node="false"
+             @node-click="handleNodeClick"
+             lazy
+             ref="Tree">
+    </el-tree>
+  </div>
+</template>
+
+<script>
+  import dynamicElement from '../../mixins/dynamicElement'
+  import dynamicTreeScreen from '../../dynamicSearchList/src/dynamicSearchScreen.vue';
+  export default {
+    name: 'ct-tree',
+    mixins: [dynamicElement],
+    components: {
+      'ct-searchtreescreen': dynamicTreeScreen
+    },
+    props: {
+      vmodel: Object,
+      api: String
+    },
+    data() {
+      return {
+        treeNode: {},
+        treeResolve: function () { },
+        LastClickNode: {},
+        para: {},
+        filterText: '',
+        treeData: [],      // 树节点
+        defaultProps: {
+          label: 'name',
+          key: 'Key',
+          children: 'children',
+          isLeaf: "isLeaf",
+          id: 'code'
+        },
+      };
+    },
+    methods: {
+      search(m) {
+        this.treeNode.childNodes = [];
+        this.searchComplate(m, undefined, this.treeResolve);
+      },
+      loadNode(node, resolve) {        // 加载 树数据
+        let self = this;
+        if (node.level === 0) {
+          self.treeNode = node;
+          self.treeResolve = resolve;
+          return self.loadtreeData(resolve);
+        }
+        if (node.level >= 1) {
+          return self.getChildByList(node.data.code, resolve, node.data);
+        }
+      },
+      loadtreeData(resolve) {      // 获取loadtreeData 就是父节点数据，getChildByList就是异步获取子节点数据
+        this.searchComplate(undefined, undefined, resolve);
+      },
+      getChildByList(_parentID, resolve,) {     // 获取子节点请求
+        var fields = this.model.searchData("code", _parentID, 9, 3);
+        var model = {
+          "searchData": fields
+        };
+        this.searchComplate(model, undefined, resolve);
+      },
+      load(data, resolve) {
+        var self = this;
+        self.model = data;
+        var treeResolve = resolve || self.treeResolve;
+        treeResolve(data.modeltree);
+        self.LastResolve = treeResolve;
+      },
+      searchComplate(m, defaultSearch, resolve) {
+        var self = this;
+        this.$nextTick(function () {
+          if (typeof self.api !== 'undefined') {
+            self.loaderObj.Tree(self.api, self.load, m, defaultSearch, resolve);
+          }
+        });
+      },
+      handleNodeClick(data) {
+        var self = this;
+        if (self.LastClickNode != data) {
+          self.LastClickNode = data;
+          var rowRouter = self.model.rowSelectRouter;
+          this.model.getCurrentRowApiData(rowRouter.action, data, function (rowdata) {
+            var newdata = self.$common.deepClone(data);
+            newdata.rowRouter = rowdata
+            self.$emit('loaded', newdata);
+          });
+
+        }
+
+      }
+    },
+    created() {
+      this.model = this.vmodel;
+    }
+  }
+</script>
+<style lang="scss">
+
+    .el-tree-node {
+      position: relative;
+      padding-left: 16px;
+    }
+
+    .el-tree-node__children {
+      padding-left: 16px;
+    }
+  .el-tree-node__content {
+    padding-left: 0px !important;
+    padding-right:2px !important;
+  }
+    /* 竖线 */
+    .el-tree-node::before {
+      content: "";
+      height: 100%;
+      width: 1px;
+      position: absolute;
+      left: 27px;
+      top: -33px;
+      border-width: 1px;
+      border-left: 1px dashed #52627C;
+    }
+    /* 当前最后一个接点的竖线高度 */
+    .el-tree-node:last-child::before {
+      height: 46px; /*可以自己调整 */
+    }
+
+    /* 横线 */
+    .el-tree-node::after {
+      content: "";
+      width: 12px;
+      height: 20px;
+      position: absolute;
+      left: 27px;
+      top: 12px;
+      right:2px;
+      border-width: 1px;
+      border-top: 1px dashed #52627C;
+    }
+
+    .el-tree:first-child .el-tree-node:before {
+      height: 46px; /*可以自己调整 */
+    }
+
+    .el-tree-node__expand-icon {
+      font-size: 16px;
+    }
+    /* 去掉顶层虚线 */
+    .tree > .el-tree-node:first-child::after {
+      border-top: none;
+    }
+
+    .el-tree > .el-tree-node:first-child:before {
+      border-left: none;
+    }
+
+    .tree > .is-leaf {
+      color: transparent;
+    }
+
+    .el-tree .el-tree-node__expand-icon.expanded {
+      -webkit-transform: rotate(0deg);
+      transform: rotate(0deg);
+    }
+
+    .el-tree .el-tree-node__expand-icon.expanded {
+      -webkit-transform: rotate(0deg);
+      transform: rotate(0deg);
+    }
+
+
+    .el-tree .el-icon-caret-right:before {
+      background: url("../../../assets/node-collapse.png") no-repeat;
+      content: '';
+      display: block;
+      width: 12px;
+      height: 12px;
+      font-size: 12px;
+      background-size: 10px;
+    }
+    /*
+  //有子节点 且已展开*/
+    .el-tree .el-tree-node__expand-icon.expanded.el-icon-caret-right:before {
+      background: url("../../../assets/node-expand.png") no-repeat;
+      content: '';
+      display: block;
+      width: 12px;
+      height: 12px;
+      font-size: 12px;
+      background-size: 10px;
+    }
+
+    /*  //没有子节点*/
+    .el-tree .el-tree-node__expand-icon.is-leaf::before {
+      background: transparent no-repeat 0 3px;
+      content: '';
+      display: block;
+      width: 12px;
+      height: 12px;
+      font-size: 12px;
+      background-size: 10px;
+    }
+</style>
+

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

@@ -0,0 +1,65 @@
+<template>
+  <div id="app-Tree" style="height:100%;position: fixed;">
+    <el-container style="height: 100vh;width:100vw; border: 1px solid #eee">
+      <el-aside width="200px" style="background-color:#eceff2">
+        <ct-searchtree :flagsearch="true" :searchConditionApi="searchConditionApi" :searchDataApi="searchDataApi" @loaded="loaded"></ct-searchtree>
+      </el-aside>
+      <el-main v-if="isShowSearchlist">
+        <ct-searchlist :searchConditionApi="searchTableConditionApi" :searchDataApi="searchTableDataApi" :api-param="apiParam"></ct-searchlist>
+      </el-main>
+    </el-container>
+  </div>
+</template>
+
+<script>
+  import dynamicElement from '../../mixins/dynamicElement'
+  import dynamicSearchTree from './dynamicSearchTree.vue';
+  import dynamicSearchList from '../../dynamicSearchList/src/dynamicSearchList.vue';
+  export default {
+    name: 'ct-treelist',
+    mixins: [dynamicElement],
+    components: {
+      'ct-searchtree': dynamicSearchTree,
+      'ct-searchlist': dynamicSearchList
+    },
+    props: {
+      vmodel: Object,
+      searchConditionApi: String,
+      searchDataApi: String,
+      apiParam: {
+        type: Object,
+        default: () => { }
+      }
+    },
+    data() {
+      return {
+        searchTableConditionApi: "",
+        searchTableDataApi: "",
+        isShowSearchlist: false
+      };
+    },
+    methods: {
+      loaded(data) {
+        var self = this;
+        self.isShowSearchlist = false;
+        if (data&&data.rowRouter) {
+          self.searchTableConditionApi = data.rowRouter.getLayoutOfSearch;
+          self.searchTableDataApi = data.rowRouter.getList;
+          var defaultPara = self.$common.deepClone(data); 
+          delete defaultPara.rowRouter;
+          delete defaultPara.getLayoutOfSearch;
+          delete defaultPara.getList;
+          self.apiParam.defaultPara = defaultPara;
+          self.$nextTick(() => {
+            self.isShowSearchlist = true;
+          });
+        }
+      },
+      
+    },
+    created() {
+      this.model = this.vmodel;
+    }
+  }
+
+</script>

package/src/centaline/loader/index.js

@@ -96,8 +96,7 @@ var loader = {
    */
   depObj: function (obj, source, key, tempData) {
     if (key == 'timeValue') {
-      debugger
-
+ 
     }
     var property = Object.getOwnPropertyDescriptor(source, key);
     var getter = property && property.get;

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

@@ -192,9 +192,14 @@ const Base = function (source) {
       get size() {
         return  "mini";
       },
+      set class(v)
+      {
+        source.className=v
+      },
       get class() {
         var size = this.size ? this.size : "mini";
-        return 'ct-font-size-' + size;
+        source.className=source.className||'ct-font-size-' + size;
+        return source.className;
       }
     },
     get max() {
@@ -208,7 +213,31 @@ const Base = function (source) {
     },
     set min(v) {
       source.minValue1 = v;
-    }
+    },
+    get refFieldName() {
+      return source.refFieldName;
+    },
+    getFormRefFieldPara() {
+      if (rtn.form && typeof rtn.refFieldName !== 'undefined' && rtn.refFieldName.length > 0) {
+        if (typeof rtn.form.getRefFieldPara === 'function') {
+          return JSON.stringify(rtn.form.getRefFieldPara(rtn.refFieldName));
+        }
+      }
+      return null;
+    },
+    get parentField() {
+      let rf='';
+      if(source.parentField)rf=source.parentField.split(',');
+      return rf;
+    },
+    getFormParentFieldPara() {
+      if (rtn.form && typeof rtn.parentField !== 'undefined' && rtn.parentField.length > 0) {
+        if (typeof rtn.form.getRefFieldPara === 'function') {
+          return JSON.stringify(rtn.form.getParentFieldPara(rtn.parentField));
+        }
+      }
+      return null;
+    },
   };
 
   return rtn;

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

@@ -1,6 +1,5 @@
 import base from '../../index';
 import Base from './Base';
-import Enum from './lib/Enum';
 const Button = function (source, router) {
   var rtn = {
     disabled: false,
@@ -20,6 +19,24 @@ const Button = function (source, router) {
       }
       return false;
     },
+    get textColor() {
+      return source.textColor ? source.textColor : '';
+    },
+    set bgColor(v)
+    {
+      source.bgColor = v;
+    },
+    get bgColor() {
+      return source.bgColor ? source.bgColor : '';
+    },
+    set borderColor(v)
+    {
+      source.borderColor = v;
+    },
+    get borderColor() {
+      return source.borderColor ? source.borderColor + '' : (source.bgColor ? source.bgColor + '' : '');
+    },
+    icon:'',
   };
   rtn = base.copy(Base(source), rtn);
   return rtn;

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

@@ -105,14 +105,6 @@ const cbwt = function (source) {
         }
       });
     },
-    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;
-    },
     getFormObj() {
       var rtnFormObj = {};
       Object.defineProperty(rtnFormObj, source.fieldName1, {