resolver-egretimp-plus 0.1.54 → 0.1.56
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.
package/package.json
CHANGED
|
@@ -4,6 +4,7 @@ import { commonPropsType } from '../../utils/index.js'
|
|
|
4
4
|
|
|
5
5
|
const pickerRef = ref(null)
|
|
6
6
|
const selects = inject('selects')
|
|
7
|
+
const rootForm = inject('rootForm')
|
|
7
8
|
const attrs = useAttrs()
|
|
8
9
|
const lang = inject('lang')
|
|
9
10
|
const modelValue = defineModel()
|
|
@@ -84,6 +85,8 @@ const onConfirm = (e) => {
|
|
|
84
85
|
formatValue.value = val
|
|
85
86
|
|
|
86
87
|
props.config?.onConfirm?.(formatValue.value)
|
|
88
|
+
// pick组件不主动出发formItem上面绑定的额自定义校验,这边就手动出发下
|
|
89
|
+
rootForm.value?.validateField?.(props.config?.dynamicHireRelat)
|
|
87
90
|
open.value = false
|
|
88
91
|
}
|
|
89
92
|
|
|
@@ -199,7 +199,10 @@ export default {
|
|
|
199
199
|
) {
|
|
200
200
|
const showOverflowTooltipFn = (data) => {
|
|
201
201
|
const currentConfig = multiPmPageMetaList.value?.[data.$index]?.[idx]
|
|
202
|
-
|
|
202
|
+
if (currentConfig) {
|
|
203
|
+
return isPlainColumn({...currentConfig, isColumn: true}, calcDisable(currentConfig, indectModeRef.value))
|
|
204
|
+
}
|
|
205
|
+
return true
|
|
203
206
|
}
|
|
204
207
|
retObj['show-overflow-tooltip'] = showOverflowTooltipFn
|
|
205
208
|
retObj.showOverflowTooltip = showOverflowTooltipFn
|
|
@@ -343,9 +346,17 @@ export default {
|
|
|
343
346
|
})
|
|
344
347
|
const defaultTotalFn = (total, val, row) => {
|
|
345
348
|
if (val === undefined || val === null) {
|
|
346
|
-
val =
|
|
349
|
+
val = 0
|
|
350
|
+
if (val === undefined) {
|
|
351
|
+
val = ''
|
|
352
|
+
}
|
|
347
353
|
} else {
|
|
348
|
-
|
|
354
|
+
const strVal = val.toString()
|
|
355
|
+
const negativeFlag = /^-/.test(strVal)
|
|
356
|
+
val = strVal.replace(/[^\d\.]/g, '')
|
|
357
|
+
if (negativeFlag) {
|
|
358
|
+
val = `-${val}`
|
|
359
|
+
}
|
|
349
360
|
}
|
|
350
361
|
const numFlag = !isNaN(Number(val))
|
|
351
362
|
if (total === null || total === undefined) {
|