vxe-pc-ui 3.3.44 → 3.3.46

package/lib/index.umd.js

@@ -10774,7 +10774,7 @@ var es_function_name = __webpack_require__(2010);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
 var es_object_assign = __webpack_require__(9085);
 ;// CONCATENATED MODULE: ./node_modules/@vxe-ui/core/es/src/core.js
-var coreVersion = "3.0.20";
+var coreVersion = "3.0.21";
 var VxeCore = {
   coreVersion: coreVersion,
   uiVersion: '',
@@ -11447,7 +11447,7 @@ function createLog(type, name) {
     return msg;
   };
 }
-var version = "3.0.20";
+var version = "3.0.21";
 var log = {
   create: createLog,
   warn: createLog('warn', "v".concat(version)),
@@ -11956,9 +11956,12 @@ var sizeMixin = external_commonjs_vue_commonjs2_vue_root_Vue_default().extend({
     }
   },
   provide: function provide() {
+    var _this = this;
     return {
       $xeSizeInfo: {
-        size: this.computeSize
+        getSize: function getSize() {
+          return _this.computeSize;
+        }
       }
     };
   },
@@ -11966,7 +11969,7 @@ var sizeMixin = external_commonjs_vue_commonjs2_vue_root_Vue_default().extend({
     computeSize: function computeSize() {
       var size = this.size;
       var $xeSizeInfo = this.$xeSizeInfo;
-      return size || ($xeSizeInfo ? $xeSizeInfo.size : null);
+      return size || ($xeSizeInfo ? $xeSizeInfo.getSize() : null);
     }
   }
 });
@@ -12871,7 +12874,7 @@ function handleBooleanDefaultValue(value) {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.3.44");
+var log_version = "ui v".concat("3.3.46");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
@@ -12879,7 +12882,7 @@ var errLog = log.create('error', log_version);
 
 
 
-var ui_version = "3.3.44";
+var ui_version = "3.3.46";
 index_esm_VxeUI.version = ui_version;
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.tableVersion = '';
@@ -12949,6 +12952,7 @@ setConfig({
   countdown: {},
   colorPicker: {
     type: 'hex',
+    clearable: true,
     showAlpha: true,
     clickToCopy: true,
     showColorExtractor: true,
@@ -13095,6 +13099,7 @@ setConfig({
     // size: null,
     // transfer: false
     digits: 2,
+    autoFill: true,
     controls: true
   },
   optgroup: {},
@@ -22524,7 +22529,12 @@ function toFloatValueFixed(inputValue, digitsValue) {
   props: {
     value: String,
     placeholder: String,
-    clearable: Boolean,
+    clearable: {
+      type: Boolean,
+      default: function _default() {
+        return getConfig().colorPicker.clearable;
+      }
+    },
     type: {
       type: String,
       default: function _default() {
@@ -22583,6 +22593,30 @@ function toFloatValueFixed(inputValue, digitsValue) {
       default: null
     }
   },
+  inject: {
+    $xeModal: {
+      default: null
+    },
+    $xeDrawer: {
+      default: null
+    },
+    $xeTable: {
+      default: null
+    },
+    $xeForm: {
+      default: null
+    },
+    formItemInfo: {
+      from: 'xeFormItemInfo',
+      default: null
+    }
+  },
+  provide: function provide() {
+    var $xeColorPicker = this;
+    return {
+      $xeColorPicker: $xeColorPicker
+    };
+  },
   data: function data() {
     var xID = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId();
     var reactData = {
@@ -22646,7 +22680,7 @@ function toFloatValueFixed(inputValue, digitsValue) {
       var $xeForm = $xeColorPicker.$xeForm;
       var transfer = props.transfer;
       if (transfer === null) {
-        var globalTransfer = getConfig().iconPicker.transfer;
+        var globalTransfer = getConfig().colorPicker.transfer;
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(globalTransfer)) {
           return globalTransfer;
         }
@@ -22916,6 +22950,21 @@ function toFloatValueFixed(inputValue, digitsValue) {
         value: selectValue
       }, evnt);
     },
+    focusEvent: function focusEvent() {
+      var $xeColorPicker = this;
+      var reactData = $xeColorPicker.reactData;
+      var isDisabled = $xeColorPicker.computeIsDisabled;
+      if (!isDisabled) {
+        if (!reactData.visiblePanel) {
+          $xeColorPicker.showOptionPanel();
+        }
+      }
+    },
+    blurEvent: function blurEvent() {
+      var $xeColorPicker = this;
+      var reactData = $xeColorPicker.reactData;
+      reactData.isActivated = false;
+    },
     clearEvent: function clearEvent(evnt) {
       var $xeColorPicker = this;
       $xeColorPicker.clearValueEvent(evnt, null);
@@ -23422,14 +23471,26 @@ function toFloatValueFixed(inputValue, digitsValue) {
         return h('div', {
           ref: 'refElem',
           class: ['vxe-color-picker--readonly', className]
-        }, 'x');
+        }, [h('div', {
+          class: 'vxe-color-picker--readonly-color',
+          style: {
+            backgroundColor: value
+          }
+        })]);
       }
       return h('div', {
         ref: 'refElem',
         class: ['vxe-color-picker', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
           $colorPicker: $xeColorPicker
         }) : className : '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--selected', !!value), 'is--visible', visiblePanel), 'is--disabled', isDisabled), 'is--active', isActivated)]
-      }, [h('div', {
+      }, [h('input', {
+        ref: 'refInput',
+        class: 'vxe-color-picker--input',
+        on: {
+          focus: $xeColorPicker.focusEvent,
+          blur: $xeColorPicker.blurEvent
+        }
+      }), h('div', {
         class: 'vxe-color-picker--inner',
         on: {
           click: $xeColorPicker.clickEvent
@@ -23450,8 +23511,6 @@ function toFloatValueFixed(inputValue, digitsValue) {
         style: reactData.panelStyle
       }, [initialized && (visiblePanel || isAniVisible) ? h('div', {
         class: 'vxe-color-picker--panel-wrapper'
-      }, [h('div', {
-        class: ''
       }, [$xeColorPicker.renderColorWrapper(h), $xeColorPicker.renderColorBar(h), $xeColorPicker.renderQuickWrapper(h), h('div', {
         class: 'vxe-color-picker--footer-wrapper'
       }, [clearable ? h(src_button, {
@@ -23471,7 +23530,7 @@ function toFloatValueFixed(inputValue, digitsValue) {
         on: {
           click: $xeColorPicker.confirmEvent
         }
-      })])])]) : renderEmptyElement($xeColorPicker)])]);
+      })])]) : renderEmptyElement($xeColorPicker)])]);
     }
   },
   watch: {
@@ -23484,7 +23543,7 @@ function toFloatValueFixed(inputValue, digitsValue) {
     var $xeColorPicker = this;
     var props = $xeColorPicker;
     var reactData = $xeColorPicker.reactData;
-    reactData.selectColor = props.value;
+    reactData.selectColor = "".concat(props.value || '');
     $xeColorPicker.updateMode();
     globalEvents.on($xeColorPicker, 'mousewheel', $xeColorPicker.handleGlobalMousewheelEvent);
     globalEvents.on($xeColorPicker, 'mousedown', $xeColorPicker.handleGlobalMousedownEvent);
@@ -29305,8 +29364,35 @@ renderer.mixin({
       })];
     }
   },
+  VxeColorPicker: {
+    formItemAutoFocus: 'input',
+    renderFormItemContent: function renderFormItemContent(h, renderOpts, params) {
+      var data = params.data,
+        field = params.field;
+      var options = renderOpts.options;
+      var itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, field);
+      return [h(getDefaultComponent(renderOpts), {
+        props: getComponentFormItemProps(renderOpts, params, itemValue, {
+          colors: options
+        }),
+        on: getItemOns(renderOpts, params)
+      })];
+    }
+  },
   VxeIconPicker: {
-    renderFormItemContent: defaultFormItemRender
+    formItemAutoFocus: 'input',
+    renderFormItemContent: function renderFormItemContent(h, renderOpts, params) {
+      var data = params.data,
+        field = params.field;
+      var options = renderOpts.options;
+      var itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, field);
+      return [h(getDefaultComponent(renderOpts), {
+        props: getComponentFormItemProps(renderOpts, params, itemValue, {
+          icons: options
+        }),
+        on: getItemOns(renderOpts, params)
+      })];
+    }
   },
   VxeRadio: {
     renderFormItemContent: defaultFormItemRender
@@ -35007,6 +35093,10 @@ var NoticeBar = VxeNoticeBar;
 
 
 
+
+
+
+
 
 var handleNumberString = function handleNumberString(val) {
   if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(val)) {
@@ -35102,6 +35192,12 @@ var handleNumberString = function handleNumberString(val) {
       type: [String, Number],
       default: null
     },
+    autoFill: {
+      type: Boolean,
+      default: function _default() {
+        return getConfig().numberInput.autoFill;
+      }
+    },
     prefixIcon: String,
     suffixIcon: String,
     // 已废弃
@@ -35251,13 +35347,24 @@ var handleNumberString = function handleNumberString(val) {
       var reactData = $xeNumberInput.reactData;
       var type = props.type,
         showCurrency = props.showCurrency,
-        currencySymbol = props.currencySymbol;
+        currencySymbol = props.currencySymbol,
+        autoFill = props.autoFill;
       var inputValue = reactData.inputValue;
       var digitsValue = $xeNumberInput.computeDigitsValue;
       if (type === 'amount') {
         var amountLabel = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(inputValue), {
           digits: digitsValue
         });
+        if (!autoFill) {
+          var _amountLabel$split = amountLabel.split('.'),
+            _amountLabel$split2 = _slicedToArray(_amountLabel$split, 2),
+            iStr = _amountLabel$split2[0],
+            dStr = _amountLabel$split2[1];
+          if (dStr) {
+            var dRest = dStr.replace(/0+$/, '');
+            amountLabel = dRest ? [iStr, '.', dRest].join('') : iStr;
+          }
+        }
         if (showCurrency) {
           return "".concat(currencySymbol || getI18n('vxe.numberInput.currencySymbol') || '').concat(amountLabel);
         }
@@ -35338,11 +35445,20 @@ var handleNumberString = function handleNumberString(val) {
     getNumberValue: function getNumberValue(val) {
       var $xeNumberInput = this;
       var props = $xeNumberInput;
-      var exponential = props.exponential;
+      var exponential = props.exponential,
+        autoFill = props.autoFill;
       var inpMaxLength = $xeNumberInput.computeInpMaxLength;
       var digitsValue = $xeNumberInput.computeDigitsValue;
       var decimalsType = $xeNumberInput.computeDecimalsType;
-      var restVal = decimalsType ? toFloatValueFixed(val, digitsValue) : handleNumberString(val);
+      var restVal = '';
+      if (decimalsType) {
+        restVal = toFloatValueFixed(val, digitsValue);
+        if (!autoFill) {
+          restVal = handleNumberString(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(restVal));
+        }
+      } else {
+        restVal = handleNumberString(val);
+      }
       if (exponential && (val === restVal || handleNumberString(val).toLowerCase() === external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(restVal).toExponential())) {
         return val;
       }
@@ -35455,7 +35571,9 @@ var handleNumberString = function handleNumberString(val) {
     },
     updateModel: function updateModel(val) {
       var $xeNumberInput = this;
+      var props = $xeNumberInput;
       var reactData = $xeNumberInput.reactData;
+      var autoFill = props.autoFill;
       var inputValue = reactData.inputValue;
       var digitsValue = $xeNumberInput.computeDigitsValue;
       var decimalsType = $xeNumberInput.computeDecimalsType;
@@ -35464,6 +35582,9 @@ var handleNumberString = function handleNumberString(val) {
           var textValue = '';
           if (val) {
             textValue = toFloatValueFixed(val, digitsValue);
+            if (!autoFill) {
+              textValue = "".concat(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(textValue));
+            }
           }
           if (textValue !== inputValue) {
             reactData.inputValue = textValue;
@@ -35476,7 +35597,9 @@ var handleNumberString = function handleNumberString(val) {
      */
     initValue: function initValue() {
       var $xeNumberInput = this;
+      var props = $xeNumberInput;
       var reactData = $xeNumberInput.reactData;
+      var autoFill = props.autoFill;
       var inputValue = reactData.inputValue;
       var digitsValue = $xeNumberInput.computeDigitsValue;
       var decimalsType = $xeNumberInput.computeDecimalsType;
@@ -35486,7 +35609,10 @@ var handleNumberString = function handleNumberString(val) {
           var validValue = null;
           if (inputValue) {
             textValue = toFloatValueFixed(inputValue, digitsValue);
-            validValue = Number(textValue);
+            validValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(textValue);
+            if (!autoFill) {
+              textValue = "".concat(validValue);
+            }
           }
           if (inputValue !== validValue) {
             $xeNumberInput.handleChange(validValue, textValue, {
@@ -40636,7 +40762,13 @@ var RadioGroup = VxeRadioGroup;
     },
     emitModel: function emitModel(value) {
       var $xeRate = this;
+      var _events = $xeRate._events;
       $xeRate.$emit('input', value);
+      if (_events && _events.modelValue) {
+        $xeRate.$emit('modelValue', value);
+      } else {
+        $xeRate.$emit('model-value', value);
+      }
     },
     mouseenterEvent: function mouseenterEvent(evnt, item) {
       var $xeRate = this;