vxe-pc-ui 4.6.40 → 4.6.42

package/lib/index.umd.js

@@ -3816,7 +3816,8 @@ setTheme();
     colorPicker: {
       clear: '清除',
       confirm: '确认',
-      copySuccess: '已复制到剪贴板：{0}'
+      copySuccess: '已复制到剪贴板：{0}',
+      hex: '十六进制'
     },
     formDesign: {
       formName: '表单名称',
@@ -4242,14 +4243,14 @@ function checkDynamic() {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.6.40"}`;
+const log_version = `ui v${"4.6.42"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-const ui_version = "4.6.40";
+const ui_version = "4.6.42";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -4311,7 +4312,7 @@ setConfig({
   collapsePane: {},
   countdown: {},
   colorPicker: {
-    type: 'hex',
+    type: 'rgb',
     clearable: true,
     showAlpha: true,
     clickToCopy: true,
@@ -4647,7 +4648,7 @@ setIcon({
   SELECT_LOADED: iconPrefix + 'spinner roll',
   SELECT_OPEN: iconPrefix + 'caret-down rotate180',
   SELECT_CLOSE: iconPrefix + 'caret-down',
-  ADD_OPTION: iconPrefix + 'add',
+  SELECT_ADD_OPTION: iconPrefix + 'add',
   // icon-picker
   ICON_PICKER_OPEN: iconPrefix + 'caret-down rotate180',
   ICON_PICKER_CLOSE: iconPrefix + 'caret-down',
@@ -6550,9 +6551,17 @@ const VxeButtonComponent = defineVxeComponent({
      */
     title: String,
     /**
-     * 按钮的图标
+     * 按钮的前缀图标，属于 prefix-icon 的简写
      */
     icon: String,
+    /**
+     * 按钮的前缀图标
+     */
+    prefixIcon: String,
+    /**
+     * 按钮的后缀图标
+     */
+    suffixIcon: String,
     /**
      * 圆角边框
      */
@@ -6742,10 +6751,10 @@ const VxeButtonComponent = defineVxeComponent({
       return [];
     });
     const computePrefixTipOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      return Object.assign({}, props.prefixTooltip);
+      return Object.assign({}, getConfig().button.prefixTooltip, props.prefixTooltip);
     });
     const computeSuffixTipOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      return Object.assign({}, props.suffixTooltip);
+      return Object.assign({}, getConfig().button.suffixTooltip, props.suffixTooltip);
     });
     const updateZindex = () => {
       if (reactData.panelIndex < getLastZIndex()) {
@@ -6933,23 +6942,27 @@ const VxeButtonComponent = defineVxeComponent({
         theme: tipOpts.theme
       }, {
         default() {
-          return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-            class: [`vxe-button--tooltip-${type}-icon`, tipOpts.icon || getIcon().BUTTON_TOOLTIP_ICON]
-          });
+          return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+            class: `vxe-button--item vxe-button--tooltip-${type}-icon`
+          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+            class: tipOpts.icon || getIcon().BUTTON_TOOLTIP_ICON
+          })]);
         }
       });
     };
     const renderContent = () => {
       const {
         content,
-        icon,
+        suffixIcon,
         loading,
         prefixTooltip,
         suffixTooltip
       } = props;
+      const prefixIcon = props.prefixIcon || props.icon;
       const prefixTipOpts = computePrefixTipOpts.value;
       const suffixTipOpts = computeSuffixTipOpts.value;
-      const iconSlot = slots.icon;
+      const prefixIconSlot = slots.prefix || slots.icon;
+      const suffixIconSlot = slots.suffix;
       const defaultSlot = slots.default;
       const contVNs = [];
       if (prefixTooltip) {
@@ -6957,26 +6970,35 @@ const VxeButtonComponent = defineVxeComponent({
       }
       if (loading) {
         contVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-          class: ['vxe-button--loading-icon', getIcon().BUTTON_LOADING]
+          class: ['vxe-button--item vxe-button--loading-icon', getIcon().BUTTON_LOADING]
         }));
-      } else if (iconSlot) {
+      } else if (prefixIconSlot) {
         contVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-          class: 'vxe-button--custom-icon'
-        }, iconSlot({})));
-      } else if (icon) {
+          class: 'vxe-button--item vxe-button--custom-prefix-icon'
+        }, prefixIconSlot({})));
+      } else if (prefixIcon) {
         contVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-          class: ['vxe-button--icon', icon]
+          class: ['vxe-button--item vxe-button--prefix-icon', prefixIcon]
         }));
       }
       if (defaultSlot) {
         contVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-          class: 'vxe-button--content'
+          class: 'vxe-button--item vxe-button--content'
         }, defaultSlot({})));
       } else if (content) {
         contVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-          class: 'vxe-button--content'
+          class: 'vxe-button--item vxe-button--content'
         }, getFuncText(content)));
       }
+      if (suffixIconSlot) {
+        contVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+          class: 'vxe-button--item vxe-button--custom-suffix-icon'
+        }, suffixIconSlot({})));
+      } else if (suffixIcon) {
+        contVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+          class: ['vxe-button--item vxe-button--suffix-icon', suffixIcon]
+        }));
+      }
       if (suffixTooltip) {
         contVNs.push(renderTooltipIcon(suffixTipOpts, 'suffix'));
       }
@@ -14432,7 +14454,7 @@ function toFloatValueFixed(inputValue, digitsValue) {
         }
       })]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-color-picker--input-title'
-      }, 'HEX')])])]);
+      }, i18n_getI18n('vxe.colorPicker.hex'))])])]);
     };
     const renderQuickWrapper = () => {
       const {
@@ -27951,7 +27973,7 @@ function getOptUniqueId() {
           key: 2,
           class: 'vxe-select-option--add-icon'
         }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-          class: getIcon().ADD_OPTION
+          class: getIcon().SELECT_ADD_OPTION
         })]) : renderEmptyElement($xeSelect)] : optVNs) : renderEmptyElement($xeSelect);
       });
     };