vxe-pc-ui 4.6.8 → 4.6.10

package/es/alert/src/alert.js

@@ -1,6 +1,6 @@
-import { defineComponent, ref, h, reactive, createCommentVNode } from 'vue';
+import { defineComponent, ref, h, reactive } from 'vue';
 import XEUtils from 'xe-utils';
-import { getConfig, getIcon, createEvent } from '../../ui';
+import { getConfig, getIcon, createEvent, renderEmptyElement } from '../../ui';
 import { getSlotVNs } from '../../ui/src/vn';
 export default defineComponent({
     name: 'VxeAlert',
@@ -69,7 +69,7 @@ export default defineComponent({
                                 class: icon || getIcon()[`ALERT_${status === null || status === void 0 ? void 0 : status.toUpperCase()}`]
                             })
                         ])
-                    : createCommentVNode(),
+                    : renderEmptyElement($xeAlert),
                 h('div', {
                     class: 'vxe-alert--body'
                 }, [
@@ -77,7 +77,7 @@ export default defineComponent({
                         ? h('div', {
                             class: 'vxe-alert--title'
                         }, titleSlot ? getSlotVNs(titleSlot({})) : XEUtils.toValueString(title))
-                        : createCommentVNode(),
+                        : renderEmptyElement($xeAlert),
                     h('div', {
                         class: 'vxe-alert--content'
                     }, defaultSlot ? getSlotVNs(defaultSlot({})) : XEUtils.toValueString(content))
@@ -91,7 +91,7 @@ export default defineComponent({
                             class: getIcon().ALERT_CLOSE
                         })
                     ])
-                    : createCommentVNode()
+                    : renderEmptyElement($xeAlert)
             ]);
         };
         $xeAlert.renderVN = renderVN;

package/es/anchor/src/anchor-link.js

@@ -1,5 +1,6 @@
-import { defineComponent, ref, h, computed, reactive, inject, createCommentVNode, onMounted, onUnmounted, provide, watch } from 'vue';
+import { defineComponent, ref, h, computed, reactive, inject, onMounted, onUnmounted, provide, watch } from 'vue';
 import XEUtils from 'xe-utils';
+import { renderEmptyElement } from '../../ui';
 import { assembleAnchorLink, destroyAnchorLink } from './util';
 export default defineComponent({
     name: 'VxeAnchorLink',
@@ -82,7 +83,7 @@ export default defineComponent({
                     ? h('div', {
                         class: 'vxe-anchor-link--sub-items'
                     }, subSlot({}))
-                    : createCommentVNode()
+                    : renderEmptyElement($xeAnchorLink)
             ]);
         };
         provide('$xeAnchorLink', $xeAnchorLink);

package/es/anchor/src/anchor.js

@@ -1,6 +1,6 @@
-import { defineComponent, ref, h, reactive, provide, nextTick, onBeforeUnmount, onMounted, watch, createCommentVNode, computed } from 'vue';
+import { defineComponent, ref, h, reactive, provide, nextTick, onBeforeUnmount, onMounted, watch, computed } from 'vue';
 import XEUtils from 'xe-utils';
-import { createEvent } from '@vxe-ui/core';
+import { createEvent, renderEmptyElement } from '../../ui';
 import { getOffsetPos } from '../../ui/src/dom';
 import VxeAnchorLinkComponent from './anchor-link';
 export default defineComponent({
@@ -175,7 +175,7 @@ export default defineComponent({
                         ref: refMarkerElem,
                         class: 'vxe-anchor--marker'
                     })
-                    : createCommentVNode()
+                    : renderEmptyElement($xeAnchor)
             ]);
         };
         watch(() => props.modelValue, (val) => {

package/es/breadcrumb/src/breadcrumb-item.js

@@ -1,5 +1,6 @@
-import { defineComponent, ref, h, reactive, computed, resolveComponent, inject, createCommentVNode } from 'vue';
+import { defineComponent, ref, h, reactive, computed, resolveComponent, inject } from 'vue';
 import XEUtils from 'xe-utils';
+import { renderEmptyElement } from '../../ui';
 export default defineComponent({
     name: 'VxeBreadcrumbItem',
     props: {
@@ -72,7 +73,7 @@ export default defineComponent({
                     ? h('span', {
                         class: 'vxe-breadcrumb-item--separator'
                     }, `${separator}`)
-                    : createCommentVNode()
+                    : renderEmptyElement($xeBreadcrumbItem)
             ]);
         };
         $xeBreadcrumbItem.renderVN = renderVN;

package/es/button/src/button-group.js

@@ -1,5 +1,5 @@
-import { defineComponent, h, reactive, provide, createCommentVNode } from 'vue';
-import { getConfig, createEvent, useSize, usePermission } from '@vxe-ui/core';
+import { defineComponent, h, reactive, provide } from 'vue';
+import { getConfig, createEvent, useSize, usePermission, renderEmptyElement } from '../../ui';
 import XEUtils from 'xe-utils';
 import VxeButtonComponent from './button';
 export default defineComponent({
@@ -56,7 +56,7 @@ export default defineComponent({
             const permissionInfo = computePermissionInfo.value;
             const defaultSlot = slots.default;
             if (!permissionInfo.visible) {
-                return createCommentVNode();
+                return renderEmptyElement($xeButtonGroup);
             }
             return h('div', {
                 class: ['vxe-button-group', className ? (XEUtils.isFunction(className) ? className({ $buttonGroup: $xeButtonGroup }) : className) : '', {

package/es/button/src/button.js

@@ -1,6 +1,6 @@
-import { defineComponent, h, ref, computed, Teleport, resolveComponent, onUnmounted, reactive, nextTick, onMounted, inject, createCommentVNode } from 'vue';
+import { defineComponent, h, ref, computed, Teleport, resolveComponent, onUnmounted, reactive, nextTick, onMounted, inject } from 'vue';
 import XEUtils from 'xe-utils';
-import { getConfig, globalEvents, getIcon, createEvent, useSize, usePermission, permission } from '../../ui';
+import { getConfig, globalEvents, getIcon, createEvent, useSize, usePermission, permission, renderEmptyElement } from '../../ui';
 import { getEventTargetNode, updatePanelPlacement } from '../../ui/src/dom';
 import { getFuncText, getLastZIndex, nextZIndex } from '../../ui/src/utils';
 import { warnLog } from '../../ui/src/log';
@@ -94,7 +94,8 @@ const VxeButtonComponent = defineComponent({
         'click',
         'mouseenter',
         'mouseleave',
-        'dropdown-click'
+        'dropdown-click',
+        'dropdownClick'
     ],
     setup(props, context) {
         const { slots, emit } = context;
@@ -488,7 +489,7 @@ const VxeButtonComponent = defineComponent({
             const vSize = computeSize.value;
             const dropdownsSlot = slots.dropdowns;
             if (!permissionInfo.visible) {
-                return createCommentVNode();
+                return renderEmptyElement($xeButton);
             }
             if (dropdownsSlot || downBtnList.length) {
                 const btnOns = {};
@@ -633,10 +634,8 @@ const VxeButtonComponent = defineComponent({
         };
         $xeButton.renderVN = renderVN;
         onMounted(() => {
-            if (process.env.NODE_ENV === 'development') {
-                if (props.type === 'text') {
-                    warnLog('vxe.error.delProp', ['type=text', 'mode=text']);
-                }
+            if (props.type === 'text') {
+                warnLog('vxe.error.delProp', ['type=text', 'mode=text']);
             }
             globalEvents.on($xeButton, 'mousewheel', handleGlobalMousewheelEvent);
             globalEvents.on($xeButton, 'mousedown', handleGlobalMousedownEvent);

package/es/card/src/card.js

@@ -1,6 +1,6 @@
-import { defineComponent, ref, h, reactive, createCommentVNode, computed } from 'vue';
+import { defineComponent, ref, h, reactive, computed } from 'vue';
 import { getSlotVNs } from '../../ui/src/vn';
-import { getConfig, createEvent } from '../../ui';
+import { getConfig, createEvent, renderEmptyElement } from '../../ui';
 import { toCssUnit } from '../../ui/src/dom';
 import VxeLoadingComponent from '../../loading/src/loading';
 import XEUtils from 'xe-utils';
@@ -99,9 +99,9 @@ export default defineComponent({
                                 ? h('div', {
                                     class: 'vxe-card--header-extra'
                                 }, getSlotVNs(extraSlot({})))
-                                : createCommentVNode()
+                                : renderEmptyElement($xeCard)
                         ])
-                    : createCommentVNode(),
+                    : renderEmptyElement($xeCard),
                 h('div', {
                     class: 'vxe-card--body'
                 }, [
@@ -109,7 +109,7 @@ export default defineComponent({
                         ? h('div', {
                             class: 'vxe-card--body-left'
                         }, getSlotVNs(leftSlot({})))
-                        : createCommentVNode(),
+                        : renderEmptyElement($xeCard),
                     h('div', {
                         class: 'vxe-card--body-content'
                     }, defaultSlot ? getSlotVNs(defaultSlot({})) : []),
@@ -117,13 +117,13 @@ export default defineComponent({
                         ? h('div', {
                             class: 'vxe-card--body-right'
                         }, getSlotVNs(rightSlot({})))
-                        : createCommentVNode()
+                        : renderEmptyElement($xeCard)
                 ]),
                 footerSlot
                     ? h('div', {
                         class: 'vxe-card--footer'
                     }, getSlotVNs(footerSlot({})))
-                    : createCommentVNode(),
+                    : renderEmptyElement($xeCard),
                 /**
                  * 加载中
                  */

package/es/carousel/src/carousel.js

@@ -1,5 +1,5 @@
-import { defineComponent, ref, h, reactive, provide, watch, nextTick, onMounted, computed, onUnmounted, createCommentVNode } from 'vue';
-import { getConfig, getIcon, createEvent } from '../../ui';
+import { defineComponent, ref, h, reactive, provide, watch, nextTick, onMounted, computed, onUnmounted } from 'vue';
+import { getConfig, getIcon, createEvent, renderEmptyElement } from '../../ui';
 import { getSlotVNs } from '../../ui/src/vn';
 import { toCssUnit } from '../../ui/src/dom';
 import VxeLoadingComponent from '../../loading/src/loading';
@@ -303,7 +303,7 @@ export default defineComponent({
                 }, [
                     renderItemWrapper(list)
                 ]),
-                showIndicators ? renderIndicators(list) : createCommentVNode(),
+                showIndicators ? renderIndicators(list) : renderEmptyElement($xeCarousel),
                 h('div', {
                     class: 'vxe-carousel--btn-wrapper'
                 }, [

package/es/countdown/src/countdown.js

@@ -1,5 +1,5 @@
-import { defineComponent, ref, h, reactive, watch, computed, onUnmounted, onMounted, createCommentVNode } from 'vue';
-import { getConfig, getI18n, createEvent, useSize } from '../../ui';
+import { defineComponent, ref, h, reactive, watch, computed, onUnmounted, onMounted } from 'vue';
+import { getConfig, getI18n, createEvent, useSize, renderEmptyElement } from '../../ui';
 import { getSlotVNs } from '../../ui/src/vn';
 import VxeTextComponent from '../../text/src/text';
 import XEUtils from 'xe-utils';
@@ -182,7 +182,7 @@ export default defineComponent({
                                 status: prefixOpts.status
                             })
                         ])
-                    : createCommentVNode(),
+                    : renderEmptyElement($xeCountdown),
                 h('div', {
                     class: 'vxe-countdown--content'
                 }, defaultSlot
@@ -200,7 +200,7 @@ export default defineComponent({
                                 status: suffixOpts.status
                             })
                         ])
-                    : createCommentVNode()
+                    : renderEmptyElement($xeCountdown)
             ]);
         };
         watch(() => props.modelValue, () => {

package/es/form/render/index.js

@@ -87,10 +87,8 @@ function getComponentOns(renderOpts, params, eFns, eventOns) {
     const ons = {};
     XEUtils.objectEach(events, (func, key) => {
         ons[getOnName(key)] = function (...args) {
-            if (process.env.NODE_ENV === 'development') {
-                if (!XEUtils.isFunction(func)) {
-                    errLog('vxe.error.errFunc', [func]);
-                }
+            if (!XEUtils.isFunction(func)) {
+                errLog('vxe.error.errFunc', [func]);
             }
             func(params, ...args);
         };

package/es/form/src/form-group.js

@@ -1,6 +1,6 @@
-import { defineComponent, onUnmounted, inject, ref, h, reactive, onMounted, provide, createCommentVNode } from 'vue';
+import { defineComponent, onUnmounted, inject, ref, h, reactive, onMounted, provide } from 'vue';
 import { createItem, watchItem, destroyItem, assembleItem } from './util';
-import { renderer } from '../../ui';
+import { renderer, renderEmptyElement } from '../../ui';
 import { isEnableConf } from '../../ui/src/utils';
 import { formItemProps } from './form-item';
 import { renderTitle, getItemClass, getItemContentClass } from './render';
@@ -10,6 +10,7 @@ export default defineComponent({
     props: formItemProps,
     setup(props, context) {
         const { slots } = context;
+        const xID = XEUtils.uniqueId();
         const refElem = ref();
         const $xeForm = inject('$xeForm', {});
         const $xeParentFormGroup = inject('$xeFormGroup', null);
@@ -30,7 +31,7 @@ export default defineComponent({
             const defaultSlot = slots ? slots.default : null;
             const params = { data, disabled, readonly, field, property: field, item, $form: $xeForm, $grid: $xeGrid };
             if (visible === false) {
-                return createCommentVNode();
+                return renderEmptyElement($xeFormGroup);
             }
             return h('div', {
                 ref: refElem,
@@ -46,6 +47,7 @@ export default defineComponent({
             ]);
         };
         const $xeFormGroup = {
+            xID,
             formItem,
             renderVN
         };

package/es/form/src/form-item.js

@@ -1,6 +1,6 @@
-import { defineComponent, h, onUnmounted, inject, ref, provide, onMounted, reactive, createCommentVNode } from 'vue';
+import { defineComponent, h, onUnmounted, inject, ref, provide, onMounted, reactive } from 'vue';
 import { createItem, watchItem, destroyItem, assembleItem } from './util';
-import { renderer } from '../../ui';
+import { renderer, renderEmptyElement } from '../../ui';
 import { isEnableConf } from '../../ui/src/utils';
 import { renderTitle, renderItemContent, getItemClass, getItemContentClass } from './render';
 import XEUtils from 'xe-utils';
@@ -86,6 +86,7 @@ export default defineComponent({
     name: 'VxeFormItem',
     props: formItemProps,
     setup(props, { slots }) {
+        const xID = XEUtils.uniqueId();
         const refElem = ref();
         const $xeForm = inject('$xeForm', {});
         const $xeFormGroup = inject('$xeFormGroup', null);
@@ -103,7 +104,7 @@ export default defineComponent({
             const itemContentStyle = compConf ? (compConf.formItemContentStyle || compConf.itemContentStyle) : null;
             const params = { data, disabled, readonly, field, property: field, item, $form: $xeForm, $grid: $xeGrid };
             if (visible === false) {
-                return createCommentVNode();
+                return renderEmptyElement($xeFormitem);
             }
             return h('div', {
                 ref: refElem,
@@ -113,7 +114,7 @@ export default defineComponent({
             }, [
                 renderTitle($xeForm, item),
                 showContent === false
-                    ? createCommentVNode()
+                    ? renderEmptyElement($xeFormitem)
                     : h('div', {
                         class: getItemContentClass($xeForm, item),
                         style: Object.assign({}, XEUtils.isFunction(itemContentStyle) ? itemContentStyle(params) : itemContentStyle, XEUtils.isFunction(contentStyle) ? contentStyle(params) : contentStyle)
@@ -132,6 +133,7 @@ export default defineComponent({
                 });
         };
         const $xeFormitem = {
+            xID,
             formItem,
             renderVN
         };

package/es/form/src/form.js

@@ -1,7 +1,7 @@
 import { defineComponent, h, ref, provide, computed, inject, reactive, watch, nextTick, onMounted } from 'vue';
 import XEUtils from 'xe-utils';
 import { getConfig, validators, renderer, createEvent, useSize } from '../../ui';
-import { getFuncText, isEnableConf, eqEmptyValue } from '../../ui/src/utils';
+import { getFuncText, isEnableConf } from '../../ui/src/utils';
 import { scrollToView } from '../../ui/src/dom';
 import { createItem, handleFieldOrItem, isHiddenItem, isActiveItem } from './util';
 import VxeTooltipComponent from '../../tooltip/src/tooltip';
@@ -30,28 +30,104 @@ class Rule {
         return this.content;
     }
 }
-const validErrorRuleValue = (rule, val) => {
+// 如果存在 pattern，判断正则
+function validREValue(pattern, val) {
+    if (pattern && !(XEUtils.isRegExp(pattern) ? pattern : new RegExp(pattern)).test(val)) {
+        return false;
+    }
+    return true;
+}
+// 如果存在 max，判断最大值
+function validMaxValue(max, num) {
+    if (!XEUtils.eqNull(max) && num > XEUtils.toNumber(max)) {
+        return false;
+    }
+    return true;
+}
+// 如果存在 min，判断最小值
+function validMinValue(min, num) {
+    if (!XEUtils.eqNull(min) && num < XEUtils.toNumber(min)) {
+        return false;
+    }
+    return true;
+}
+function validRuleValue(rule, val, required) {
     const { type, min, max, pattern } = rule;
+    const isArrType = type === 'array';
     const isNumType = type === 'number';
-    const numVal = isNumType ? XEUtils.toNumber(val) : XEUtils.getSize(val);
-    // 判断数值
-    if (isNumType && isNaN(val)) {
-        return true;
+    const isStrType = type === 'string';
+    const strVal = `${val}`;
+    if (!validREValue(pattern, strVal)) {
+        return false;
     }
-    // 如果存在 min，判断最小值
-    if (!XEUtils.eqNull(min) && numVal < XEUtils.toNumber(min)) {
-        return true;
+    if (isArrType) {
+        if (!XEUtils.isArray(val)) {
+            return false;
+        }
+        if (required) {
+            if (!val.length) {
+                return false;
+            }
+        }
+        if (!validMinValue(min, val.length)) {
+            return false;
+        }
+        if (!validMaxValue(max, val.length)) {
+            return false;
+        }
     }
-    // 如果存在 max，判断最大值
-    if (!XEUtils.eqNull(max) && numVal > XEUtils.toNumber(max)) {
-        return true;
+    else if (isNumType) {
+        const numVal = Number(val);
+        if (isNaN(numVal)) {
+            return false;
+        }
+        if (!validMinValue(min, numVal)) {
+            return false;
+        }
+        if (!validMaxValue(max, numVal)) {
+            return false;
+        }
     }
-    // 如果存在 pattern，正则校验
-    if (pattern && !(XEUtils.isRegExp(pattern) ? pattern : new RegExp(pattern)).test(val)) {
-        return true;
+    else {
+        if (isStrType) {
+            if (!XEUtils.isString(val)) {
+                return false;
+            }
+        }
+        if (required) {
+            if (!strVal) {
+                return false;
+            }
+        }
+        if (!validMinValue(min, strVal.length)) {
+            return false;
+        }
+        if (!validMaxValue(max, strVal.length)) {
+            return false;
+        }
     }
-    return false;
-};
+    return true;
+}
+function checkRuleStatus(rule, val) {
+    const { required } = rule;
+    const isEmptyVal = XEUtils.eqNull(val);
+    if (required) {
+        if (isEmptyVal) {
+            return false;
+        }
+        if (!validRuleValue(rule, val, required)) {
+            return false;
+        }
+    }
+    else {
+        if (!isEmptyVal) {
+            if (!validRuleValue(rule, val, required)) {
+                return false;
+            }
+        }
+    }
+    return true;
+}
 export default defineComponent({
     name: 'VxeForm',
     props: {
@@ -383,7 +459,7 @@ export default defineComponent({
                     if (rules) {
                         const itemValue = XEUtils.isUndefined(val) ? XEUtils.get(data, property) : val;
                         rules.forEach((rule) => {
-                            const { type, trigger, required, validator } = rule;
+                            const { trigger, validator } = rule;
                             if (validType === 'all' || !trigger || validType === trigger) {
                                 if (validator) {
                                     const validParams = {
@@ -404,15 +480,11 @@ export default defineComponent({
                                                 customValid = validatorMethod(validParams);
                                             }
                                             else {
-                                                if (process.env.NODE_ENV === 'development') {
-                                                    warnLog('vxe.error.notValidators', [validator]);
-                                                }
+                                                warnLog('vxe.error.notValidators', [validator]);
                                             }
                                         }
                                         else {
-                                            if (process.env.NODE_ENV === 'development') {
-                                                errLog('vxe.error.notValidators', [validator]);
-                                            }
+                                            errLog('vxe.error.notValidators', [validator]);
                                         }
                                     }
                                     else {
@@ -431,19 +503,7 @@ export default defineComponent({
                                     }
                                 }
                                 else {
-                                    const isArrType = type === 'array';
-                                    const isArrVal = XEUtils.isArray(itemValue);
-                                    let hasEmpty = true;
-                                    if (isArrType || isArrVal) {
-                                        hasEmpty = !isArrVal || !itemValue.length;
-                                    }
-                                    else if (XEUtils.isString(itemValue)) {
-                                        hasEmpty = eqEmptyValue(itemValue.trim());
-                                    }
-                                    else {
-                                        hasEmpty = eqEmptyValue(itemValue);
-                                    }
-                                    if (required ? (hasEmpty || validErrorRuleValue(rule, itemValue)) : (!hasEmpty && validErrorRuleValue(rule, itemValue))) {
+                                    if (!checkRuleStatus(rule, itemValue)) {
                                         errorRules.push(new Rule(rule));
                                     }
                                 }

package/es/form-design/src/default-setting-form.js

@@ -1,5 +1,5 @@
 import { h, defineComponent, inject, createCommentVNode } from 'vue';
-import { getIcon, getI18n } from '@vxe-ui/core';
+import { getIcon, getI18n } from '../../ui';
 import VxeFormComponent from '../../form/src/form';
 import VxeFormItemComponent from '../../form/src/form-item';
 import VxeSwitchComponent from '../../switch/src/switch';

package/es/form-design/src/form-view.js

@@ -1,6 +1,6 @@
-import { defineComponent, ref, h, reactive, nextTick, inject, provide, watch, createCommentVNode } from 'vue';
+import { defineComponent, ref, h, reactive, nextTick, inject, provide, watch } from 'vue';
 import XEUtils from 'xe-utils';
-import { getConfig, renderer, useSize, createEvent } from '../../ui';
+import { getConfig, renderer, useSize, createEvent, renderEmptyElement } from '../../ui';
 import { getSlotVNs } from '../../ui/src/vn';
 import { createDefaultFormViewPCFormConfig } from './default-setting-data';
 import VxeFormComponent from '../../form/src/form';
@@ -218,9 +218,7 @@ export default defineComponent({
              * @deprecated
              */
             updateItemStatus(widget, value) {
-                if (process.env.NODE_ENV === 'development') {
-                    warnLog('vxe.error.delFunc', ['updateItemStatus', 'updateWidgetStatus']);
-                }
+                warnLog('vxe.error.delFunc', ['updateItemStatus', 'updateWidgetStatus']);
                 return updateWidgetStatus(widget, value);
             }
         };
@@ -250,7 +248,7 @@ export default defineComponent({
                     ? h('div', {
                         class: 'vxe-form-view--top'
                     }, getSlotVNs(topSlot({ $formView: $xeFormView })))
-                    : createCommentVNode(),
+                    : renderEmptyElement($xeFormView),
                 h(VxeFormComponent, Object.assign(Object.assign({ ref: formRef }, formConfig), { data: modelValue, customLayout: true, readonly,
                     disabled, span: 24, rules: formRules, onSubmit: handleSubmit, onReset: handleReset }), {
                     default() {
@@ -262,7 +260,7 @@ export default defineComponent({
                                         return headerSlot({});
                                     }
                                 })
-                                : createCommentVNode(),
+                                : renderEmptyElement($xeFormView),
                             ...widgetObjList.map(widget => {
                                 const { name } = widget;
                                 const compConf = renderer.get(name) || {};
@@ -301,7 +299,7 @@ export default defineComponent({
                                         return footerSlot({});
                                     }
                                 })
-                                : createCommentVNode()
+                                : renderEmptyElement($xeFormView)
                         ];
                     }
                 }),
@@ -309,7 +307,7 @@ export default defineComponent({
                     ? h('div', {
                         class: 'vxe-form-view--bottom'
                     }, getSlotVNs(bottomSlot({ $formView: $xeFormView })))
-                    : createCommentVNode()
+                    : renderEmptyElement($xeFormView)
             ]);
         };
         $xeFormView.renderVN = renderVN;