centaline-data-driven 1.1.16 → 1.1.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.1.16",
+  "version": "1.1.20",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/centaline/api/index.js

@@ -157,9 +157,7 @@ const api = {
 
     // 执行js
     if (data.clientActionType === Enum.ClientActionType.ExcuteScript && data.content) {
-      if (!formData) {
-        eval(data.content);
-      }
+      eval(data.content);
     }
 
     //关闭tab页

package/src/centaline/comfirm/src/comfirm.vue

@@ -1,11 +1,11 @@
 <template>
-  <div>
-    <div style="margin-top: -20px;margin-bottom: 5px;min-width: 150px;text-align: center;">
+  <div class="ct-comfirm-content">
+    <div style="margin-top: 15px;margin-bottom: 15px;min-width: 150px;text-align: center;">
       <span>{{text}}</span>
     </div>
     <div style="text-align:center;width:100%">
-      <el-button @click="clickHandler($event,true)"  type="primary" size="mini">Yes</el-button>
-      <el-button @click="clickHandler($event,false)"  size="mini">No</el-button>
+      <el-button @click="clickHandler($event,true)"  type="primary" size="mini">{{options.confirmButtonText||'确定'}}</el-button>
+      <el-button @click="clickHandler($event,false)"  size="mini">{{options.cancelButtonText||'取消'}}</el-button>
     </div>
   </div>
 </template>
@@ -13,7 +13,14 @@
   export default {
     name: 'ct-comfirm',
     props: {
-      text: String
+      text: String,
+      options:{
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+
     },
     data() {
       return {
@@ -28,8 +35,10 @@
         else if (!v){
           this.$emit('cancel');
         }
-        this.$common.closeDialog(this);
       }
     }
   }
 </script>
+<style scoped>
+
+</style>

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);
+    })
+
   },
 
   /**
@@ -621,6 +636,7 @@ const common = {
    * @desc 字符串转数字（保留num位小数）。
    */
   numFloat(value, num, oldValue){
+   
     //value = value.replace(/[^\d.]/g, ""); //清除"数字"和"."以外的字符
     //value = value.replace(/^\./g, ""); //验证第一个字符是数字而不是.
     //value = value.replace(/\.{2,}/g, "."); //只保留第一个. 清除多余的.
@@ -642,6 +658,20 @@ const common = {
     return value.toString();
   },
 
+  /**
+   * @method
+   * @param {Number} value 需要转换的字符串
+   * @param {Number} num 小数点位数
+   * @desc 字符串转数字（保留num位小数）。
+   */
+   numToFloat(value, num){
+   if (value && num && num > 0) {
+       value =parseFloat(value).toFixed(num);
+    }
+    return value.toString();
+  },
+
+
   /**
    * @method
    * @param {String} ext 后缀

package/src/centaline/css/common.css

@@ -339,7 +339,6 @@ html {
   _display: inline;
   *display: inline;
   zoom: 1;
-  width: 24px;
   height: 24px;
   float: left;
   margin-top: 4px;
@@ -684,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
 }
@@ -699,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/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/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/dynamicInputNumber/src/dynamicInputNumber.vue

@@ -9,8 +9,8 @@
         <div style="padding-left:15px;flex:1" v-bind="model.attrs" class="el-date-editor ct-input__inner">
           <input style="text-align:left;width:100%" class="el-range-input"  :placeholder="model.attrs.placeholder1"
                  v-model="model.value" @change="onChangeHandler($event)" @input="onInputHandler($event);isShowClear()"
+                 @blur="onBlurHandler($event)"
                  :class="model.lock ? 'ct-is-disabled' : ''" :disabled="model.lock" />
-
           <!--<span v-if="!model.lock" class="cover-list-item-span">
       <i class="el-input__icon el-icon-circle-close" @click="clearClickHandle"></i>
     </span>-->
@@ -67,6 +67,7 @@
         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;
@@ -74,14 +75,17 @@
 
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);//todo input事件里要不要加这个事件
-        this.isShowClear();
         console.log('onInputHandler');
       },
       onChangeHandler: function (val) {
         this.changeHandler(this.model.value);
-        this.isShowClear()
+        this.isShowClear();
         console.log('onChangeHandler');
       },
+      onBlurHandler:function(event){
+        this.model.value = this.$common.numToFloat(this.model.value, this.model.decimals);//保留n位小数
+        this.inputHandler();
+      },
       //不能共用的数据校验
       selfValidExcute: function (eventName) {
         if (this.model.max !== "" && parseFloat(this.model.value) > parseFloat(this.model.max)) {

package/src/centaline/dynamicIti/src/dynamicIti.vue

@@ -11,7 +11,7 @@
 
          <div style="width:39%" class="ct-position-relative" @mouseover="mouseOverHandle('input1','value')" @mouseout="mouseOutHandle('input1')">
           <input style="text-align:left;width:100%" class="el-range-input" :placeholder="model.attrs.placeholder1"
-                 v-model="model.value" @change="changeHandler($event)" @input="onInputHandler($event);isShowClear('input1','value')" @focus="focusHandler" @blur="blurHandler"
+                 v-model="model.value" @change="changeHandler($event)" @input="onInputHandler($event);isShowClear('input1','value')" @focus="focusHandler" @blur="blurHandler('value','decimals')"
                  :class="model.lock ? 'ct-is-disabled' : ''" :disabled="model.lock" />
            
            <span  class="el-input__suffix el-input--mini"  v-if="showClear.input1">
@@ -23,7 +23,7 @@
           <span style="width:5%" class="el-range-separator">-</span>
           <div style="width:39%" class="ct-position-relative" @mouseover="mouseOverHandle('input2','value1')" @mouseout="mouseOutHandle('input2')">
           <input style="text-align:left;width:100%;" class="el-range-input" :placeholder="model.attrs.placeholder2"
-                 v-model="model.value1" @change="changeHandler($event);" @input="onInputHandler($event);isShowClear('input2','value1')" @focus="focusHandler" @blur="blurHandler"
+                 v-model="model.value1" @change="changeHandler($event);" @input="onInputHandler($event);isShowClear('input2','value1')" @focus="focusHandler" @blur="blurHandler('value1','decimals1')"
                  :class="model.lock ? 'ct-is-disabled' : ''" :disabled="model.lock" />
             <span  class="el-input__suffix el-input--mini"  v-if="showClear.input2">
             <span  class="el-input__suffix-inner ct-close">
@@ -72,8 +72,10 @@
       focusHandler() {
         this.isFocus = true;
       },
-      blurHandler() {
+      blurHandler(valName,decName) {
         this.isFocus = false;
+         this.model[valName] = this.$common.numToFloat(this.model[valName], this.model[decName]);//保留n位小数
+        this.inputHandler();
       },
       onInputHandler: function (val) {
         this.model.value = this.$common.numFloat(this.model.value, this.model.decimals, this.inputOld);//保留n位小数

package/src/centaline/dynamicMo/src/dynamicMo.vue

@@ -226,11 +226,10 @@
       getOptionText: function (value) {
 
         var self = this;
-        console.log(JSON.stringify(this.globalOptions))
         var option = this.globalOptions.find((v) => { return v[self.model.optionAttrs.value] === value });
        
         if (option) {
-          return option[self.model.optionAttrs.displayLabel]||option[self.model.optionAttrs.label];
+          return option[self.model.optionAttrs.label];
         } else {
           return value;
         }

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"
@@ -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" />
+                <input v-if="!model.rightMulti || row[model.rightMulti] == 1" type="checkbox" v-model="row.$select"  @change="selectOne($event)" />
               </td>
               <td :ref="column.fixed?(column.fixed==='left'?'headLeftTds':'headRightTds'):null"
                   v-for="(column,colIndex) in model.dataFieldcolumns"
@@ -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'
@@ -766,8 +766,12 @@
             ro.$select = $ev.srcElement.checked;
           }
         });
+        this.model.setButtonsDisabled();
         this.$forceUpdate();
       },
+      selectOne($ev) {
+        this.model.setButtonsDisabled();
+      },
       calculatingRowHeight() {
         let self = this;
         let count = 0;

package/src/centaline/dynamicSo/src/dynamicSo.vue

@@ -145,7 +145,7 @@
           return self.model.value === value[self.model.optionAttrs.value];
         });
         if (currentOption) {
-          this.model.text = currentOption[self.model.optionAttrs.displayLabel] || currentOption[self.model.optionAttrs.label];
+          this.model.text = currentOption[self.model.optionAttrs.label];
         }
         else {
           this.model.text = '';

package/src/centaline/dynamicSos/src/dynamicSos.vue

@@ -151,8 +151,7 @@
           return self.model.value === value[self.model.optionAttrs.value];
         });
         if (currentOption) {
-          //显示的名字优先取displayName
-          this.model.text =currentOption[self.model.optionAttrs.displayLabel] || currentOption[self.model.optionAttrs.label];
+          this.model.text =currentOption[self.model.optionAttrs.label];
         }
         else {
           this.model.text = '';

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/dynamicTags/src/dynamicTags.vue

@@ -237,7 +237,7 @@
         var self = this;
         var option = this.globalOptions.find((v) => { return v[self.model.optionAttrs.value] === value });
         if (option) {
-          return option[self.model.optionAttrs.displayLabel]||option[self.model.optionAttrs.label];
+          return option[self.model.optionAttrs.label];
         } else {
           return "";
         }

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">