vxe-pc-ui 3.14.25 → 3.14.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (42) hide show
  1. package/es/style.css +1 -1
  2. package/es/style.min.css +1 -1
  3. package/es/textarea/src/textarea.js +63 -12
  4. package/es/textarea/style.css +11 -4
  5. package/es/textarea/style.min.css +1 -1
  6. package/es/ui/index.js +1 -1
  7. package/es/ui/src/log.js +1 -1
  8. package/es/vxe-textarea/style.css +11 -4
  9. package/es/vxe-textarea/style.min.css +1 -1
  10. package/lib/index.umd.js +70 -13
  11. package/lib/index.umd.min.js +1 -1
  12. package/lib/style.css +1 -1
  13. package/lib/style.min.css +1 -1
  14. package/lib/textarea/src/textarea.js +68 -11
  15. package/lib/textarea/src/textarea.min.js +1 -1
  16. package/lib/textarea/style/style.css +11 -4
  17. package/lib/textarea/style/style.min.css +1 -1
  18. package/lib/ui/index.js +1 -1
  19. package/lib/ui/index.min.js +1 -1
  20. package/lib/ui/src/log.js +1 -1
  21. package/lib/ui/src/log.min.js +1 -1
  22. package/lib/vxe-textarea/style/style.css +11 -4
  23. package/lib/vxe-textarea/style/style.min.css +1 -1
  24. package/package.json +1 -1
  25. package/packages/textarea/src/textarea.ts +68 -12
  26. package/styles/components/textarea.scss +11 -4
  27. package/types/components/column.d.ts +1 -0
  28. package/types/components/table-plugins/extend-cell-area.d.ts +11 -0
  29. package/types/components/table.d.ts +4 -0
  30. package/types/components/textarea.d.ts +20 -0
  31. /package/es/icon/{iconfont.1780114475552.ttf → iconfont.1780292452483.ttf} +0 -0
  32. /package/es/icon/{iconfont.1780114475552.woff → iconfont.1780292452483.woff} +0 -0
  33. /package/es/icon/{iconfont.1780114475552.woff2 → iconfont.1780292452483.woff2} +0 -0
  34. /package/es/{iconfont.1780114475552.ttf → iconfont.1780292452483.ttf} +0 -0
  35. /package/es/{iconfont.1780114475552.woff → iconfont.1780292452483.woff} +0 -0
  36. /package/es/{iconfont.1780114475552.woff2 → iconfont.1780292452483.woff2} +0 -0
  37. /package/lib/icon/style/{iconfont.1780114475552.ttf → iconfont.1780292452483.ttf} +0 -0
  38. /package/lib/icon/style/{iconfont.1780114475552.woff → iconfont.1780292452483.woff} +0 -0
  39. /package/lib/icon/style/{iconfont.1780114475552.woff2 → iconfont.1780292452483.woff2} +0 -0
  40. /package/lib/{iconfont.1780114475552.ttf → iconfont.1780292452483.ttf} +0 -0
  41. /package/lib/{iconfont.1780114475552.woff → iconfont.1780292452483.woff} +0 -0
  42. /package/lib/{iconfont.1780114475552.woff2 → iconfont.1780292452483.woff2} +0 -0
package/es/textarea/src/textarea.js CHANGED
@@ -2,6 +2,7 @@ import { defineVxeComponent } from '../../ui/src/comp';
2
2
  import XEUtils from 'xe-utils';
3
3
  import { getConfig, getI18n, createEvent, globalMixins } from '../../ui';
4
4
  import { getFuncText } from '../../ui/src/utils';
5
+ import { warnLog } from '../../ui/src/log';
5
6
  let autoTxtElem;
6
7
  export default {
7
8
  name: 'VxeTextarea',
@@ -48,7 +49,18 @@ export default {
48
49
  },
49
50
  showWordCount: Boolean,
50
51
  countMethod: Function,
51
- autosize: [Boolean, Object],
52
+ /**
53
+ * 已废弃，被 auto-size 替换
54
+ * @deprecated
55
+ */
56
+ autosize: {
57
+ type: [Boolean, Object],
58
+ default: null
59
+ },
60
+ autoSize: {
61
+ type: [Boolean, Object],
62
+ default: null
63
+ },
52
64
  form: String,
53
65
  resize: {
54
66
  type: String,
@@ -76,7 +88,8 @@ export default {
76
88
  };
77
89
  return {
78
90
  xID: XEUtils.uniqueId(),
79
- reactData
91
+ reactData,
92
+ reFlag: 0
80
93
  };
81
94
  },
82
95
  computed: Object.assign(Object.assign({}, {}), { computeFormReadonly() {
@@ -144,7 +157,11 @@ export default {
144
157
  computeSizeOpts() {
145
158
  const $xeTextarea = this;
146
159
  const props = $xeTextarea;
147
- return Object.assign({ minRows: 1, maxRows: 10 }, getConfig().textarea.autosize, props.autosize);
160
+ const { autosize, autoSize } = props;
161
+ if (autosize || getConfig().textarea.autosize) {
162
+ return Object.assign({ minRows: 1, maxRows: 10 }, getConfig().textarea.autosize, autosize);
163
+ }
164
+ return Object.assign({ minRows: 1, maxRows: 10 }, getConfig().textarea.autoSize, autoSize);
148
165
  } }),
149
166
  methods: {
150
167
  //
@@ -180,16 +197,22 @@ export default {
180
197
  const $xeTextarea = this;
181
198
  const props = $xeTextarea;
182
199
  const reactData = $xeTextarea.reactData;
183
- const { size, autosize } = props;
200
+ const { size, autosize, autoSize } = props;
184
201
  const { inputValue } = reactData;
185
- if (autosize) {
202
+ if (autosize || autoSize) {
203
+ const formReadonly = $xeTextarea.computeFormReadonly;
186
204
  if (!autoTxtElem) {
187
205
  autoTxtElem = document.createElement('div');
188
206
  }
189
207
  if (!autoTxtElem.parentNode) {
190
208
  document.body.appendChild(autoTxtElem);
191
209
  }
192
- const textElem = $xeTextarea.$refs.refTextarea;
210
+ const taElem = $xeTextarea.$refs.refTextarea;
211
+ const ctElem = $xeTextarea.$refs.refContent;
212
+ const textElem = formReadonly ? ctElem : taElem;
213
+ if (!textElem) {
214
+ return;
215
+ }
193
216
  if (!textElem) {
194
217
  return;
195
218
  }
@@ -203,11 +226,15 @@ export default {
203
226
  handleResize() {
204
227
  const $xeTextarea = this;
205
228
  const props = $xeTextarea;
206
- if (props.autosize) {
229
+ const { autosize, autoSize } = props;
230
+ if (autosize || autoSize) {
207
231
  $xeTextarea.$nextTick(() => {
208
232
  const sizeOpts = $xeTextarea.computeSizeOpts;
233
+ const formReadonly = $xeTextarea.computeFormReadonly;
209
234
  const { minRows, maxRows } = sizeOpts;
210
- const textElem = $xeTextarea.$refs.refTextarea;
235
+ const taElem = $xeTextarea.$refs.refTextarea;
236
+ const ctElem = $xeTextarea.$refs.refContent;
237
+ const textElem = formReadonly ? ctElem : taElem;
211
238
  if (!textElem) {
212
239
  return;
213
240
  }
@@ -302,7 +329,7 @@ export default {
302
329
  const $xeTextarea = this;
303
330
  const props = $xeTextarea;
304
331
  const reactData = $xeTextarea.reactData;
305
- const { className, resize, autosize, showWordCount, countMethod, rows, cols } = props;
332
+ const { className, resize, autosize, autoSize, showWordCount, countMethod, rows, cols } = props;
306
333
  const { inputValue } = reactData;
307
334
  const vSize = $xeTextarea.computeSize;
308
335
  const isDisabled = $xeTextarea.computeIsDisabled;
@@ -316,13 +343,18 @@ export default {
316
343
  return h('div', {
317
344
  ref: 'refElem',
318
345
  class: ['vxe-textarea--readonly', className]
319
- }, inputValue);
346
+ }, [
347
+ h('div', {
348
+ ref: 'refContent',
349
+ class: 'vxe-textarea--content'
350
+ }, inputValue)
351
+ ]);
320
352
  }
321
353
  return h('div', {
322
354
  ref: 'refElem',
323
355
  class: ['vxe-textarea', className, {
324
356
  [`size--${vSize}`]: vSize,
325
- 'is--autosize': autosize,
357
+ 'is--autosize': autosize || autoSize,
326
358
  'is--count': showWordCount,
327
359
  'is--disabled': isDisabled,
328
360
  'is--rows': !XEUtils.eqNull(rows),
@@ -379,7 +411,23 @@ export default {
379
411
  reactData.inputValue = val;
380
412
  $xeTextarea.updateAutoTxt();
381
413
  },
414
+ computeFormReadonly() {
415
+ const $xeTextarea = this;
416
+ $xeTextarea.reFlag++;
417
+ },
382
418
  computeSizeOpts() {
419
+ const $xeTextarea = this;
420
+ $xeTextarea.reFlag++;
421
+ },
422
+ autoSize() {
423
+ const $xeTextarea = this;
424
+ $xeTextarea.reFlag++;
425
+ },
426
+ autosize() {
427
+ const $xeTextarea = this;
428
+ $xeTextarea.reFlag++;
429
+ },
430
+ reFlag() {
383
431
  const $xeTextarea = this;
384
432
  $xeTextarea.updateAutoTxt();
385
433
  $xeTextarea.handleResize();
@@ -391,8 +439,11 @@ export default {
391
439
  const reactData = $xeTextarea.reactData;
392
440
  reactData.inputValue = props.value;
393
441
  $xeTextarea.$nextTick(() => {
394
- const { autosize } = props;
442
+ const { autosize, autoSize } = props;
395
443
  if (autosize) {
444
+ warnLog('vxe.error.delProp', ['autosize', 'auto-size']);
445
+ }
446
+ if (autosize || autoSize) {
396
447
  $xeTextarea.updateAutoTxt();
397
448
  $xeTextarea.handleResize();
398
449
  }
package/es/textarea/style.css CHANGED
@@ -11,15 +11,21 @@
11
11
  }
12
12
 
13
13
  .vxe-textarea--readonly {
14
- color: var(--vxe-ui-font-color);
15
- display: inline-flex;
14
+ display: flex;
15
+ }
16
+
17
+ .vxe-textarea--content {
18
+ width: 100%;
19
+ padding: 0.3em 0.6em;
20
+ overflow: auto;
21
+ white-space: pre-wrap;
22
+ word-break: break-word;
16
23
  }
17
24
 
18
25
  .vxe-textarea--inner {
19
26
  border-radius: var(--vxe-ui-base-border-radius);
20
27
  outline: 0;
21
28
  font-size: inherit;
22
- padding: 0 0.6em;
23
29
  color: var(--vxe-ui-font-color);
24
30
  line-height: inherit;
25
31
  border: 1px solid var(--vxe-ui-input-border-color);
@@ -46,7 +52,8 @@
46
52
  }
47
53
 
48
54
  .vxe-textarea--inner,
49
- .vxe-textarea--autosize {
55
+ .vxe-textarea--autosize,
56
+ .vxe-textarea--content {
50
57
  line-height: 1.5715;
51
58
  color: var(--vxe-ui-font-color);
52
59
  font-family: var(--vxe-ui-font-family);
package/es/textarea/style.min.css CHANGED
@@ -1 +1 @@
1
- .vxe-textarea{position:relative;display:inline-flex;flex-direction:row}.vxe-textarea:not(.is--cols){width:100%}.vxe-textarea:not(.is--cols) .vxe-textarea--inner{width:100%}.vxe-textarea--readonly{color:var(--vxe-ui-font-color);display:inline-flex}.vxe-textarea--inner{border-radius:var(--vxe-ui-base-border-radius);outline:0;font-size:inherit;padding:0 .6em;color:var(--vxe-ui-font-color);line-height:inherit;border:1px solid var(--vxe-ui-input-border-color);background-color:var(--vxe-ui-layout-background-color);display:block;padding:.3em .6em}.vxe-textarea--inner::-moz-placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-textarea--inner:-ms-input-placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-textarea--inner::placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-textarea--inner:focus{border:1px solid var(--vxe-ui-font-primary-color)}.vxe-textarea--inner[disabled]{cursor:not-allowed;color:var(--vxe-ui-font-disabled-color);background-color:var(--vxe-ui-input-disabled-background-color)}.vxe-textarea--autosize,.vxe-textarea--inner{line-height:1.5715;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family)}.vxe-textarea--autosize{display:block;position:fixed;top:0;left:0;width:100%;margin:0;padding:.3em .6em;word-wrap:break-word;white-space:pre-wrap;z-index:-1;visibility:hidden}.vxe-textarea--count{position:absolute;bottom:.2em;right:1.4em;padding-left:.2em;color:var(--vxe-ui-input-count-color);background-color:var(--vxe-ui-layout-background-color)}.vxe-textarea--count.is--error{color:var(--vxe-ui-input-count-error-color)}.vxe-textarea,.vxe-textarea--autosize{font-size:var(--vxe-ui-font-size-default)}.vxe-textarea--autosize.size--medium,.vxe-textarea.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-textarea--autosize.size--small,.vxe-textarea.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-textarea--autosize.size--mini,.vxe-textarea.size--mini{font-size:var(--vxe-ui-font-size-mini)}.vxe-textarea:not(.is--autosize){min-height:var(--vxe-ui-input-height-default)}.vxe-textarea.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-textarea.size--medium:not(.is--autosize){min-height:var(--vxe-ui-input-height-medium)}.vxe-textarea.size--small:not(.is--autosize){min-height:var(--vxe-ui-input-height-small)}.vxe-textarea.size--mini:not(.is--autosize){min-height:var(--vxe-ui-input-height-mini)}
1
+ .vxe-textarea{position:relative;display:inline-flex;flex-direction:row}.vxe-textarea:not(.is--cols){width:100%}.vxe-textarea:not(.is--cols) .vxe-textarea--inner{width:100%}.vxe-textarea--readonly{display:flex}.vxe-textarea--content{width:100%;padding:.3em .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;color:var(--vxe-ui-font-color);line-height:inherit;border:1px solid var(--vxe-ui-input-border-color);background-color:var(--vxe-ui-layout-background-color);display:block;padding:.3em .6em}.vxe-textarea--inner::-moz-placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-textarea--inner:-ms-input-placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-textarea--inner::placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-textarea--inner:focus{border:1px solid var(--vxe-ui-font-primary-color)}.vxe-textarea--inner[disabled]{cursor:not-allowed;color:var(--vxe-ui-font-disabled-color);background-color:var(--vxe-ui-input-disabled-background-color)}.vxe-textarea--autosize,.vxe-textarea--content,.vxe-textarea--inner{line-height:1.5715;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family)}.vxe-textarea--autosize{display:block;position:fixed;top:0;left:0;width:100%;margin:0;padding:.3em .6em;word-wrap:break-word;white-space:pre-wrap;z-index:-1;visibility:hidden}.vxe-textarea--count{position:absolute;bottom:.2em;right:1.4em;padding-left:.2em;color:var(--vxe-ui-input-count-color);background-color:var(--vxe-ui-layout-background-color)}.vxe-textarea--count.is--error{color:var(--vxe-ui-input-count-error-color)}.vxe-textarea,.vxe-textarea--autosize{font-size:var(--vxe-ui-font-size-default)}.vxe-textarea--autosize.size--medium,.vxe-textarea.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-textarea--autosize.size--small,.vxe-textarea.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-textarea--autosize.size--mini,.vxe-textarea.size--mini{font-size:var(--vxe-ui-font-size-mini)}.vxe-textarea:not(.is--autosize){min-height:var(--vxe-ui-input-height-default)}.vxe-textarea.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-textarea.size--medium:not(.is--autosize){min-height:var(--vxe-ui-input-height-medium)}.vxe-textarea.size--small:not(.is--autosize){min-height:var(--vxe-ui-input-height-small)}.vxe-textarea.size--mini:not(.is--autosize){min-height:var(--vxe-ui-input-height-mini)}
package/es/ui/index.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { VxeUI, setConfig, setIcon } from '@vxe-ui/core';
2
2
  import { dynamicApp } from '../dynamics';
3
3
  import { warnLog } from './src/log';
4
- export const version = "3.14.25";
4
+ export const version = "3.14.26";
5
5
  VxeUI.uiVersion = version;
6
6
  VxeUI.dynamicApp = dynamicApp;
7
7
  export function config(options) {
package/es/ui/src/log.js CHANGED
@@ -1,4 +1,4 @@
1
1
  import { log } from '@vxe-ui/core';
2
- const version = `ui v${"3.14.25"}`;
2
+ const version = `ui v${"3.14.26"}`;
3
3
  export const warnLog = log.create('warn', version);
4
4
  export const errLog = log.create('error', version);
package/es/vxe-textarea/style.css CHANGED
@@ -11,15 +11,21 @@
11
11
  }
12
12
 
13
13
  .vxe-textarea--readonly {
14
- color: var(--vxe-ui-font-color);
15
- display: inline-flex;
14
+ display: flex;
15
+ }
16
+
17
+ .vxe-textarea--content {
18
+ width: 100%;
19
+ padding: 0.3em 0.6em;
20
+ overflow: auto;
21
+ white-space: pre-wrap;
22
+ word-break: break-word;
16
23
  }
17
24
 
18
25
  .vxe-textarea--inner {
19
26
  border-radius: var(--vxe-ui-base-border-radius);
20
27
  outline: 0;
21
28
  font-size: inherit;
22
- padding: 0 0.6em;
23
29
  color: var(--vxe-ui-font-color);
24
30
  line-height: inherit;
25
31
  border: 1px solid var(--vxe-ui-input-border-color);
@@ -46,7 +52,8 @@
46
52
  }
47
53
 
48
54
  .vxe-textarea--inner,
49
- .vxe-textarea--autosize {
55
+ .vxe-textarea--autosize,
56
+ .vxe-textarea--content {
50
57
  line-height: 1.5715;
51
58
  color: var(--vxe-ui-font-color);
52
59
  font-family: var(--vxe-ui-font-family);
package/es/vxe-textarea/style.min.css CHANGED
@@ -1 +1 @@
1
- .vxe-textarea{position:relative;display:inline-flex;flex-direction:row}.vxe-textarea:not(.is--cols){width:100%}.vxe-textarea:not(.is--cols) .vxe-textarea--inner{width:100%}.vxe-textarea--readonly{color:var(--vxe-ui-font-color);display:inline-flex}.vxe-textarea--inner{border-radius:var(--vxe-ui-base-border-radius);outline:0;font-size:inherit;padding:0 .6em;color:var(--vxe-ui-font-color);line-height:inherit;border:1px solid var(--vxe-ui-input-border-color);background-color:var(--vxe-ui-layout-background-color);display:block;padding:.3em .6em}.vxe-textarea--inner::-moz-placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-textarea--inner:-ms-input-placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-textarea--inner::placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-textarea--inner:focus{border:1px solid var(--vxe-ui-font-primary-color)}.vxe-textarea--inner[disabled]{cursor:not-allowed;color:var(--vxe-ui-font-disabled-color);background-color:var(--vxe-ui-input-disabled-background-color)}.vxe-textarea--autosize,.vxe-textarea--inner{line-height:1.5715;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family)}.vxe-textarea--autosize{display:block;position:fixed;top:0;left:0;width:100%;margin:0;padding:.3em .6em;word-wrap:break-word;white-space:pre-wrap;z-index:-1;visibility:hidden}.vxe-textarea--count{position:absolute;bottom:.2em;right:1.4em;padding-left:.2em;color:var(--vxe-ui-input-count-color);background-color:var(--vxe-ui-layout-background-color)}.vxe-textarea--count.is--error{color:var(--vxe-ui-input-count-error-color)}.vxe-textarea,.vxe-textarea--autosize{font-size:var(--vxe-ui-font-size-default)}.vxe-textarea--autosize.size--medium,.vxe-textarea.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-textarea--autosize.size--small,.vxe-textarea.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-textarea--autosize.size--mini,.vxe-textarea.size--mini{font-size:var(--vxe-ui-font-size-mini)}.vxe-textarea:not(.is--autosize){min-height:var(--vxe-ui-input-height-default)}.vxe-textarea.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-textarea.size--medium:not(.is--autosize){min-height:var(--vxe-ui-input-height-medium)}.vxe-textarea.size--small:not(.is--autosize){min-height:var(--vxe-ui-input-height-small)}.vxe-textarea.size--mini:not(.is--autosize){min-height:var(--vxe-ui-input-height-mini)}
1
+ .vxe-textarea{position:relative;display:inline-flex;flex-direction:row}.vxe-textarea:not(.is--cols){width:100%}.vxe-textarea:not(.is--cols) .vxe-textarea--inner{width:100%}.vxe-textarea--readonly{display:flex}.vxe-textarea--content{width:100%;padding:.3em .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;color:var(--vxe-ui-font-color);line-height:inherit;border:1px solid var(--vxe-ui-input-border-color);background-color:var(--vxe-ui-layout-background-color);display:block;padding:.3em .6em}.vxe-textarea--inner::-moz-placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-textarea--inner:-ms-input-placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-textarea--inner::placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-textarea--inner:focus{border:1px solid var(--vxe-ui-font-primary-color)}.vxe-textarea--inner[disabled]{cursor:not-allowed;color:var(--vxe-ui-font-disabled-color);background-color:var(--vxe-ui-input-disabled-background-color)}.vxe-textarea--autosize,.vxe-textarea--content,.vxe-textarea--inner{line-height:1.5715;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family)}.vxe-textarea--autosize{display:block;position:fixed;top:0;left:0;width:100%;margin:0;padding:.3em .6em;word-wrap:break-word;white-space:pre-wrap;z-index:-1;visibility:hidden}.vxe-textarea--count{position:absolute;bottom:.2em;right:1.4em;padding-left:.2em;color:var(--vxe-ui-input-count-color);background-color:var(--vxe-ui-layout-background-color)}.vxe-textarea--count.is--error{color:var(--vxe-ui-input-count-error-color)}.vxe-textarea,.vxe-textarea--autosize{font-size:var(--vxe-ui-font-size-default)}.vxe-textarea--autosize.size--medium,.vxe-textarea.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-textarea--autosize.size--small,.vxe-textarea.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-textarea--autosize.size--mini,.vxe-textarea.size--mini{font-size:var(--vxe-ui-font-size-mini)}.vxe-textarea:not(.is--autosize){min-height:var(--vxe-ui-input-height-default)}.vxe-textarea.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-textarea.size--medium:not(.is--autosize){min-height:var(--vxe-ui-input-height-medium)}.vxe-textarea.size--small:not(.is--autosize){min-height:var(--vxe-ui-input-height-small)}.vxe-textarea.size--mini:not(.is--autosize){min-height:var(--vxe-ui-input-height-mini)}
package/lib/index.umd.js CHANGED
@@ -13214,7 +13214,7 @@ function checkDynamic() {
13214
13214
  }
13215
13215
  ;// ./packages/ui/src/log.ts
13216
13216
 
13217
- var log_version = "ui v".concat("3.14.25");
13217
+ var log_version = "ui v".concat("3.14.26");
13218
13218
  var warnLog = log.create('warn', log_version);
13219
13219
  var errLog = log.create('error', log_version);
13220
13220
  ;// ./packages/ui/index.ts
@@ -13222,7 +13222,7 @@ var errLog = log.create('error', log_version);
13222
13222
 
13223
13223
 
13224
13224
 
13225
- var ui_version = "3.14.25";
13225
+ var ui_version = "3.14.26";
13226
13226
  VxeUI.uiVersion = ui_version;
13227
13227
  VxeUI.dynamicApp = dynamicApp;
13228
13228
  function config(options) {
@@ -55632,6 +55632,7 @@ var Text = VxeText;
55632
55632
 
55633
55633
 
55634
55634
 
55635
+
55635
55636
  var autoTxtElem;
55636
55637
  /* harmony default export */ var src_textarea = (/* define-vxe-component start */defineVxeComponent({
55637
55638
  name: 'VxeTextarea',
@@ -55678,7 +55679,18 @@ var autoTxtElem;
55678
55679
  },
55679
55680
  showWordCount: Boolean,
55680
55681
  countMethod: Function,
55681
- autosize: [Boolean, Object],
55682
+ /**
55683
+ * 已废弃，被 auto-size 替换
55684
+ * @deprecated
55685
+ */
55686
+ autosize: {
55687
+ type: [Boolean, Object],
55688
+ default: null
55689
+ },
55690
+ autoSize: {
55691
+ type: [Boolean, Object],
55692
+ default: null
55693
+ },
55682
55694
  form: String,
55683
55695
  resize: {
55684
55696
  type: String,
@@ -55710,7 +55722,8 @@ var autoTxtElem;
55710
55722
  };
55711
55723
  return {
55712
55724
  xID: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId(),
55713
- reactData: reactData
55725
+ reactData: reactData,
55726
+ reFlag: 0
55714
55727
  };
55715
55728
  },
55716
55729
  computed: _objectSpread2(_objectSpread2({}, {}), {}, {
@@ -55781,10 +55794,18 @@ var autoTxtElem;
55781
55794
  computeSizeOpts: function computeSizeOpts() {
55782
55795
  var $xeTextarea = this;
55783
55796
  var props = $xeTextarea;
55797
+ var autosize = props.autosize,
55798
+ autoSize = props.autoSize;
55799
+ if (autosize || getConfig().textarea.autosize) {
55800
+ return Object.assign({
55801
+ minRows: 1,
55802
+ maxRows: 10
55803
+ }, getConfig().textarea.autosize, autosize);
55804
+ }
55784
55805
  return Object.assign({
55785
55806
  minRows: 1,
55786
55807
  maxRows: 10
55787
- }, getConfig().textarea.autosize, props.autosize);
55808
+ }, getConfig().textarea.autoSize, autoSize);
55788
55809
  }
55789
55810
  }),
55790
55811
  methods: {
@@ -55823,16 +55844,23 @@ var autoTxtElem;
55823
55844
  var props = $xeTextarea;
55824
55845
  var reactData = $xeTextarea.reactData;
55825
55846
  var size = props.size,
55826
- autosize = props.autosize;
55847
+ autosize = props.autosize,
55848
+ autoSize = props.autoSize;
55827
55849
  var inputValue = reactData.inputValue;
55828
- if (autosize) {
55850
+ if (autosize || autoSize) {
55851
+ var formReadonly = $xeTextarea.computeFormReadonly;
55829
55852
  if (!autoTxtElem) {
55830
55853
  autoTxtElem = document.createElement('div');
55831
55854
  }
55832
55855
  if (!autoTxtElem.parentNode) {
55833
55856
  document.body.appendChild(autoTxtElem);
55834
55857
  }
55835
- var textElem = $xeTextarea.$refs.refTextarea;
55858
+ var taElem = $xeTextarea.$refs.refTextarea;
55859
+ var ctElem = $xeTextarea.$refs.refContent;
55860
+ var textElem = formReadonly ? ctElem : taElem;
55861
+ if (!textElem) {
55862
+ return;
55863
+ }
55836
55864
  if (!textElem) {
55837
55865
  return;
55838
55866
  }
@@ -55846,12 +55874,17 @@ var autoTxtElem;
55846
55874
  handleResize: function handleResize() {
55847
55875
  var $xeTextarea = this;
55848
55876
  var props = $xeTextarea;
55849
- if (props.autosize) {
55877
+ var autosize = props.autosize,
55878
+ autoSize = props.autoSize;
55879
+ if (autosize || autoSize) {
55850
55880
  $xeTextarea.$nextTick(function () {
55851
55881
  var sizeOpts = $xeTextarea.computeSizeOpts;
55882
+ var formReadonly = $xeTextarea.computeFormReadonly;
55852
55883
  var minRows = sizeOpts.minRows,
55853
55884
  maxRows = sizeOpts.maxRows;
55854
- var textElem = $xeTextarea.$refs.refTextarea;
55885
+ var taElem = $xeTextarea.$refs.refTextarea;
55886
+ var ctElem = $xeTextarea.$refs.refContent;
55887
+ var textElem = formReadonly ? ctElem : taElem;
55855
55888
  if (!textElem) {
55856
55889
  return;
55857
55890
  }
@@ -55957,6 +55990,7 @@ var autoTxtElem;
55957
55990
  var className = props.className,
55958
55991
  resize = props.resize,
55959
55992
  autosize = props.autosize,
55993
+ autoSize = props.autoSize,
55960
55994
  showWordCount = props.showWordCount,
55961
55995
  countMethod = props.countMethod,
55962
55996
  rows = props.rows,
@@ -55974,11 +56008,14 @@ var autoTxtElem;
55974
56008
  return h('div', {
55975
56009
  ref: 'refElem',
55976
56010
  class: ['vxe-textarea--readonly', className]
55977
- }, inputValue);
56011
+ }, [h('div', {
56012
+ ref: 'refContent',
56013
+ class: 'vxe-textarea--content'
56014
+ }, inputValue)]);
55978
56015
  }
55979
56016
  return h('div', {
55980
56017
  ref: 'refElem',
55981
- class: ['vxe-textarea', className, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--autosize', autosize), 'is--count', showWordCount), 'is--disabled', isDisabled), 'is--rows', !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(rows)), 'is--cols', !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cols))],
56018
+ class: ['vxe-textarea', className, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--autosize', autosize || autoSize), 'is--count', showWordCount), 'is--disabled', isDisabled), 'is--rows', !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(rows)), 'is--cols', !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cols))],
55982
56019
  attrs: {
55983
56020
  spellcheck: false
55984
56021
  }
@@ -56025,7 +56062,23 @@ var autoTxtElem;
56025
56062
  reactData.inputValue = val;
56026
56063
  $xeTextarea.updateAutoTxt();
56027
56064
  },
56065
+ computeFormReadonly: function computeFormReadonly() {
56066
+ var $xeTextarea = this;
56067
+ $xeTextarea.reFlag++;
56068
+ },
56028
56069
  computeSizeOpts: function computeSizeOpts() {
56070
+ var $xeTextarea = this;
56071
+ $xeTextarea.reFlag++;
56072
+ },
56073
+ autoSize: function autoSize() {
56074
+ var $xeTextarea = this;
56075
+ $xeTextarea.reFlag++;
56076
+ },
56077
+ autosize: function autosize() {
56078
+ var $xeTextarea = this;
56079
+ $xeTextarea.reFlag++;
56080
+ },
56081
+ reFlag: function reFlag() {
56029
56082
  var $xeTextarea = this;
56030
56083
  $xeTextarea.updateAutoTxt();
56031
56084
  $xeTextarea.handleResize();
@@ -56037,8 +56090,12 @@ var autoTxtElem;
56037
56090
  var reactData = $xeTextarea.reactData;
56038
56091
  reactData.inputValue = props.value;
56039
56092
  $xeTextarea.$nextTick(function () {
56040
- var autosize = props.autosize;
56093
+ var autosize = props.autosize,
56094
+ autoSize = props.autoSize;
56041
56095
  if (autosize) {
56096
+ warnLog('vxe.error.delProp', ['autosize', 'auto-size']);
56097
+ }
56098
+ if (autosize || autoSize) {
56042
56099
  $xeTextarea.updateAutoTxt();
56043
56100
  $xeTextarea.handleResize();
56044
56101
  }