centaline-data-driven 1.1.17 → 1.1.22

package/src/centaline/common/index.js

@@ -188,6 +188,7 @@ const common = {
    * @desc 打开弹窗
    */
   openDialog(vmodel) {
+    
     //this.dialogList.List.push(vmodel);
     this.dialogList.addDialog(vmodel);
   },
@@ -198,8 +199,9 @@ const common = {
    * @desc 关闭指定弹窗
    */
   closeDialog(vmodel) {
+    
     if (vmodel) {
-      if (vmodel.$options.name === 'ctDialog' || vmodel.$options.name === 'ct-dialog') {
+      if (vmodel.name === 'ct-comfirm' || vmodel.$options.name === 'ctDialog' || vmodel.$options.name === 'ct-dialog') {
         //vmodel.dialogTableVisible = false;
         this.dialogList.deleteDialog(vmodel);
         return;
@@ -213,33 +215,46 @@ const common = {
     }
   },
 
+    /**
+   * @method
+   * @param {Object} message 提示信息
+   * @param {Object} title 提示框标题
+   * @param {Object} options 参数 如confirmButtonText，cancelButtonText
+   * @desc 确认框
+   */
   confirm(message, title, options) {
-    var dialogOption = {
-      title: field.pageTitle,
-      pane: self.$common.getParentPane(self),
-      content: [{
-        component: 'ct-comfirm',
-        attrs: {
-          //ssource: data.content,
-          api: field.action,
-          apiParam: field.getActionPara(submitData).para,
-          showTitle: false,
-          width: field.dialogWidth + 'px',
-          height: field.dialogHeight + 'px'
-        },
-        on: {
-          submit(ev) {
-            self.model.updateFields(ev, () => {
-              self.$refs.Fields.forEach((fd) => {
-                fd.$forceUpdate();
-              });
-            });
-            self.$common.closeDialog(dialogOption.dialog);
+    let self = this;
+    
+    return new Promise((resolve,reject) => {
+      var dialogOption = {
+        title: title,
+        name:'ct-comfirm',
+        vmodel:{},
+        content: [{
+          component: 'ct-comfirm',
+          attrs: {
+            options:options,
+            text:message,
+            width: '400px',
+            height: '95px'
+          },
+          on: {
+            access(){
+              self.closeDialog(dialogOption);
+              resolve();
+            },
+            cancel()
+            {
+              self.closeDialog(dialogOption);
+              reject()
+            },
+
           }
-        }
-      }]
-    };
-    this.openDialog(dialogOption);
+        }]
+      };
+      this.openDialog(dialogOption);
+    })
+
   },
 
   /**

package/src/centaline/css/common.css

@@ -683,7 +683,13 @@ html {
   background-color: #d6d6d6;
   border-color: #d6d6d6;
 }
-
+.ct-tableToolbar .is-disabled {
+  background: #b1b3bc !important;
+}
+  .ct-tableToolbar .is-disabled:hover {
+    color: #333 !important;
+    background: #b1b3bc !important;
+  }
 .ct-dialog_app {
   position: relative
 }
@@ -698,4 +704,12 @@ html {
 {cursor: pointer;}
 .ct-position-relative{
   position: relative;
-}
+}
+
+.ct-right-0{
+  right: 0px !important;
+}
+.ct-right-10{
+  right: 10px !important;
+}
+

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

@@ -8,7 +8,7 @@
         <div class="ct-checkbox-mian cover-list-item" :class="[model.showLabel?'showLabel':'',model.value !== ''?'hasValue':'']">
           <span>
             <el-checkbox-group v-model="model.checkedItemArr" @change="changeHandler1">
-              <el-checkbox v-for="item in model.options" :label="item[model.optionAttrs.value]" :key="item[model.optionAttrs.value]">{{item[model.optionAttrs.label]}}</el-checkbox>
+              <el-checkbox :disabled="model.lock" v-for="item in model.options" :label="item[model.optionAttrs.value]" :key="item[model.optionAttrs.value]">{{item[model.optionAttrs.label]}}</el-checkbox>
             </el-checkbox-group>
           </span>
 
@@ -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/dynamicFile/src/dynamicFile.vue

@@ -18,10 +18,10 @@
       <div slot="tip" class="el-upload__tip errorMessage" v-show="!valid">{{validMessage}}</div>
       <div slot="file" slot-scope="{file}" :title="file.fileName">
         <div class="cover-list-item">
-          <el-image fit="fill" :src="file.url"
-                    style="width: 150px; height: 150px"
-                    :preview-src-list="getPreviewSrcList(file)"
-                    :z-index="previewZIndex"
+          <el-image fit="fill" :src="file.url"
+                    style="width: 150px; height: 150px"
+                    :preview-src-list="getPreviewSrcList(file)"
+                    :z-index="previewZIndex"
                     @click="handlePictureCardPreview(file)">
           </el-image>
           <span class="cover-list-item-span-delete" v-if="!model.lock && file.rightDel">
@@ -42,8 +42,8 @@
                 &nbsp;{{file.mediaLabelName}}<i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown" class="el-upload-list__item-preview">
-                <el-dropdown-item v-for="(option, index) in model.optionModel.options" :key="index" :command="{option:option,file:file}">
-                {{option[model.optionModel.optionAttrs.label]}}
+                <el-dropdown-item v-for="(option, index) in model.optionModel.options" :key="index" :command="{option:option,file:file}">
+                {{option[model.optionModel.optionAttrs.label]}}
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -96,7 +96,7 @@
       },
       //删除
       handleRemove(file) {
-        this.$confirm("确定删除该附件？", "提示", {
+        this.$common.confirm("确定删除该附件？", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           //type: 'warning'
@@ -109,26 +109,26 @@
         if (this.$common.isAssetTypeAnImage(this.getSuffix(file))) {
           //this.$openPreview([file.mediaUrl]);
         }
-        else {
+        else {
           if (file.rightDownload) {
-            window.open(file.mediaUrl, "_blank");
+            window.open(file.mediaUrl, "_blank");
           }
           return [];
         }
       },
       getPreviewSrcList(file) {
-        if (this.$common.isAssetTypeAnImage(this.getSuffix(file))) {
+        if (this.$common.isAssetTypeAnImage(this.getSuffix(file))) {
           let arr = this.model.fileList.filter(at => this.$common.isAssetTypeAnImage(this.getSuffix(at))).map(attach => {
             return attach.mediaUrl;
-          })
-
-          //让看起来有序
+          })
+
+          //让看起来有序
           let nowIndex = arr.findIndex(photo => photo === file.mediaUrl)
           if (nowIndex > -1) {
             let start = arr.slice(0, nowIndex)
             let end = arr.slice(nowIndex)
             arr = [...end, ...start]
-          }
+          }
           return arr;
         }
         else {

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

@@ -239,7 +239,7 @@
                   field.doAction(self.model.getFormObj(), (data) => {
                     if (data.rtnCode === 200) {
                       if (self.model.flagAlertClose) {
-                        self.$confirm('操作成功，是否关闭本页面?', '提示', {
+                        self.$common.confirm('操作成功，是否关闭本页面?', '提示', {
                           confirmButtonText: '确定',
                           cancelButtonText: '取消',
                           type: 'warning'
@@ -357,7 +357,7 @@
         }
 
         if (field.alert) {
-          self.$confirm(field.alertMsg, field.alertCaption, {
+          self.$common.confirm(field.alertMsg, field.alertCaption, {
             confirmButtonText: field.alertOKButtonText,
             cancelButtonText: field.alertCancelButtonText,
             //type: 'warning'
@@ -378,7 +378,7 @@
           this.$common.excute.call(this.model.scripts, field.change);
 
         }
-
+
         self.model.isChanged = true;
         self.model.hiddenHandle(field);
         self.model.requiredHandle(field);

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/dynamicHyperLink/index.js

@@ -8,4 +8,4 @@ if (typeof window !== 'undefined' && window.Vue) {
   window.Vue.use(dynamicHyperLink);
 }
 
-export default dynamicHyperLink
+export default dynamicHyperLink

package/src/centaline/dynamicPlaceHolder/index.js

@@ -8,4 +8,4 @@ if (typeof window !== 'undefined' && window.Vue) {
   window.Vue.use(dynamicPlaceHolder);
 }
 
-export default dynamicPlaceHolder
+export default dynamicPlaceHolder

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)" />
+                <input type="checkbox" @click="selectAll($event)" v-model="model.selectAll" />
               </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"
@@ -746,7 +746,7 @@
         }
 
         if (field.alert) {
-          self.$confirm(field.alertMsg, field.alertCaption, {
+          self.$common.confirm(field.alertMsg, field.alertCaption, {
             confirmButtonText: field.alertOKButtonText,
             cancelButtonText: field.alertCancelButtonText,
             //type: 'warning'

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

@@ -10,14 +10,14 @@
                 class="ct-flex-div-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>
-      </el-input>
-
-       <span  class="el-input__suffix el-input--mini"  v-if="showClear">
+        
+         <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>
       <transition name="el-fade-in" class="ct-flex-div-span">
         <span v-show="!valid" class="errorMessage ">

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

@@ -22,7 +22,6 @@
                           :disabled="model.lock">
           </el-time-picker>
         </div>
-        {{model.value}}
       </div>
       <transition name="el-fade-in">
         <span v-show="!valid" class="errorMessage">