centaline-data-driven 1.1.18 → 1.1.23

package/src/centaline/dialogList/src/dialog.vue

@@ -97,7 +97,7 @@
                               class: ['ct-dialog_header'],
                               style: {
                                 'position': 'relative',
-                                'padding': '10px 20px 10px 20px',
+                                'padding': '10px 20px 10px 20px',
                                 'height': '44px'
                               },
                             }, [
@@ -132,7 +132,7 @@
                                       item.on.loaded = (model) => {
                                         mySelf.vmodel.title = (model && model.title) ? model.title : mySelf.vmodel.title
                                       }
-                                    }
+                                    }
 
                                     //加载失败关闭弹框
                                     if (typeof item.on.failLoad === "undefined") {

package/src/centaline/dialogList/src/dialogList.vue

@@ -35,6 +35,7 @@
     },
     methods: {
       addDialog(vmodel) {
+        
         vmodel.id = (new Date()).getTime();
         this.List.push(vmodel);
 
@@ -46,10 +47,11 @@
         }
       },
       deleteDialog(model) {
+       
         model.dialogTableVisible = false;
         //改成删除
         let index = this.List.findIndex(v => {
-          return v.id === model.vmodel.id;
+           return v.id === model.id || v.id === model.vmodel.id;
         });
         this.List.splice(index, 1);
 

package/src/centaline/dialogList/src/dialogNew.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="ct-dialog">
-    <el-dialog :top="topHeigth"
+    <el-dialog :top="topHeigth"
                :title="vmodel.title" :close-on-click-modal="false"
                :visible.sync="dialogVisible"
                :width="vmodel.content[0].attrs.width"
-               :before-close="handleClose">
+               :before-close="handleClose">
       <div :style="v.style" v-for="(v,index) in vmodel.content" :key="index">
         <component v-bind="v.attrs" :is="v.component" v-on="v.on"></component>
       </div>
@@ -26,10 +26,10 @@
     },
     mounted() {
       for (var index in this.vmodel.content) {
-        const v = this.vmodel.content[index];
-        if (v.component === 'ct-searchlist' && parseInt(v.attrs.height) < 300) {
-          v.attrs.height = '450px';
-        }
+        const v = this.vmodel.content[index];
+        if (v.component === 'ct-searchlist' && parseInt(v.attrs.height) < 300) {
+          v.attrs.height = '450px';
+        }
 
         this.$set(v, 'style', {
           width: '100%',
@@ -49,23 +49,23 @@
     computed: {
       topHeigth: function () {
         let height;
-        let vh = 0;
+        let vh = 0;
         this.vmodel.content[0].attrs.height = '50px';
         if (this.vmodel.content[0].attrs.height) {
           height = parseInt(this.vmodel.content[0].attrs.height) + 20;
         }
         if (document.documentElement.clientHeight > height) {
-          height = document.documentElement.clientHeight - height;
+          height = document.documentElement.clientHeight - height;
           height = parseInt(height/2);
-          vh = height * 100 / document.documentElement.clientHeight;
+          vh = height * 100 / document.documentElement.clientHeight;
           vh = parseInt(vh);
-        }
-        if (vh < 3) {
-          vh = 3;
-        }
-        if (vh > 13) {
-          vh = 13;
-        }
+        }
+        if (vh < 3) {
+          vh = 3;
+        }
+        if (vh > 13) {
+          vh = 13;
+        }
         return vh + 'vh';
       },
     },

package/src/centaline/dynamicBtn/src/dynamicBtn.vue

@@ -1,7 +1,7 @@
 <template>
-  <el-button v-if="!model.isImport"
-             :type="model.isHyperLink ? 'text' : 'primary'"
-             v-bind="model.attrs" @click="$emit('click',model)"
+  <el-button v-if="!model.isImport"
+             :type="model.isHyperLink ? 'text' : 'primary'"
+             v-bind="model.attrs" @click="$emit('click',model)"
              :disabled="model.disabled">{{model.label}}</el-button>
   <el-upload v-else
              :action="model.action"
@@ -36,26 +36,26 @@
         this.model = this.vmodel;
       }
     },
-    computed: {
-      uploadData() {
-        //因传输方式是FormData，故需要对Value是object的进行转化
-        let data = {};
-        for (var key in this.fileData) {
-          if (typeof this.fileData[key] === "object") {
-            data[key] = JSON.stringify(this.fileData[key]);
-          }
-          else {
-            data[key] = this.fileData[key];
+    computed: {
+      uploadData() {
+        //因传输方式是FormData，故需要对Value是object的进行转化
+        let data = {};
+        for (var key in this.fileData) {
+          if (typeof this.fileData[key] === "object") {
+            data[key] = JSON.stringify(this.fileData[key]);
           }
-        }
-        return data;
+          else {
+            data[key] = this.fileData[key];
+          }
+        }
+        return data;
       },
       headers() {
         return this.$common.getDataDrivenOpts().handler.getRequestHeaders();
       }
     },
     methods: {
-      handleAvatarSuccess(res) {
+      handleAvatarSuccess(res) {
         let self = this;
         this.$api.postThenHandler({ data: res}).then(function () {
           self.$emit('importComplete', res);

package/src/centaline/dynamicCheckbox/src/dynamicCheckbox.vue

@@ -46,12 +46,10 @@
           self.$emit('loaded');
         }
         else if (typeof self.source !== 'undefined') {
-          self.loaderObj.Seg(self.source, (data) => {
-            self.load(data);
-          });
+         this.model =  self.loaderObj.Checkbox(self.source);
         }
         else if (typeof self.api !== 'undefined') {
-          self.loaderObj.Seg(self.api, (data) => {
+          self.loaderObj.Checkbox(self.api, (data) => {
             self.load(data);
           });
         }

package/src/centaline/dynamicDtd/src/dynamicDtd.vue

@@ -31,7 +31,7 @@
           {{validMessage}}
         </span>
       </transition>
-      <ct-quick-input v-if="model.paramName && !model.lock" :pn="model.paramName" :action="api" @input=""></ct-quick-input>
+      <ct-quick-input v-if="model.paramName && !model.lock" :pn="model.paramName" :action="api" ></ct-quick-input>
     </div>
   </div>
 </template>
@@ -49,7 +49,9 @@
         pickerOptions: this.getPickerOptions()
       };
     },
+
     mounted() {
+     
       var self = this;
       this.$nextTick(function () {
         if (self.vmodel) {
@@ -57,9 +59,7 @@
           self.$emit('loaded');
         }
         else if (typeof self.source !== 'undefined') {
-          self.loaderObj.Dtd(self.source, (data) => {
-            self.load(data);
-          });
+          this.model = self.loaderObj.Dtd(self.source);
         }
         else if (typeof self.api !== 'undefined') {
           self.loaderObj.Dtd(self.api, (data) => {

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

@@ -59,13 +59,13 @@
     data: function () {
       return {
       }
-    },
-    methods: {
-      getClass() {
-        if (this.vmodel.is === "ct-inputNumber") {
-          return 'ct-table-inputnumber';
-        }
-      }
+    },
+    methods: {
+      getClass() {
+        if (this.vmodel.is === "ct-inputNumber") {
+          return 'ct-table-inputnumber';
+        }
+      }
     },
     template: '<div :class="getClass()">{{vmodel.labelValue}}{{vmodel.unitName}}</div>'
   }
@@ -172,14 +172,14 @@
       },
       //删除
       deleteRow(index, sourceIndex) {
-        var self = this;
+        var self = this;
         //判断是否已经保存所有操作
         for (let i of self.model.tableData) {
           if (i.isSet && self.model.currentRow.index !== index) {
             self.$message.warning("请先保存当前编辑项");
             return false;
           }
-        }
+        }
 
         this.model.deleteRow(sourceIndex, () => {
           self.model.tableData.splice(index, 1);
@@ -300,9 +300,9 @@
                   return Number(prev);
                 }
               }, 0);
-              //sums[index] += ' 元';
-              if (data[0][column.property].decimals && data[0][column.property].decimals > 0) {
-                sums[index] = sums[index].toFixed(data[0][column.property].decimals);
+              //sums[index] += ' 元';
+              if (data[0][column.property].decimals && data[0][column.property].decimals > 0) {
+                sums[index] = sums[index].toFixed(data[0][column.property].decimals);
               }
             } else {
               sums[index] = 'N/A';
@@ -342,7 +342,7 @@
     float: right;
   }
   .ct-table-inputnumber {
-    text-align:right;
+    text-align:right;
   }
   .ct-form-list .el-table__footer-wrapper .el-table__footer .has-gutter div {
     text-align: right;

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

@@ -50,6 +50,10 @@
       var self = this;
       this.$nextTick(function () {
 
+         if (typeof self.vmodel === 'undefined') {
+           self.model = self.loaderObj.InputNumber(this.source);
+         }
+      
         if (self.vmodel) {
           self.load(self.vmodel);
           self.$emit('loaded');

package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchList.vue

@@ -23,7 +23,7 @@
       'ct-popupSearchListTable' : dynamicPopupSearchListTable
     },
     props: {
-      searchFormApi: String,
+      searchFormApi: String,
       apiParam: Object,
       searchDataApi: String,
       vmodel: Object,

package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchListTable.vue

@@ -155,12 +155,12 @@
         }
       },
       confirmClickHandler() {
-        if (this.singleSelectio) {
+        if (this.singleSelectio) {
           if (this.currentRow) {
-            this.$emit('submit', this.currentRow);
-          }
-          else {
-            this.$message.error("请先选择数据");
+            this.$emit('submit', this.currentRow);
+          }
+          else {
+            this.$message.error("请先选择数据");
           }
         }
         else {
@@ -185,7 +185,7 @@
       searchComplate(searchModel) {
         var self = this;
         this.loading = true;
-        this.$nextTick(function () {
+        this.$nextTick(function () {
           if (typeof self.api !== 'undefined' && typeof searchModel !== 'undefined') {
             var postData;
             postData = searchModel.searchData;

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

@@ -20,23 +20,23 @@
     props: {
       vmodel: Object,
       searchConditionApi: String,
-      searchDataApi: String,
+      searchDataApi: String,
       pageHeight: String,
       apiParam: {
         type: Object,
         default: () => { }
       }
     },
-    created() {
+    created() {
       this.model = this.vmodel;
-    },
-    computed: {
-      searchListStyle: function() {
-        if (this.pageHeight) {
-          return { 'height': this.pageHeight };
-        }
-        return {};
-      }
+    },
+    computed: {
+      searchListStyle: function() {
+        if (this.pageHeight) {
+          return { 'height': this.pageHeight };
+        }
+        return {};
+      }
     },
     data() {
       return {
@@ -70,10 +70,10 @@
       },
       refreshParentHandler() {
         this.$emit('refreshParent');
-      },
-      resize() {
-        this.$refs.table.setTableHeight();
+      },
+      resize() {
+        this.$refs.table.setTableHeight();
       }
     }
   }
-</script>
+</script>

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

@@ -123,13 +123,13 @@
             v.parent = parent;
           }
         });
-      },
+      },
       //无任何筛选条件时，不显示该div
-      setScreenShow() {
+      setScreenShow() {
         let showField = this.model.screen.find((v) => {
           return v.show !== false;
         });
-        if (!showField) {
+        if (!showField) {
           showField = this.model.btnScreen.find((v) => {
             return v.show !== false;
           });
@@ -163,7 +163,7 @@
     box-shadow: none;
     -webkit-box-shadow: none;
     border-radius: 0px;
-    background-color: #fafafa;
+    background-color: #fafafa;
     z-index:1990;
   }
     .SeachScreenPop .el-popper .el-time-panel {

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

@@ -22,7 +22,7 @@
           <thead ref="tableHead">
             <tr class="ct-tr" ref="headTr" v-for="(columns,columnsIndex) in model.columnsArr">
               <th v-if="model.isMulti && columnsIndex === 0" ref="headLeftThs" class="ct-td left-fixation-th checkbox-td">
-                <input type="checkbox" @click="selectAll($event)" v-model="model.selectAll" />
+                <input type="checkbox" @click="selectAll($event)" v-model="model.selectAll" class="checkbox-td-1"/>
               </th>
               <th :ref="column.fixed?(column.fixed==='left'?'headLeftThs':'headRightThs'):'headThs'" v-for="(column,colIndex) in columns"
                   v-if="column.show" class="ct-td ct-searchtable-th"
@@ -69,7 +69,7 @@
                 class="ct-tr"
                 :style="row.$style">
               <td v-if="model.isMulti" class="ct-td tdFiexd left-fixation checkbox-td" align="center">
-                <input v-if="!model.rightMulti || row[model.rightMulti] == 1" type="checkbox" v-model="row.$select"  @change="selectOne($event)" />
+                <input v-if="!model.rightMulti || row[model.rightMulti] == 1" type="checkbox" v-model="row.$select"  @change="selectOne($event)"  class="checkbox-td-1"/>
               </td>
               <td :ref="column.fixed?(column.fixed==='left'?'headLeftTds':'headRightTds'):null"
                   v-for="(column,colIndex) in model.dataFieldcolumns"
@@ -577,6 +577,7 @@
         });
       },
       toolbarClickHandler(field) {
+        debugger;
         let self = this;
         let submitData = {};
         let action = field.action;
@@ -629,7 +630,7 @@
       routerClickHandler(field, submitData, action) {
         let self = this;
         action = action || field.action;
-
+        
         var clickAcion = function () {
           //若不是客户端方法，则直接访问接口
           if (!field.isClientFuntion) {
@@ -1026,4 +1027,7 @@
     width: 20px;
     left: 0px;
   }
+  .ct-table .checkbox-td .checkbox-td-1{
+    vertical-align: inherit;
+  }
 </style>

package/src/centaline/imgPreview/index.js

@@ -1,15 +1,15 @@
 import imgPreview from './src/imgPreview.vue'
 
 imgPreview.install = function (Vue) {
-  Vue.component(imgPreview.name, imgPreview);
+  Vue.component(imgPreview.name, imgPreview);
   //import ElImageViewer from "element-ui/packages/image/src/image-viewer";
-  //Vue.component("ElImageViewer", ElImageViewer);
+  //Vue.component("ElImageViewer", ElImageViewer);
 
   const PreviewConstructor = Vue.extend(imgPreview);
   const instance = new PreviewConstructor();
-  instance.$mount(document.createElement("div"));
+  instance.$mount(document.createElement("div"));
   setTimeout(function () {
-    document.body.appendChild(instance.$el);
+    document.body.appendChild(instance.$el);
   }, 1000);
 
 
@@ -24,8 +24,8 @@ imgPreview.install = function (Vue) {
 }
 
 if (typeof window !== 'undefined' && window.Vue) {
-  window.Vue.use(imgPreview);
-
+  window.Vue.use(imgPreview);
+
   const PreviewConstructor = Vue.extend(imgPreview);
   const instance = new PreviewConstructor();
   instance.$mount(document.createElement("div"));

package/src/centaline/imgPreview/src/imgPreview.vue

@@ -3,9 +3,9 @@
                    :urlList="previewImages"
                    :on-close="closeViewer"></el-image-viewer>
 </template>
-<script>
+<script>
   //该组件打包被排除（会导致包大很多），不排除的话无法使用，todo待更新
-  //import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+  //import ElImageViewer from "element-ui/packages/image/src/image-viewer";
   export default {
     name: 'ctImgPreview',
     data() {
@@ -23,4 +23,4 @@
       }
     }
   };
-</script>
+</script>

package/src/centaline/index.js

@@ -1,30 +1,30 @@
 const paths = require('../../build/centaline/centaline.path').default;
 //import './css/common.css'
 import babelpolyfill from 'babel-polyfill'
-
+
 let defaultInstallOpt = {
   baseUrl: '',
-  zIndex: 2000,
+  zIndex: 2000,
   showRequestErrorMessage: true,
-  handler: {
+  handler: {
     // 打开tab页
     openTab: function (action, submitData, pageTitle) {
       
-    },
+    },
     // 关闭当前tab页
     closeTab: function () {
 
-    },
-    // 获取请求头
-    getRequestHeaders: function () {
-      return {};
-    },
-    // 请求完成事件，可判断是否登录过期执行响应操作
-    requestComplete: function (response) {
-      
+    },
+    // 获取请求头
+    getRequestHeaders: function () {
+      return {};
+    },
+    // 请求完成事件，可判断是否登录过期执行响应操作
+    requestComplete: function (response) {
+      
     }
   }
-}
+}
 
 const centaline = {
   install(Vue, opts = {}) {
@@ -37,7 +37,7 @@ const centaline = {
       var plug = require("./" + plugName + "/index.js").default;
       Vue.use(plug);
     }
-
+
     opts.handler = Object.assign(defaultInstallOpt.handler, opts.handler)
     const option = Object.assign(defaultInstallOpt, opts)
     Vue.prototype.$dataDrivenOpts = option

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

@@ -14,10 +14,10 @@ const Button = function (source, router) {
     set label(v) {
       source.controlLabel = v;
     },
-    get isHyperLink() {
+    get isHyperLink() {
       if (router) {
-        return router.isHyperLink;
-      }
+        return router.isHyperLink;
+      }
       return false;
     },
   };

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

@@ -6,7 +6,6 @@ import Vue from 'vue';
 const box = function (source, callBack) {
   var self = this;
   var init = function (data) {
-    debugger;
     var rtn = {
       get options() {
         return source.selectItems1;

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

@@ -3,7 +3,7 @@ import Base from './Base';
 import valid from '../../../validate/index';
 import common from '../../../common';
 import Vue from 'vue';
-const cbwt = function (source) {
+const cbwt = function (source) {
   var rtn = {
     options: [{ code: source.code1, name: source.name1 }],
     options1: [{ code: source.code2, name: source.name2 }],
@@ -95,7 +95,7 @@ const cbwt = function (source) {
         action: apiAddrs,
         para: {
           paramName: self['paramName' + numStr],
-          parentValue: parentValue,
+          parentValue: parentValue,
           extraData: rtn.getFormRefFieldPara()
         }
       };
@@ -105,11 +105,11 @@ 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));
-        }
+    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;
     },
@@ -121,21 +121,21 @@ const cbwt = function (source) {
         },
         enumerable: true,
         configurable: true
-      });
+      });
       Object.defineProperty(rtnFormObj, source.fieldName2, {
         get: function () {
           return source.code2;
         },
         enumerable: true,
         configurable: true
-      });
+      });
       Object.defineProperty(rtnFormObj, source.fieldName3, {
         get: function () {
           return source.code3;
         },
         enumerable: true,
         configurable: true
-      });
+      });
       Object.defineProperty(rtnFormObj, source.fieldName4, {
         get: function () {
           return source.code4;
@@ -160,7 +160,7 @@ const cbwt = function (source) {
     attrs: {
       clearable: true
     },
-  };
+  };
   var baseSource = Base(source);
   //rtn.attrs = base.copy(baseSource.attrs, rtn.attrs);
   rtn = base.copy(baseSource, rtn);

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

@@ -12,9 +12,9 @@ const D = function (source, dateType) {
         if (typeof source.valueFormat !== 'undefined') {
           return source.valueFormat;
         }
-        else {
+        else {
           if (dateType === "datetime") {
-            return 'yyyy-MM-dd HH:mm:ss'
+            return 'yyyy-MM-dd HH:mm:ss'
           }
           return 'yyyy-MM-dd'
         }