centaline-data-driven 1.4.71 → 1.4.73

package/package.json

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

package/src/SearchList.vue

@@ -4,17 +4,17 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <!-- <ct-searchlist :apiParam="para"
+    <ct-searchlist :apiParam="para"
       :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
       :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
       :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" 
       :searchStatsApi="'/ProfileWorklistList/getListStats'">
-    </ct-searchlist> -->
+    </ct-searchlist>
 
-    <ct-searchlist :apiParam="para"
+    <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/RightValueList/getLayoutOfSearch'" 
       :searchDataApi="'/RightValueList/getListOfSearchModel'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist 
       :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" 

package/src/centaline/api/index.js

@@ -213,7 +213,8 @@ const api = {
                 Vue.prototype.$common.closeDialog(dialogOption.dialog);
                 Vue.prototype.$message({
                   message: data.rtnMsg,
-                  type: 'info'
+                  type: 'info',
+                  showClose:true,
                 });
               }
             }
@@ -230,7 +231,11 @@ const api = {
           common.confirm(data.rtnMsg, '信息', { confirmButtonText: '确定', flagShowcCancelButton: '0' });
         }
         else {
-          Vue.prototype.$message.error(response.data.rtnMsg);
+          Vue.prototype.$message({
+            message: response.data.rtnMsg,
+            type: 'error',
+            showClose:true,
+          });
         }
       }
       return Promise.reject(response);
@@ -249,10 +254,18 @@ const api = {
       return this.postThenHandler(response, scripts);
     }).catch((ex) => {
       if (ex.message) {
-        Vue.prototype.$message.error(ex.message);
+        Vue.prototype.$message({
+          message: ex.message,
+          type: 'error',
+          showClose:true,
+        });
       }
       else if (typeof ex.data === "string") {
-        Vue.prototype.$message.error(ex.data);
+        Vue.prototype.$message({
+          message: ex.data,
+          type: 'error',
+          showClose:true,
+        });
       }
       return Promise.resolve(ex.data ? ex.data : ex);//错误处理了，直接返回成功，要判断response.rtnCode=200再处理
     });
@@ -264,10 +277,18 @@ const api = {
       return this.postThenHandler(response, scripts);
     }).catch((ex) => {
       if (ex.message) {
-        Vue.prototype.$message.error(ex.message);
+        Vue.prototype.$message({
+          message: ex.message,
+          type: 'error',
+          showClose:true,
+        });
       }
       else if (typeof ex.data === "string") {
-        Vue.prototype.$message.error(ex.data);
+        Vue.prototype.$message({
+          message: ex.data,
+          type: 'error',
+          showClose:true,
+        });
       }
       return Promise.resolve(ex.data ? ex.data : ex);//错误处理了，直接返回成功，要判断response.rtnCode=200再处理
     });

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

@@ -123,7 +123,11 @@
         });
       },
       handleAvatarError(info) {
-        this.$message.warning("失败,请重试");
+        this.$message({
+          message: "失败,请重试",
+          type: 'warning',
+          showClose:true,
+        });
       },
       dropClick(event) {
         var self = this;

package/src/centaline/dynamicEditPictures/src/dynamicEditPictures.vue

@@ -482,12 +482,20 @@
       },
       uploadpro(filesize, res, xhr, flagError) {
         if (flagError) {
-          this.$message.error(res);
+          this.$message({
+            message: res,
+            type: 'error',
+            showClose:true,
+          });
           return false;
         }
         else if (xhr.status == 200) {
           if (res.rtnCode != 200 && res.rtnMsg != "") {
-            this.$message.error(res.rtnMsg);
+            this.$message({
+              message: res.rtnMsg,
+              type: 'error',
+              showClose:true,
+            });
             return false;
           }
           const Progress = Math.min(100, Math.floor(1E4 * parseInt(res.content.nextOffSet) / parseInt(filesize)) / 100);

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -223,13 +223,21 @@
         if (this.model.action === '' && !this.model.lock) {
           this.validMessage = "必须配置上传的URL";
           this.valid = false;
-          this.$message.error(this.validMessage);
+          this.$message({
+            message: this.validMessage,
+            type: 'error',
+            showClose:true,
+          });
         }
       },
       handleExceed() {
         this.validMessage = "附件数量最多" + this.model.max + "张";
         this.valid = false;
-        this.$message.error(this.validMessage);
+        this.$message({
+          message: this.validMessage,
+          type: 'error',
+          showClose:true,
+        });
       },
       //删除
       handleRemove(file) {
@@ -359,7 +367,11 @@
         if (res.status === 404) {
           let m = JSON.parse(res.message);
           if (m.error) {
-            this.$message.warning("path(" + m.path + ") " + m.error);
+            this.$message({
+              message: "path(" + m.path + ") " + m.error,
+              type: 'warning',
+              showClose:true,
+            });
           }
         }
       },
@@ -519,7 +531,11 @@
         if (this.model.action === '' && !this.model.lock) {
           this.validMessage = "必须配置上传的URL";
           this.valid = false;
-          this.$message.error(this.validMessage);
+          this.$message({
+            message: this.validMessage,
+            type: 'error',
+            showClose:true,
+          });
         }
         // data是上传时附带的额外参数，file是文件
         let url = this.model.action; //上传文件接口
@@ -546,7 +562,11 @@
         var refupload = this.$refs.refupload;
         if (refupload) {
           if (flagError) {
-            this.$message.error(res);
+            this.$message({
+              message: res,
+              type: 'error',
+              showClose:true,
+            });
             file.source = { "actionType": 2 };
             this.model.deleteFile(file, false);
             this.selfValidExcute("remove");
@@ -554,7 +574,11 @@
           }
           else if (xhr.status == 200) {
             if (res.rtnCode != 200 && res.rtnMsg != "") {
-              this.$message.error(res.rtnMsg);
+              this.$message({
+                message: res.rtnMsg,
+                type: 'error',
+                showClose:true,
+              });
               return false;
             }
             const Progress = Math.min(100, Math.floor(1E4 * parseInt(res.content.nextOffSet) / parseInt(file.size)) / 100);

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

@@ -347,7 +347,11 @@
                                   field.disabled = false;
                                   self.model.pageDisabled = false;
                                   self.$common.closeDialog(dialogOption.dialog);
-                                  self.$message.warning(data.rtnMsg);
+                                  self.$message({
+                                    message: data.rtnMsg,
+                                    type: 'warning',
+                                    showClose:true,
+                                  });
                                 }
                               }
                             }]
@@ -600,7 +604,11 @@
                             },
                             error(data) {
                               self.$common.closeDialog(dialogOption.dialog);
-                              self.$message.warning(data.rtnMsg);
+                              self.$message({
+                                message: data.rtnMsg,
+                                type: 'warning',
+                                showClose:true,
+                              });
                             }
                           }
                         }]
@@ -724,7 +732,11 @@
                   finished(data) {
                     self.$common.closeDialog(dialogOption.dialog);
                     if (data.rtnMsg) {
-                      self.$message.info(data.rtnMsg);
+                      self.$message({
+                        message: data.rtnMsg,
+                        type: 'info',
+                        showClose:true,
+                      });
                     }
                     if (field && field.changeCallBackFunName) {
                       self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
@@ -735,7 +747,11 @@
                   },
                   error(data) {
                     self.$common.closeDialog(dialogOption.dialog);
-                    self.$message.warning(data.rtnMsg);
+                    self.$message({
+                      message: data.rtnMsg,
+                      type: 'warning',
+                      showClose:true,
+                    });
                   }
                 }
               }]
@@ -842,15 +858,27 @@
               if (typeof f.validExcute !== 'undefined') {
                 if (!f.validExcute()) {
                   if (f.validMessage) {
-                    if (f.validMessage == '必填') {
-                      self.$message.error('【' + f.model.label + '】' + f.validMessage);
+                    if (f.validMessage == '必填') {                      
+                      self.$message({
+                        message: '【' + f.model.label + '】' + f.validMessage,
+                        type: 'error',
+                        showClose:true,
+                      });
                     }
                     else {
-                      self.$message.error(f.validMessage);
+                      self.$message({
+                        message: f.validMessage,
+                        type: 'error',
+                        showClose:true,
+                      });
                     }
                   }
                   else {
-                    self.$message.error('【' + f.model.label + '】不能为空！');
+                    self.$message({
+                      message: '【' + f.model.label + '】不能为空！',
+                      type: 'error',
+                      showClose:true,
+                    });
                   }
                   verified = false;
                   return;
@@ -877,7 +905,11 @@
           return;
         }
         if (!check) {
-          self.$message.warning(checkMsg);
+          self.$message({
+            message: checkMsg,
+            type: 'warning',
+            showClose:true,
+          });
           return;
         }
         if (router.id.indexOf('_') === 0) {
@@ -926,20 +958,36 @@
             if (!f.validExcute()) {
               if (i === 0) {
                 if (f.model.is == "ct-file") {
-                  self.$message.error(f.validMessage);
+                  self.$message({
+                    message: f.validMessage,
+                    type: 'error',
+                    showClose:true,
+                  });
                 }
                 else {
                   if (f.validMessage) {
                     if (f.validMessage == '必填' && f.model.label) {
-                      self.$message.error('【' + f.model.label + '】' + f.validMessage);
+                      self.$message({
+                        message: '【' + f.model.label + '】' + f.validMessage,
+                        type: 'error',
+                        showClose:true,
+                      });
                     }
                     else {
-                      self.$message.error(f.validMessage);
+                      self.$message({
+                        message: f.validMessage,
+                        type: 'error',
+                        showClose:true,
+                      });
                     }
                   }
                   else {
                     if (f.model.label) {
-                      self.$message.error('【' + f.model.label + '】不能为空！');
+                      self.$message({
+                        message: '【' + f.model.label + '】不能为空！',
+                        type: 'error',
+                        showClose:true,
+                      });
                     }
                   }
                 }

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

@@ -110,7 +110,13 @@
         }
         else {
           for (let i of self.model.rows) {
-            if (i.isSet) return self.$message.warning("请先保存当前编辑项");
+            if (i.isSet) {
+              return self.$message({
+                message: "请先保存当前编辑项",
+                type: 'warning',
+                showClose:true,
+              });
+            }
           }
           let newRow = self.model.getCloneRowData(0);
           newRow.isSet = true;
@@ -131,7 +137,11 @@
         //点击修改 判断是否已经保存所有操作
         for (let i of self.model.rows) {
           if (i.isSet && app.model.currentRow.index !== index) {
-            app.$message.warning("请先保存当前编辑项");
+            app.$message({
+              message: "请先保存当前编辑项",
+              type: 'warning',
+              showClose:true,
+            });
             return false;
           }
         }

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

@@ -43,7 +43,7 @@
             </el-table-column>
 
             <!--操作列-->
-            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0">
+            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0" :render-header="renderHeader" :min-width="tableColumnWith">
               <template slot-scope="scope">
                 <span v-if="scope.row.edit || scope.row.isSet" class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,true)">
                   {{scope.row.isSet?'保存':"修改"}}
@@ -130,7 +130,7 @@
       },
       //添加账号
       addRow() {
-        var app = this;
+          var app = this;
         if (app.model.dialogEdit) {
           app.model.addRow(() => {
             app.$forceUpdate();
@@ -138,7 +138,11 @@
         }
         else {
           for (let i of app.model.tableData) {
-            if (i.isSet) return app.$message.warning("请先保存当前编辑项");
+            if (i.isSet) return app.$message({
+              message: "请先保存当前编辑项",
+              type: 'warning',
+              showClose:true,
+            });
           }
           let newRow = app.model.getCloneRowData(0);
           newRow.isSet = true;
@@ -160,7 +164,11 @@
         //点击修改 判断是否已经保存所有操作
         for (let i of app.model.tableData) {
           if (i.isSet && app.model.currentRow.index !== index) {
-            app.$message.warning("请先保存当前编辑项");
+            app.$message({
+              message: "请先保存当前编辑项",
+              type: 'warning',
+              showClose:true,
+            });
             return false;
           }
         }
@@ -196,7 +204,7 @@
               app.model.currentRow.isSet = false;
               app.itemKey = Math.random();
               this.model.change = this.model.formListChange;
-              app.$emit('change');
+              app.$emit('change');          
             }
           }
         }
@@ -207,7 +215,7 @@
           app.model.currentRow.isSet = true;
           row.isSet = true;
           app.itemKey = Math.random();
-        }
+        }     
       },
       //删除
       deleteRow(index, sourceIndex) {
@@ -215,7 +223,11 @@
         //判断是否已经保存所有操作
         for (let i of self.model.tableData) {
           if (i.isSet && self.model.currentRow.index !== index) {
-            self.$message.warning("请先保存当前编辑项");
+            self.$message({
+              message: "请先保存当前编辑项",
+              type: 'warning',
+              showClose:true,
+            });
             return false;
           }
         }
@@ -257,13 +269,21 @@
         var rtnBool = true;
         for (let i of self.model.tableData) {
           if (i.isSet) {
-            self.$message.warning("请先保存表格编辑项");
+            self.$message({
+              message: "请先保存表格编辑项",
+              type: 'warning',
+              showClose:true,
+            });
             rtnBool = false;
           }
         };
 
         if (rtnBool && self.model.required && this.model.tableData.length === 0) {
-          self.$message.warning(this.model.label + " 表格不能为空");
+          self.$message({
+            message: this.model.label + " 表格不能为空",
+            type: 'warning',
+            showClose:true,
+          });
           rtnBool = false;
         }
         self.foucus = true;
@@ -390,8 +410,8 @@
         span.style.width = 'auto';
         // 临时插入 document
         document.body.appendChild(span);
-        // 重点：获取 span 最小宽度，设置当前列，注意这里加了 10，字段较多时还是有挤压，且渲染后的 div 内左右 padding 都是 5，所以 +10 。（可能还有边距/边框等值，需要根据实际情况加上）
-        column.minWidth = span.getBoundingClientRect().width + 10;
+        // 重点：获取 span 最小宽度，设置当前列，注意这里加了 35，字段较多时还是有挤压，且渲染后的 div 内左右 padding 都是 5，所以 +10 ,另外25是为了公布工号列不被遮挡。（可能还有边距/边框等值，需要根据实际情况加上）
+        column.minWidth = span.getBoundingClientRect().width + 35;
         this.tableColumnWith = column.minWidth
         // 移除 document 中临时的 span
         document.body.removeChild(span);

package/src/centaline/dynamicHyperLink/src/dynamicHyperLink.vue

@@ -47,7 +47,11 @@
         });
       },
       handleAvatarError(info) {
-        this.$message.warning("失败,请重试");
+        this.$message({
+          message: "失败,请重试",
+          type: 'warning',
+          showClose:true,
+        });
       }
     }
   }

package/src/centaline/dynamicHyperLinkList/src/dynamicHyperLinkList.vue

@@ -47,7 +47,11 @@
         });
       },
       handleAvatarError(info) {
-        this.$message.warning("失败,请重试");
+        this.$message({
+          message: "失败,请重试",
+          type: 'warning',
+          showClose:true,
+        });
       },
       clickHandler(i) {
         this.model.listIndex=i;

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

@@ -195,7 +195,11 @@
           this.popupSearchListHandle();
         }
         else if ((this.model.popupSearchListType === 0)) {
-          this.$message.warning("请配置参数paramName1");
+          this.$message({
+            message: "请配置参数paramName1",
+            type: 'warning',
+            showClose:true,
+          });
         }
       },
       popupSearchListHandle: function () {

package/src/centaline/dynamicPhotoSelect/src/dynamicPhotoSelect.vue

@@ -122,12 +122,15 @@ export default {
       this.modelPhotoselect.delete(index);
       this.photoList.splice(index, 1);
     },
-    handleOpen() {
-      
+    handleOpen() {      
       var self = this;
       var chooseList = new Array();
       if (self.modelPhotoselect.action == "") {
-        self.$message.warning("请配置parameterAction！");
+        self.$message({
+          message: "请配置parameterAction！",
+          type: 'warning',
+          showClose:true,
+        });
         return;
       }
       var params = {
@@ -160,9 +163,11 @@ export default {
                 self.$nextTick(function () {
                   if (this.modelPhotoselect.max) {
                     if (photoList.length > this.modelPhotoselect.max) {
-                      self.$message.warning(
-                        "图片最多" + this.modelPhotoselect.max + "张"
-                      );
+                      self.$message({
+                        message: "图片最多" + this.modelPhotoselect.max + "张",
+                        type: 'warning',
+                        showClose:true,
+                      });
                       self.valid = false;
                       setTimeout(() => {
                         self.valid = true;

package/src/centaline/dynamicPhotoSelectList/src/dynamicPhotoSelectList.vue

@@ -75,7 +75,11 @@
           self.loaderObj.PhotoSelectList(self.api, self.load, self.para);
         }
         else {
-          self.$message.warning("请配置选择图片API");
+          self.$message({
+            message: "请配置选择图片API",
+            type: 'warning',
+            showClose:true,
+          });
         }
       })
     },
@@ -103,7 +107,11 @@
           self.imageList = sourceRows;
           //self.imageList=[{thumbnailUrl:'lmg.jj20.com/up/allimg/tp01/1ZZH250054149-0-lp.jpg',mediaUrl:'lmg.jj20.com/up/allimg/tp01/1ZZH250054149-0-lp.jpg'}];
         } catch (e) {
-          self.$message.warning(e);
+          self.$message({
+            message: e,
+            type: 'warning',
+            showClose:true,
+          });
         }
          
       },
@@ -134,7 +142,11 @@
         if (this.chooseList && this.chooseList.length > 0) {
           this.$emit('handlePhoto', this.chooseList);
         } else {
-          this.$message.warning("请选择至少一张图片");
+          this.$message({
+            message: "请选择至少一张图片",
+            type: 'warning',
+            showClose:true,
+          });
         }
       },
       viewerfile(list,index) {

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

@@ -128,7 +128,11 @@
         var jumpRow;
         
         if (!this.jumpStr) {
-          this.$message('请输入定位值！');
+          self.$message({
+            message: '请输入定位值！',
+            type: 'info',
+            showClose:true,
+          });
           return;
         }
 
@@ -162,7 +166,11 @@
             this.$emit('submit', this.currentRow);
           }
           else {
-            this.$message.error("请先选择数据");
+            this.$message({
+              message: "请先选择数据",
+              type: 'error',
+              showClose:true,
+            });            
           }
         }
         else {

package/src/centaline/dynamicRepeat/src/dynamicRepeat.vue

@@ -115,7 +115,11 @@
           rtnBool = false;
         } 
         if (rtnBool && self.model.required && this.model.tableData.length === 0) {
-          self.$message.warning(this.model.label + " 表格不能为空");
+          self.$message({
+            message: this.model.label + " 表格不能为空",
+            type: 'warning',
+            showClose:true,
+          });
           rtnBool = false;
         }
         return rtnBool;

package/src/centaline/dynamicRichText/src/dynamicRichText.vue

@@ -243,7 +243,11 @@
       }
 
       if (this.model.action == "" && !this.model.lock) {
-        this.$message.warning("请配置富文本Action！");
+        this.$message({
+          message: "请配置富文本Action！",
+          type: 'warning',
+          showClose:true,
+        });
         this.config.toolbars = [['help']];
         return;
       }