vxe-pc-ui 4.14.25 → 4.14.26

package/dist/all.esm.js

@@ -80,11 +80,11 @@ function checkDynamic() {
     }
 }
 
-const version$1 = `ui v${"4.14.25"}`;
+const version$1 = `ui v${"4.14.26"}`;
 const warnLog = log.create('warn', version$1);
 const errLog = log.create('error', version$1);
 
-const version = "4.14.25";
+const version = "4.14.26";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -35231,7 +35231,18 @@ var VxeTextareaComponent = defineVxeComponent({
         },
         showWordCount: Boolean,
         countMethod: Function,
-        autosize: [Boolean, Object],
+        /**
+         * 已废弃，被 auto-size 替换
+         * @deprecated
+         */
+        autosize: {
+            type: [Boolean, Object],
+            default: null
+        },
+        autoSize: {
+            type: [Boolean, Object],
+            default: null
+        },
         form: String,
         resize: {
             type: String,
@@ -35266,6 +35277,7 @@ var VxeTextareaComponent = defineVxeComponent({
         });
         const refElem = ref();
         const refTextarea = ref();
+        const refContent = ref();
         const refMaps = {
             refElem,
             refTextarea
@@ -35326,19 +35338,26 @@ var VxeTextareaComponent = defineVxeComponent({
             return inpMaxLength && inputCount > XEUtils.toNumber(inpMaxLength);
         });
         const computeSizeOpts = computed(() => {
-            return Object.assign({ minRows: 1, maxRows: 10 }, getConfig$3().textarea.autosize, props.autosize);
+            const { autosize, autoSize } = props;
+            if (autosize || getConfig$3().textarea.autosize) {
+                return Object.assign({ minRows: 1, maxRows: 10 }, getConfig$3().textarea.autosize, autosize);
+            }
+            return Object.assign({ minRows: 1, maxRows: 10 }, getConfig$3().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;
                 }
@@ -35350,11 +35369,15 @@ var VxeTextareaComponent = 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;
                     }
@@ -35442,23 +35465,8 @@ var VxeTextareaComponent = 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;
@@ -35472,13 +35480,18 @@ var VxeTextareaComponent = 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),
@@ -35519,6 +35532,37 @@ var VxeTextareaComponent = defineVxeComponent({
                     : null
             ]);
         };
+        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;
     },