From 0dfe0d48e65d0ac119e021ab15ff7bd17268edbb Mon Sep 17 00:00:00 2001
From: xuliangzhan <xu_liangzhan@163.com>
Date: Sat, 24 Apr 2021 11:36:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0=20showClos?=
 =?UTF-8?q?e=E3=80=81=E5=A2=9E=E5=8A=A0=E6=8F=92=E6=A7=BD=20prefix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/api/input.js                   | 21 ++++++++++++++++++++-
 examples/api/modal.js                   |  9 +++++++++
 examples/api/select.js                  | 12 +++++++++++-
 examples/views/table/base/AutoBreak.vue |  2 +-
 package.json                            |  4 ++--
 packages/form/src/form.js               |  2 +-
 packages/modal/src/modal.js             |  9 +++++----
 packages/select/src/select.js           |  8 ++++++--
 packages/v-x-e-table/src/conf.js        |  1 +
 packages/validator/src/mixin.js         |  2 +-
 10 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/examples/api/input.js b/examples/api/input.js
index aa9cb3a68..10c1860e6 100644
--- a/examples/api/input.js
+++ b/examples/api/input.js
@@ -297,7 +297,26 @@ const apis = [
     type: '',
     enum: '',
     defVal: '',
-    list: []
+    list: [
+      {
+        name: 'prefix',
+        desc: '前缀图标模板',
+        version: '',
+        type: '',
+        enum: '',
+        defVal: '',
+        list: []
+      },
+      {
+        name: 'suffix',
+        desc: '后缀图标模板',
+        version: '',
+        type: '',
+        enum: '',
+        defVal: '',
+        list: []
+      }
+    ]
   },
   {
     name: 'Events',
diff --git a/examples/api/modal.js b/examples/api/modal.js
index 608864ef6..758db8c07 100644
--- a/examples/api/modal.js
+++ b/examples/api/modal.js
@@ -206,6 +206,15 @@ const apis = [
         defVal: 'false',
         list: []
       },
+      {
+        name: 'show-close',
+        desc: '是否显示关闭按钮',
+        version: '3.2.20',
+        type: 'Boolean',
+        enum: '',
+        defVal: 'true',
+        list: []
+      },
       {
         name: 'duration',
         descKey: 'app.api.modal.desc.duration',
diff --git a/examples/api/select.js b/examples/api/select.js
index b5db3e060..ca84247a2 100644
--- a/examples/api/select.js
+++ b/examples/api/select.js
@@ -178,7 +178,17 @@ const apis = [
     type: '',
     enum: '',
     defVal: '',
-    list: []
+    list: [
+      {
+        name: 'prefix',
+        desc: '前缀图标模板',
+        version: '3.2.20',
+        type: '',
+        enum: '',
+        defVal: '',
+        list: []
+      }
+    ]
   },
   {
     name: 'Events',
diff --git a/examples/views/table/base/AutoBreak.vue b/examples/views/table/base/AutoBreak.vue
index 2c374b1d9..a9fe99b66 100644
--- a/examples/views/table/base/AutoBreak.vue
+++ b/examples/views/table/base/AutoBreak.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <p class="tip">单元格超出指定宽度自动换行，通过设置 <table-api-link prop="scroll-x"/>="{enabled: false} 和 <table-api-link prop="scroll-y"/>="{enabled: false} 启用自动换行</p>
+    <p class="tip">单元格超出指定宽度自动换行，通过设置 <table-api-link prop="scroll-x"/>="{enabled: false} 和 <table-api-link prop="scroll-y"/>="{enabled: false} 关闭虚拟滚动，则支持自动换行</p>
 
     <vxe-table
       :data="tableData"
diff --git a/package.json b/package.json
index a1a4946bc..2c10a3037 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.2.19",
+  "version": "3.2.20",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟滚动、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、虚拟列表、模态窗口、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -88,7 +88,7 @@
     "vxe-table-plugin-virtual-tree": "0.6.7",
     "xe-ajax": "^4.0.5",
     "xe-clipboard": "^1.10.1",
-    "xe-utils": "^3.1.15",
+    "xe-utils": "^3.2.0",
     "xlsx": "^0.16.8"
   },
   "peerDependencies": {
diff --git a/packages/form/src/form.js b/packages/form/src/form.js
index fee8729ee..1b00a3edb 100644
--- a/packages/form/src/form.js
+++ b/packages/form/src/form.js
@@ -45,7 +45,7 @@ function validErrorRuleValue (rule, val) {
   }
   // 如果存在 pattern，正则校验
   if (pattern) {
-    return (XEUtils.isRegExp(pattern) ? pattern : new RegExp(pattern)).test(val)
+    return !(XEUtils.isRegExp(pattern) ? pattern : new RegExp(pattern)).test(val)
   }
   return false
 }
diff --git a/packages/modal/src/modal.js b/packages/modal/src/modal.js
index eb94db511..4c0d0af19 100644
--- a/packages/modal/src/modal.js
+++ b/packages/modal/src/modal.js
@@ -35,6 +35,7 @@ export default {
     showHeader: { type: Boolean, default: () => GlobalConfig.modal.showHeader },
     showFooter: { type: Boolean, default: () => GlobalConfig.modal.showFooter },
     showZoom: { type: Boolean, default: null },
+    showClose: { type: Boolean, default: () => GlobalConfig.modal.showClose },
     dblclickZoom: { type: Boolean, default: () => GlobalConfig.modal.dblclickZoom },
     width: [Number, String],
     height: [Number, String],
@@ -114,7 +115,7 @@ export default {
     }
   },
   render (h) {
-    const { $scopedSlots, slots = {}, inited, vSize, className, type, resize, showZoom, animat, loading, status, iconStatus, showFooter, zoomLocat, modalTop, dblclickZoom, contentVisible, visible, title, lockScroll, lockView, mask, isMsg, showTitleOverflow, destroyOnClose } = this
+    const { _e, $scopedSlots, slots = {}, inited, vSize, className, type, resize, showClose, showZoom, animat, loading, status, iconStatus, showFooter, zoomLocat, modalTop, dblclickZoom, contentVisible, visible, title, lockScroll, lockView, mask, isMsg, showTitleOverflow, destroyOnClose } = this
     const content = this.content || this.message
     const defaultSlot = $scopedSlots.default || slots.default
     const footerSlot = $scopedSlots.footer || slots.footer
@@ -170,8 +171,8 @@ export default {
             on: {
               click: this.toggleZoomEvent
             }
-          }) : null,
-          h('i', {
+          }) : _e(),
+          showClose ? h('i', {
             class: ['vxe-modal--close-btn', 'trigger--btn', GlobalConfig.icon.MODAL_CLOSE],
             attrs: {
               title: GlobalConfig.i18n('vxe.modal.close')
@@ -179,7 +180,7 @@ export default {
             on: {
               click: this.closeEvent
             }
-          })
+          }) : _e()
         ]) : null,
         h('div', {
           class: 'vxe-modal--body'
diff --git a/packages/select/src/select.js b/packages/select/src/select.js
index 1e996d7b3..8d9142d8e 100644
--- a/packages/select/src/select.js
+++ b/packages/select/src/select.js
@@ -325,7 +325,8 @@ export default {
     GlobalEvent.off(this, 'blur')
   },
   render (h) {
-    const { vSize, className, inited, isActivated, disabled, visiblePanel } = this
+    const { $scopedSlots, vSize, className, inited, isActivated, disabled, visiblePanel } = this
+    const prefixSlot = $scopedSlots.prefix
     return h('div', {
       class: ['vxe-select', className ? (XEUtils.isFunction(className) ? className({ $select: this }) : className) : '', {
         [`size--${vSize}`]: vSize,
@@ -356,7 +357,10 @@ export default {
           focus: this.focusEvent,
           blur: this.blurEvent,
           'suffix-click': this.togglePanelEvent
-        }
+        },
+        scopedSlots: prefixSlot ? {
+          prefix: () => prefixSlot({})
+        } : {}
       }),
       h('div', {
         ref: 'panel',
diff --git a/packages/v-x-e-table/src/conf.js b/packages/v-x-e-table/src/conf.js
index 36495423c..6bf6fa2f4 100644
--- a/packages/v-x-e-table/src/conf.js
+++ b/packages/v-x-e-table/src/conf.js
@@ -304,6 +304,7 @@ export default {
     dblclickZoom: true,
     showTitleOverflow: true,
     animat: true,
+    showClose: true,
     // storage: false,
     storageKey: 'VXE_MODAL_POSITION'
   },
diff --git a/packages/validator/src/mixin.js b/packages/validator/src/mixin.js
index f0b931cd0..d507c9095 100644
--- a/packages/validator/src/mixin.js
+++ b/packages/validator/src/mixin.js
@@ -47,7 +47,7 @@ function validErrorRuleValue (rule, val) {
   }
   // 如果存在 pattern，正则校验
   if (pattern) {
-    return (XEUtils.isRegExp(pattern) ? pattern : new RegExp(pattern)).test(val)
+    return !(XEUtils.isRegExp(pattern) ? pattern : new RegExp(pattern)).test(val)
   }
   return false
 }