vxe-pc-ui 4.14.24 → 4.14.26

package/packages/textarea/src/textarea.ts

@@ -3,6 +3,7 @@ import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { getConfig, getI18n, createEvent, useSize } from '../../ui'
 import { getFuncText } from '../../ui/src/utils'
+import { warnLog } from '../../ui/src/log'
 
 import type { VxeTextareaPropTypes, TextareaReactData, TextareaMethods, VxeTextareaConstructor, VxeTextareaEmits, TextareaPrivateRef, VxeFormConstructor, VxeFormPrivateMethods, VxeFormDefines } from '../../../types'
 
@@ -46,7 +47,18 @@ export default defineVxeComponent({
     },
     showWordCount: Boolean as PropType<VxeTextareaPropTypes.ShowWordCount>,
     countMethod: Function as PropType<VxeTextareaPropTypes.CountMethod>,
-    autosize: [Boolean, Object] as PropType<VxeTextareaPropTypes.Autosize>,
+    /**
+     * 已废弃，被 auto-size 替换
+     * @deprecated
+     */
+    autosize: {
+      type: [Boolean, Object] as PropType<VxeTextareaPropTypes.Autosize>,
+      default: null
+    },
+    autoSize: {
+      type: [Boolean, Object] as PropType<VxeTextareaPropTypes.AutoSize>,
+      default: null
+    },
     form: String as PropType<VxeTextareaPropTypes.Form>,
     resize: {
       type: String as PropType<VxeTextareaPropTypes.Resize>,
@@ -85,6 +97,7 @@ export default defineVxeComponent({
 
     const refElem = ref() as Ref<HTMLDivElement>
     const refTextarea = ref() as Ref<HTMLTextAreaElement>
+    const refContent = ref() as Ref<HTMLDivElement>
 
     const refMaps: TextareaPrivateRef = {
       refElem,
@@ -156,20 +169,27 @@ export default defineVxeComponent({
     })
 
     const computeSizeOpts = computed(() => {
-      return Object.assign({ minRows: 1, maxRows: 10 }, getConfig().textarea.autosize, props.autosize)
+      const { autosize, autoSize } = props
+      if (autosize || getConfig().textarea.autosize) {
+        return Object.assign({ minRows: 1, maxRows: 10 }, getConfig().textarea.autosize, autosize)
+      }
+      return Object.assign({ minRows: 1, maxRows: 10 }, getConfig().textarea.autoSize, autoSize)
     })
 
     const updateAutoTxt = () => {
-      const { size, autosize } = props
+      const { size, autosize, autoSize } = props
       const { inputValue } = reactData
-      if (autosize) {
+      if (autosize || autoSize) {
+        const formReadonly = computeFormReadonly.value
         if (!autoTxtElem) {
           autoTxtElem = document.createElement('div')
         }
         if (!autoTxtElem.parentNode) {
           document.body.appendChild(autoTxtElem)
         }
-        const textElem = refTextarea.value
+        const taElem = refTextarea.value
+        const ctElem = refContent.value
+        const textElem = formReadonly ? ctElem : taElem
         if (!textElem) {
           return
         }
@@ -182,11 +202,15 @@ export default defineVxeComponent({
     }
 
     const handleResize = () => {
-      if (props.autosize) {
+      const { autosize, autoSize } = props
+      if (autosize || autoSize) {
         nextTick(() => {
           const sizeOpts = computeSizeOpts.value
+          const formReadonly = computeFormReadonly.value
           const { minRows, maxRows } = sizeOpts
-          const textElem = refTextarea.value
+          const taElem = refTextarea.value
+          const ctElem = refContent.value
+          const textElem = formReadonly ? ctElem : taElem
           if (!textElem) {
             return
           }
@@ -282,26 +306,8 @@ export default defineVxeComponent({
 
     Object.assign($xeTextarea, textareaMethods)
 
-    watch(() => props.modelValue, (val) => {
-      reactData.inputValue = val
-      updateAutoTxt()
-    })
-
-    watch(computeSizeOpts, () => {
-      updateAutoTxt()
-      handleResize()
-    })
-
-    nextTick(() => {
-      const { autosize } = props
-      if (autosize) {
-        updateAutoTxt()
-        handleResize()
-      }
-    })
-
     const renderVN = () => {
-      const { className, resize, autosize, showWordCount, countMethod, rows, cols } = props
+      const { className, resize, autosize, autoSize, showWordCount, countMethod, rows, cols } = props
       const { inputValue } = reactData
       const vSize = computeSize.value
       const isDisabled = computeIsDisabled.value
@@ -315,13 +321,18 @@ export default defineVxeComponent({
         return h('div', {
           ref: refElem,
           class: ['vxe-textarea--readonly', className]
-        }, inputValue)
+        }, [
+          h('div', {
+            ref: refContent,
+            class: 'vxe-textarea--content'
+          }, inputValue)
+        ])
       }
       return h('div', {
         ref: refElem,
         class: ['vxe-textarea', className, {
           [`size--${vSize}`]: vSize,
-          'is--autosize': autosize,
+          'is--autosize': autosize || autoSize,
           'is--count': showWordCount,
           'is--disabled': isDisabled,
           'is--rows': !XEUtils.eqNull(rows),
@@ -363,6 +374,40 @@ export default defineVxeComponent({
       ])
     }
 
+    watch(() => props.modelValue, (val) => {
+      reactData.inputValue = val
+      updateAutoTxt()
+    })
+
+    const reFlag = ref(0)
+    watch(computeFormReadonly, () => {
+      reFlag.value++
+    })
+    watch(computeSizeOpts, () => {
+      reFlag.value++
+    })
+    watch(() => props.autoSize, () => {
+      reFlag.value++
+    })
+    watch(() => props.autosize, () => {
+      reFlag.value++
+    })
+    watch(reFlag, () => {
+      updateAutoTxt()
+      handleResize()
+    })
+
+    nextTick(() => {
+      const { autosize, autoSize } = props
+      if (autosize) {
+        warnLog('vxe.error.delProp', ['autosize', 'auto-size'])
+      }
+      if (autosize || autoSize) {
+        updateAutoTxt()
+        handleResize()
+      }
+    })
+
     $xeTextarea.renderVN = renderVN
 
     return $xeTextarea

package/styles/components/textarea.scss

@@ -10,14 +10,20 @@
   }
 }
 .vxe-textarea--readonly {
-  color: var(--vxe-ui-font-color);
-  display: inline-flex;
+  display: flex;
+}
+.vxe-textarea--content {
+  width: 100%;
+  padding: 0.3em 0.6em;
+  overflow: auto;
+  white-space: pre-wrap;
+  word-break: break-word;
 }
+
 .vxe-textarea--inner {
   border-radius: var(--vxe-ui-base-border-radius);
   outline: 0;
   font-size: inherit;
-  padding: 0 0.6em;
   color: var(--vxe-ui-font-color);
   line-height: inherit;
   border: 1px solid var(--vxe-ui-input-border-color);
@@ -38,7 +44,8 @@
 }
 
 .vxe-textarea--inner,
-.vxe-textarea--autosize {
+.vxe-textarea--autosize,
+.vxe-textarea--content {
   line-height: 1.5715;
   color: var(--vxe-ui-font-color);
   font-family: var(--vxe-ui-font-family);

package/types/components/column.d.ts

@@ -237,6 +237,7 @@ export namespace VxeColumnPropTypes {
      * 多目标渲染
      */
     children?: any[]
+    enabled?: boolean
 
     startField?: string
     endField?: string

package/types/components/table-plugins/extend-cell-area.d.ts

@@ -500,6 +500,10 @@ export namespace VxeTableExtendCellAreaDefines {
   }
   export interface CellAreaArrowsEndEventParams<D = any> extends EventParams<D>, CellAreaArrowsEndParams<D> { }
 
+  export interface CellAreaFillCopyEventParams<D = any> extends EventParams<D> {
+    cellAreas: VxeTableExtendCellAreaDefines.MouseCellArea<D>[]
+  }
+
   export interface ActiveCellChangeStartParams<D = any> {
     activeArea: VxeTableExtendCellAreaDefines.MouseActiveCellArea
     row: D
@@ -549,6 +553,7 @@ export type VxeTableExtendCellAreaEmits = [
   'cell-area-selection-all-end',
   'cell-area-arrows-start',
   'cell-area-arrows-end',
+  'cell-area-fill-copy',
   'active-cell-change-start',
   'active-cell-change-end'
 ]
@@ -580,6 +585,7 @@ declare module '../table' {
     onCellAreaSelectionAllEnd?: VxeTableEvents.CellAreaSelectionAllEnd<D>
     onCellAreaArrowsStart?: VxeTableEvents.CellAreaArrowsStart<D>
     onCellAreaArrowsEnd?: VxeTableEvents.CellAreaArrowsEnd<D>
+    onCellAreaFillCopy?: VxeTableEvents.CellAreaFillCopy<D>
     onActiveCellChangeStart?: VxeTableEvents.ActiveCellChangeStart<D>
     onActiveCellChangeEnd?: VxeTableEvents.ActiveCellChangeEnd<D>
   }
@@ -627,6 +633,7 @@ declare module '../table' {
     cellAreaSelectionAllEnd?: VxeTableEvents.CellAreaSelectionAllEnd<D>
     cellAreaArrowsStart?: VxeTableEvents.CellAreaArrowsStart<D>
     cellAreaArrowsEnd?: VxeTableEvents.CellAreaArrowsEnd<D>
+    cellAreaFillCopy?: VxeTableEvents.CellAreaFillCopy<D>
     activeCellChangeStart?: VxeTableEvents.ActiveCellChangeStart<D>
     activeCellChangeEnd?: VxeTableEvents.ActiveCellChangeEnd<D>
   }
@@ -656,6 +663,7 @@ declare module '../table' {
     export type CellAreaSelectionAllEnd<D = any> = (params: VxeTableExtendCellAreaDefines.CellAreaSelectionAllEndEventParams<D>) => void
     export type CellAreaArrowsStart<D = any> = (params: VxeTableExtendCellAreaDefines.CellAreaArrowsStartEventParams<D>) => void
     export type CellAreaArrowsEnd<D = any> = (params: VxeTableExtendCellAreaDefines.CellAreaArrowsEndEventParams<D>) => void
+    export type CellAreaFillCopy<D = any> = (params: VxeTableExtendCellAreaDefines.CellAreaFillCopyEventParams<D>) => void
     export type ActiveCellChangeStart<D = any> = (params: VxeTableExtendCellAreaDefines.ActiveCellChangeStartEventParams<D>) => void
     export type ActiveCellChangeEnd<D = any> = (params: VxeTableExtendCellAreaDefines.ActiveCellChangeEndEventParams<D>) => void
   }
@@ -688,6 +696,7 @@ declare module '../grid' {
     onCellAreaSelectionAllEnd?: VxeGridEvents.CellAreaSelectionAllEnd<D>
     onCellAreaArrowsStart?: VxeGridEvents.CellAreaArrowsStart<D>
     onCellAreaArrowsEnd?: VxeGridEvents.CellAreaArrowsEnd<D>
+    onCellAreaFillCopy?: VxeGridEvents.CellAreaFillCopy<D>
     onActiveCellChangeStart?: VxeGridEvents.ActiveCellChangeStart<D>
     onActiveCellChangeEnd?: VxeGridEvents.ActiveCellChangeEnd<D>
   }
@@ -735,6 +744,7 @@ declare module '../grid' {
     cellAreaSelectionAllEnd?: VxeGridEvents.CellAreaSelectionAllEnd<D>
     cellAreaArrowsStart?: VxeGridEvents.CellAreaArrowsStart<D>
     cellAreaArrowsEnd?: VxeGridEvents.CellAreaArrowsEnd<D>
+    cellAreaFillCopy?: VxeGridEvents.CellAreaFillCopy<D>
     activeCellChangeStart?: VxeGridEvents.ActiveCellChangeStart<D>
     activeCellChangeEnd?: VxeGridEvents.ActiveCellChangeEnd<D>
   }
@@ -764,6 +774,7 @@ declare module '../grid' {
     export type CellAreaSelectionAllStart<D = any> = (params: VxeTableExtendCellAreaDefines.CellAreaSelectionAllStartEventParams<D>) => void
     export type CellAreaSelectionAllEnd<D = any> = (params: VxeTableExtendCellAreaDefines.CellAreaSelectionAllEndEventParams<D>) => void
     export type CellAreaArrowsEnd<D = any> = (params: VxeTableExtendCellAreaDefines.CellAreaArrowsEndEventParams<D>) => void
+    export type CellAreaFillCopy<D = any> = (params: VxeTableExtendCellAreaDefines.CellAreaFillCopyEventParams<D>) => void
     export type ActiveCellChangeStart<D = any> = (params: VxeTableExtendCellAreaDefines.ActiveCellChangeStartEventParams<D>) => void
     export type ActiveCellChangeEnd<D = any> = (params: VxeTableExtendCellAreaDefines.ActiveCellChangeEndEventParams<D>) => void
   }

package/types/components/table.d.ts

@@ -1868,6 +1868,10 @@ export namespace VxeTablePropTypes {
      * 只对 mouse-config.area 启用后有效，选择单元格后显示行状态
      */
     showRowStatus?: boolean
+    /**
+     * 是否启用选中复制填充功能，自动把上面的单元格内容填到下面
+     */
+    isFillByCopy?: boolean
     /**
      * 只对 mouse-config.extension 启用后有效，将被选取区域的值复制到扩展区域中
      */
@@ -4124,6 +4128,7 @@ export interface TableInternalData<D = any> {
   // 数据集（仅可视）
   visibleDataRowIdData: Record<string, D>
 
+  headerFullDataColData: Record<string, VxeTableDefines.HeaderColCacheItem>
   footerFullDataRowData: Record<string, VxeTableDefines.FooterRowCacheItem>
 
   keepUpdateFieldMaps: Record<string, number>
@@ -4431,6 +4436,18 @@ export interface TableMethods<DT = any> {
    * 清除单元格格式化缓存
    */
   clearFormatterCache(isUpdate?: boolean): Promise<void>
+  /**
+   * 获取表头单元格显示值
+   */
+  getHeaderCellLabel(fieldOrColumn: VxeColumnPropTypes.Field | VxeTableDefines.ColumnInfo<any> | null): string
+  /**
+   * 更新表头单元格显示值
+   */
+  updateHeaderCellLabel(fieldOrColumn: VxeColumnPropTypes.Field | VxeTableDefines.ColumnInfo<any> | null): string
+  /**
+   * 清除表头单元格格式化缓存
+   */
+  clearHeaderFormatterCache(isUpdate?: boolean): Promise<void>
   /**
    * 获取表尾单元格显示值
    */
@@ -6071,6 +6088,9 @@ export namespace VxeTableDefines {
     formatData?: Record<string, RowCacheFormatObj>
   }
 
+  export interface HeaderColCacheItem {
+    formatObj?: RowCacheFormatObj
+  }
   export interface FooterRowCacheItem {
     formatData?: Record<string, RowCacheFormatObj>
   }

package/types/components/textarea.d.ts

@@ -41,7 +41,23 @@ export namespace VxeTextareaPropTypes {
   export type CountMethod = (params: {
     value: string
   }) => number
+  /**
+   * 已废弃，被 AutoSize 替换
+     * @deprecated
+   */
   export type Autosize = {
+    /**
+     * 已废弃，被 autoSize.minRows 替换
+     * @deprecated
+     */
+    minRows?: number | null
+    /**
+     * 已废弃，被 autoSize.maxRows 替换
+     * @deprecated
+     */
+    maxRows?: number | null
+  }
+  export type AutoSize = {
     minRows?: number | null
     maxRows?: number | null
   }
@@ -105,9 +121,14 @@ export type VxeTextareaProps = {
    */
   countMethod?: VxeTextareaPropTypes.CountMethod
   /**
-   * 自适应文本高度
+   * 已废弃，被 autoSize 替换
+   * @deprecated
    */
   autosize?: VxeTextareaPropTypes.Autosize
+  /**
+   * 自适应文本高度
+   */
+  autoSize?: VxeTextareaPropTypes.AutoSize
   /**
    * 原生 form 属性
    */