vxe-pc-ui 3.3.43 → 3.3.44

package/packages/color-picker/src/util.ts

@@ -0,0 +1,198 @@
+import XEUtils from 'xe-utils'
+
+const hexAlphaKeyMaps: Record<string, number> = {}
+const hexAlphaNumMaps: Record<string, string> = {}
+'FF,FC,FA,F7,F5,F2,F0,ED,EB,E8,E6,E3,E0,DE,DB,D9,D6,D4,D1,CF,CC,C9,C7,C4,C2,BF,BD,BA,B8,B5,B3,B0,AD,AB,A8,A6,A3,A1,9E,9C,99,96,94,91,8F,8C,8A,87,85,82,80,7D,7A,78,75,73,70,6E,6B,69,66,63,61,5E,5C,59,57,54,52,4F,4D,4A,47,45,42,40,3D,3B,38,36,33,30,2E,2B,29,26,24,21,1F,1C,1A,17,14,12,0F,0D,0A,08,05,03,00'.split(',').forEach((key, i) => {
+  const num = (100 - i) / 100
+  hexAlphaKeyMaps[key] = num
+  hexAlphaNumMaps[num] = key
+})
+
+const rgbRE = /^rgb(a?)\((\d{1,3})[,\s]+(\d{1,3})[,\s]+(\d{1,3})([,//\s]+([0-9.]{1,4})(%?))?\)$/
+export function hasRgb (value: string) {
+  return value && rgbRE.test(value)
+}
+
+const hexRE = /^(#?)([0-9A-Fa-f]{6})([0-9A-Fa-f]{2})?$/
+export function hasHex (value: string) {
+  return value && hexRE.test(value)
+}
+
+export function parseColor (value: string) {
+  const rest = {
+    value: '',
+    type: '',
+    hex: '',
+    hexV: '',
+    hexA: '',
+    r: 0,
+    g: 0,
+    b: 0,
+    a: 1
+  }
+  if (value) {
+    const hexRest = value.match(hexRE)
+    if (hexRest) {
+      rest.value = value
+      rest.type = 'hex'
+      rest.hex = value
+      rest.hexV = hexRest[2]
+      rest.hexA = hexRest[3] || ''
+      rest.a = (hexRest[3] ? hexAlphaKeyMaps[hexRest[3].toUpperCase()] : 1) || 1
+    }
+    const rgbRest = value.match(rgbRE)
+    if (rgbRest) {
+      rest.value = value
+      rest.type = rgbRest[6] ? 'rgba' : 'rgb'
+      rest.r = parseInt(rgbRest[2])
+      rest.g = parseInt(rgbRest[3])
+      rest.b = parseInt(rgbRest[4])
+      rest.a = rgbRest[7] ? parseInt(rgbRest[6]) / 100 : (rgbRest[6] ? parseFloat(rgbRest[6]) : 1)
+    }
+  }
+  return rest
+}
+
+export function updateColorAlpha (value: string, alpha: number = 1) {
+  const colorRest = parseColor(value)
+  const { type, hexV, r, g, b } = colorRest
+  if (type === 'rgb' || type === 'rgba') {
+    return toRgb(r, g, b, alpha)
+  }
+  if (type === 'hex') {
+    return `#${hexV}${alpha === 1 ? '' : (hexAlphaNumMaps[alpha] || '')}`
+  }
+  return ''
+}
+
+export function toRgb (r: number, g: number, b: number, a?: number | null) {
+  if (XEUtils.eqNull(a)) {
+    return `rgb(${r},${g},${b})`
+  }
+  return `rgba(${r},${g},${b},${a})`
+}
+
+export function rgbToHex (rgbRest: {
+  r: number
+  g: number
+  b: number
+  a?: number
+}) {
+  if (!rgbRest) {
+    return ''
+  }
+  const { r, g, b, a = 1 } = rgbRest
+  const hexR = r.toString(16).padStart(2, '0')
+  const hexG = g.toString(16).padStart(2, '0')
+  const hexB = b.toString(16).padStart(2, '0')
+  const hexA = a === 1 ? '' : (hexAlphaNumMaps[a] || '')
+
+  // 返回十六进制颜色代码
+  return `#${hexR}${hexG}${hexB}${hexA}`.toUpperCase()
+}
+
+export function rgbToHsv (rgbRest: {
+  r: number
+  g: number
+  b: number
+}) {
+  if (!rgbRest) {
+    return null
+  }
+  const { r, g, b } = rgbRest
+  const rAbs = r / 255
+  const gAbs = g / 255
+  const bAbs = b / 255
+  let h = 0
+  let s = 0
+  const val = Math.max(rAbs, gAbs, bAbs)
+  const num = val - Math.min(rAbs, gAbs, bAbs)
+  const handleDiff = (c: number) => (val - c) / 6 / num + 1 / 2
+  if (num === 0) {
+    h = s = 0
+  } else {
+    s = num / val
+    const rr = handleDiff(rAbs)
+    const gg = handleDiff(gAbs)
+    const bb = handleDiff(bAbs)
+
+    if (rAbs === val) {
+      h = bb - gg
+    } else if (gAbs === val) {
+      h = (1 / 3) + rr - bb
+    } else if (bAbs === val) {
+      h = (2 / 3) + gg - rr
+    }
+    if (h < 0) {
+      h += 1
+    } else if (h > 1) {
+      h -= 1
+    }
+  }
+  return {
+    h: Math.round(h * 360),
+    s: XEUtils.round(s, 2),
+    v: XEUtils.round(val, 2)
+  }
+}
+
+export function hsvToRgb (h: number, s: number, v: number) {
+  let r = 0
+  let g = 0
+  let b = 0
+  const i = Math.floor(h / 60)
+  const f = h / 60 - i
+  const p = v * (1 - s)
+  const q = v * (1 - f * s)
+  const t = v * (1 - (1 - f) * s)
+
+  switch (i) {
+    case 0:
+      r = v; g = t; b = p
+      break
+    case 1:
+      r = q; g = v; b = p
+      break
+    case 2:
+      r = p; g = v; b = t
+      break
+    case 3:
+      r = p; g = q; b = v
+      break
+    case 4:
+      r = t; g = p; b = v
+      break
+    case 5:
+      r = v; g = p; b = q
+      break
+  }
+
+  return {
+    r: Math.round(r * 255),
+    g: Math.round(g * 255),
+    b: Math.round(b * 255)
+  }
+}
+
+export function hexToHsv (str: string) {
+  const rgbRest = hexToRgb(str)
+  if (rgbRest) {
+    return rgbToHsv(rgbRest)
+  }
+  return null
+}
+
+export function hexToRgb (str: string) {
+  if (str) {
+    const rests = str.match(/^(#?)([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})?$/)
+    if (rests) {
+      return {
+        r: parseInt(rests[2], 16),
+        g: parseInt(rests[3], 16),
+        b: parseInt(rests[4], 16),
+        a: (rests[5] ? hexAlphaKeyMaps[rests[5].toUpperCase()] : 1) || 1
+      }
+    }
+  }
+  return null
+}

package/packages/input/src/input.ts

@@ -2,7 +2,7 @@ import { PropType, CreateElement, VNode } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { getConfig, getIcon, getI18n, globalEvents, GLOBAL_EVENT_KEYS, createEvent, globalMixins, renderEmptyElement } from '../../ui'
-import { getFuncText, getLastZIndex, nextZIndex } from '../../ui/src/utils'
+import { getFuncText, getLastZIndex, nextZIndex, eqEmptyValue } from '../../ui/src/utils'
 import { hasClass, getAbsolutePos, getEventTargetNode } from '../../ui/src/dom'
 import { toStringTimeDate, getDateQuarter } from '../../date-picker/src/util'
 import { handleNumber, toFloatValueFixed } from '../../number-input/src/util'
@@ -42,7 +42,10 @@ export default defineVxeComponent({
       type: Boolean as PropType<VxeInputPropTypes.Disabled>,
       default: null
     },
-    placeholder: String as PropType<VxeInputPropTypes.Placeholder>,
+    placeholder: {
+      type: String as PropType<VxeInputPropTypes.Placeholder>,
+      default: null
+    },
     maxLength: [String, Number] as PropType<VxeInputPropTypes.MaxLength>,
     autoComplete: {
       type: String as PropType<VxeInputPropTypes.AutoComplete>,
@@ -802,11 +805,14 @@ export default defineVxeComponent({
       if (placeholder) {
         return getFuncText(placeholder)
       }
-      const globalPlaceholder = getConfig().input.placeholder
-      if (globalPlaceholder) {
-        return getFuncText(globalPlaceholder)
+      if (XEUtils.eqNull(placeholder)) {
+        const globalPlaceholder = getConfig().input.placeholder
+        if (globalPlaceholder) {
+          return getFuncText(globalPlaceholder)
+        }
+        return getI18n('vxe.base.pleaseInput')
       }
-      return getI18n('vxe.base.pleaseInput')
+      return placeholder
     },
     computeInpImmediate () {
       const $xeInput = this
@@ -1016,9 +1022,13 @@ export default defineVxeComponent({
       const $xeInput = this
       const reactData = $xeInput.reactData
 
-      reactData.isActivated = true
+      const { inputValue } = reactData
+      const isNumType = $xeInput.computeIsNumType
       const isDatePickerType = $xeInput.computeIsDatePickerType
-      if (isDatePickerType) {
+      reactData.isActivated = true
+      if (isNumType) {
+        reactData.inputValue = eqEmptyValue(inputValue) ? '' : `${XEUtils.toNumber(inputValue)}`
+      } else if (isDatePickerType) {
         $xeInput.datePickerOpenEvent(evnt)
       }
       $xeInput.triggerEvent(evnt)

package/packages/language/ar-EG.ts

@@ -333,6 +333,11 @@ export default {
     empty: {
       defText: '暂无数据'
     },
+    colorPicker: {
+      clear: '清除',
+      confirm: '确认',
+      copySuccess: '已复制到剪贴板：{0}'
+    },
     formDesign: {
       formName: '表单名称',
       defFormTitle: '未命名的表单',
@@ -525,6 +530,10 @@ export default {
             cell: '单元格',
             value: '值'
           },
+          body: {
+            row: '行：{0}',
+            col: '列：{0}'
+          },
           empty: '(空值)',
           reError: '无效的正则表达式',
           recordCount: '已找到 {0} 个单元格',

package/packages/language/de-DE.ts

@@ -333,6 +333,11 @@ export default {
     empty: {
       defText: '暂无数据'
     },
+    colorPicker: {
+      clear: '清除',
+      confirm: '确认',
+      copySuccess: '已复制到剪贴板：{0}'
+    },
     formDesign: {
       formName: '表单名称',
       defFormTitle: '未命名的表单',
@@ -525,6 +530,10 @@ export default {
             cell: '单元格',
             value: '值'
           },
+          body: {
+            row: '行：{0}',
+            col: '列：{0}'
+          },
           empty: '(空值)',
           reError: '无效的正则表达式',
           recordCount: '已找到 {0} 个单元格',

package/packages/language/en-US.ts

@@ -333,6 +333,11 @@ export default {
     empty: {
       defText: 'No Data'
     },
+    colorPicker: {
+      clear: 'Clear',
+      confirm: 'Confirm',
+      copySuccess: 'Copied to clipboard: {0}'
+    },
     formDesign: {
       formName: 'Form name',
       defFormTitle: 'Unnamed form',
@@ -525,6 +530,10 @@ export default {
             cell: 'Cell',
             value: 'Value'
           },
+          body: {
+            row: '行：{0}',
+            col: '列：{0}'
+          },
           empty: '(Empty)',
           reError: 'Invalid regular expression',
           recordCount: 'Found {0} cells',

package/packages/language/es-ES.ts

@@ -333,6 +333,11 @@ export default {
     empty: {
       defText: 'No Data'
     },
+    colorPicker: {
+      clear: '清除',
+      confirm: '确认',
+      copySuccess: '已复制到剪贴板：{0}'
+    },
     formDesign: {
       formName: 'Form name',
       defFormTitle: 'Unnamed form',
@@ -529,6 +534,10 @@ export default {
             cell: '单元格',
             value: '值'
           },
+          body: {
+            row: '行：{0}',
+            col: '列：{0}'
+          },
           empty: '(空值)',
           reError: '无效的正则表达式',
           recordCount: '已找到 {0} 个单元格',

package/packages/language/fr-FR.ts

@@ -333,6 +333,11 @@ export default {
     empty: {
       defText: '暂无数据'
     },
+    colorPicker: {
+      clear: '清除',
+      confirm: '确认',
+      copySuccess: '已复制到剪贴板：{0}'
+    },
     formDesign: {
       formName: '表单名称',
       defFormTitle: '未命名的表单',
@@ -525,6 +530,10 @@ export default {
             cell: '单元格',
             value: '值'
           },
+          body: {
+            row: '行：{0}',
+            col: '列：{0}'
+          },
           empty: '(空值)',
           reError: '无效的正则表达式',
           recordCount: '已找到 {0} 个单元格',

package/packages/language/hu-HU.ts

@@ -333,6 +333,11 @@ export default {
     empty: {
       defText: '暂无数据'
     },
+    colorPicker: {
+      clear: '清除',
+      confirm: '确认',
+      copySuccess: '已复制到剪贴板：{0}'
+    },
     formDesign: {
       formName: 'forma neve',
       defFormTitle: 'névtelen forma',
@@ -525,6 +530,10 @@ export default {
             cell: 'sejt',
             value: 'érték'
           },
+          body: {
+            row: '行：{0}',
+            col: '列：{0}'
+          },
           empty: '(null érték)',
           reError: 'Érvénytelen reguláris kifejezés',
           recordCount: '{0} cella található',

package/packages/language/hy-AM.ts

@@ -333,6 +333,11 @@ export default {
     empty: {
       defText: '暂无数据'
     },
+    colorPicker: {
+      clear: '清除',
+      confirm: '确认',
+      copySuccess: '已复制到剪贴板：{0}'
+    },
     formDesign: {
       formName: '表单名称',
       defFormTitle: '未命名的表单',
@@ -525,6 +530,10 @@ export default {
             cell: '单元格',
             value: '值'
           },
+          body: {
+            row: '行：{0}',
+            col: '列：{0}'
+          },
           empty: '(空值)',
           reError: '无效的正则表达式',
           recordCount: '已找到 {0} 个单元格',

package/packages/language/ja-JP.ts

@@ -333,6 +333,11 @@ export default {
     empty: {
       defText: '暂无数据'
     },
+    colorPicker: {
+      clear: '清除',
+      confirm: '确认',
+      copySuccess: '已复制到剪贴板：{0}'
+    },
     formDesign: {
       formName: 'Form name',
       defFormTitle: 'Unnamed form',
@@ -525,6 +530,10 @@ export default {
             cell: 'セル',
             value: '値'
           },
+          body: {
+            row: '行：{0}',
+            col: '列：{0}'
+          },
           empty: '(空白)',
           reError: '無効な正規表現',
           recordCount: '{0} 個のセルが見つかりました',

package/packages/language/ko-KR.ts

@@ -333,6 +333,11 @@ export default {
     empty: {
       defText: '暂无数据'
     },
+    colorPicker: {
+      clear: '清除',
+      confirm: '确认',
+      copySuccess: '已复制到剪贴板：{0}'
+    },
     formDesign: {
       formName: '表单名称',
       defFormTitle: '未命名的表单',
@@ -525,6 +530,10 @@ export default {
             cell: '单元格',
             value: '值'
           },
+          body: {
+            row: '行：{0}',
+            col: '列：{0}'
+          },
           empty: '(空值)',
           reError: '无效的正则表达式',
           recordCount: '已找到 {0} 个单元格',

package/packages/language/nb-NO.ts

@@ -333,6 +333,11 @@ export default {
     empty: {
       defText: '暂无数据'
     },
+    colorPicker: {
+      clear: '清除',
+      confirm: '确认',
+      copySuccess: '已复制到剪贴板：{0}'
+    },
     formDesign: {
       formName: '表单名称',
       defFormTitle: '未命名的表单',
@@ -525,6 +530,10 @@ export default {
             cell: '单元格',
             value: '值'
           },
+          body: {
+            row: '行：{0}',
+            col: '列：{0}'
+          },
           empty: '(空值)',
           reError: '无效的正则表达式',
           recordCount: '已找到 {0} 个单元格',

package/packages/language/pt-BR.ts

@@ -333,6 +333,11 @@ export default {
     empty: {
       defText: '暂无数据'
     },
+    colorPicker: {
+      clear: '清除',
+      confirm: '确认',
+      copySuccess: '已复制到剪贴板：{0}'
+    },
     formDesign: {
       formName: 'Form name',
       defFormTitle: 'Unnamed form',
@@ -525,6 +530,10 @@ export default {
             cell: '单元格',
             value: '值'
           },
+          body: {
+            row: '行：{0}',
+            col: '列：{0}'
+          },
           empty: '(空值)',
           reError: '无效的正则表达式',
           recordCount: '已找到 {0} 个单元格',

package/packages/language/ru-RU.ts

@@ -333,6 +333,11 @@ export default {
     empty: {
       defText: '暂无数据'
     },
+    colorPicker: {
+      clear: '清除',
+      confirm: '确认',
+      copySuccess: '已复制到剪贴板：{0}'
+    },
     formDesign: {
       formName: 'имя формы',
       defFormTitle: 'безымянная форма',
@@ -525,6 +530,10 @@ export default {
             cell: 'клетка',
             value: 'ценить'
           },
+          body: {
+            row: '行：{0}',
+            col: '列：{0}'
+          },
           empty: '(нулевое значение)',
           reError: 'Недопустимое регулярное выражение',
           recordCount: 'Найдено {0} ячеек',

package/packages/language/ug-CN.ts

@@ -333,6 +333,11 @@ export default {
     empty: {
       defText: 'ھازىرچە ئۇچۇر يوق'
     },
+    colorPicker: {
+      clear: '清除',
+      confirm: '确认',
+      copySuccess: '已复制到剪贴板：{0}'
+    },
     formDesign: {
       formName: 'جەدۋەل ئىسمى',
       defFormTitle: 'نام قويۇلمىغان جەدىۋەل',
@@ -525,6 +530,10 @@ export default {
             cell: 'تاق كاتاكچە',
             value: 'قىممىتى'
           },
+          body: {
+            row: '行：{0}',
+            col: '列：{0}'
+          },
           empty: '(قۇرۇق)',
           reError: 'ئۈنۇمسىز لوگىكىلىق شەرىت',
           recordCount: 'تىپىلغىنى {0} دانە ئۇچۇر',

package/packages/language/uk-UA.ts

@@ -333,6 +333,11 @@ export default {
     empty: {
       defText: '暂无数据'
     },
+    colorPicker: {
+      clear: '清除',
+      confirm: '确认',
+      copySuccess: '已复制到剪贴板：{0}'
+    },
     formDesign: {
       formName: '表单名称',
       defFormTitle: '未命名的表单',
@@ -525,6 +530,10 @@ export default {
             cell: '单元格',
             value: '值'
           },
+          body: {
+            row: '行：{0}',
+            col: '列：{0}'
+          },
           empty: '(空值)',
           reError: '无效的正则表达式',
           recordCount: '已找到 {0} 个单元格',

package/packages/language/vi-VN.ts

@@ -333,6 +333,11 @@ export default {
     empty: {
       defText: '暂无数据'
     },
+    colorPicker: {
+      clear: '清除',
+      confirm: '确认',
+      copySuccess: '已复制到剪贴板：{0}'
+    },
     formDesign: {
       formName: '表单名称',
       defFormTitle: '未命名的表单',
@@ -525,6 +530,10 @@ export default {
             cell: '单元格',
             value: '值'
           },
+          body: {
+            row: '行：{0}',
+            col: '列：{0}'
+          },
           empty: '(空值)',
           reError: '无效的正则表达式',
           recordCount: '已找到 {0} 个单元格',

package/packages/language/zh-CHT.ts

@@ -333,6 +333,11 @@ export default {
     empty: {
       defText: '暂无数据'
     },
+    colorPicker: {
+      clear: '清除',
+      confirm: '确认',
+      copySuccess: '已复制到剪贴板：{0}'
+    },
     formDesign: {
       formName: '表單名稱',
       defFormTitle: '未命名的表單',
@@ -525,6 +530,10 @@ export default {
             cell: '單元格',
             value: '值'
           },
+          body: {
+            row: '行：{0}',
+            col: '列：{0}'
+          },
           empty: '(空值)',
           reError: '無效的正規表示式',
           recordCount: '已找到 {0} 個單元格',

package/packages/language/zh-CN.ts

@@ -333,6 +333,11 @@ export default {
     empty: {
       defText: '暂无数据'
     },
+    colorPicker: {
+      clear: '清除',
+      confirm: '确认',
+      copySuccess: '已复制到剪贴板：{0}'
+    },
     formDesign: {
       formName: '表单名称',
       defFormTitle: '未命名的表单',
@@ -525,6 +530,10 @@ export default {
             cell: '单元格',
             value: '值'
           },
+          body: {
+            row: '行：{0}',
+            col: '列：{0}'
+          },
           empty: '(空值)',
           reError: '无效的正则表达式',
           recordCount: '已找到 {0} 个单元格',

package/packages/number-input/src/number-input.ts

@@ -401,7 +401,7 @@ export default defineVxeComponent({
       const reactData = $xeNumberInput.reactData
 
       const inpImmediate = $xeNumberInput.computeInpImmediate
-      const value = inputValue === '' || XEUtils.eqNull(inputValue) ? null : XEUtils.toNumber(inputValue)
+      const value = inputValue === eqEmptyValue(inputValue) ? null : XEUtils.toNumber(inputValue)
       reactData.inputValue = inputValue
       if (inpImmediate) {
         $xeNumberInput.handleChange(value, inputValue, evnt)
@@ -428,6 +428,8 @@ export default defineVxeComponent({
       const $xeNumberInput = this
       const reactData = $xeNumberInput.reactData
 
+      const { inputValue } = reactData
+      reactData.inputValue = eqEmptyValue(inputValue) ? '' : `${XEUtils.toNumber(inputValue)}`
       reactData.isFocus = true
       reactData.isActivated = true
       $xeNumberInput.triggerEvent(evnt)