diff --git a/apps/web-antd/src/components/form-create/components/area-select.vue b/apps/web-antd/src/components/form-create/components/area-select.vue index 9fa8d5b05..59d7033ed 100644 --- a/apps/web-antd/src/components/form-create/components/area-select.vue +++ b/apps/web-antd/src/components/form-create/components/area-select.vue @@ -22,8 +22,10 @@ const props = withDefaults(defineProps(), { }); const emit = defineEmits<{ - (e: 'update:modelValue', value: number[] | string[] | undefined): void; - (e: 'update:value', value: number[] | string[] | undefined): void; + ( + e: 'update:modelValue' | 'update:value', + value: number[] | string[] | undefined, + ): void; }>(); // 地区数据接口 diff --git a/apps/web-antd/src/components/upload/input-upload.vue b/apps/web-antd/src/components/upload/input-upload.vue index 88f00f1cf..215fb1ab8 100644 --- a/apps/web-antd/src/components/upload/input-upload.vue +++ b/apps/web-antd/src/components/upload/input-upload.vue @@ -20,9 +20,10 @@ const props = defineProps<{ }>(); const emits = defineEmits<{ - (e: 'change', payload: number | string): void; - (e: 'update:value', payload: number | string): void; - (e: 'update:modelValue', payload: number | string): void; + ( + e: 'change' | 'update:modelValue' | 'update:value', + payload: number | string, + ): void; }>(); const modelValue = useVModel(props, 'modelValue', emits, { diff --git a/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/extension-moddle/camunda/extension.js b/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/extension-moddle/camunda/extension.js index 3956be680..b9c3ae9a4 100644 --- a/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/extension-moddle/camunda/extension.js +++ b/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/extension-moddle/camunda/extension.js @@ -3,14 +3,11 @@ import { isFunction, isObject } from '@vben/utils'; const WILDCARD = '*'; function CamundaModdleExtension(eventBus) { - // eslint-disable-next-line unicorn/no-this-assignment, @typescript-eslint/no-this-alias - const self = this; - eventBus.on('moddleCopy.canCopyProperty', (context) => { const parent = context.parent; const property = context.property; - return self.canCopyProperty(property, parent); + return this.canCopyProperty(property, parent); }); } diff --git a/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/utilSelf.ts b/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/utilSelf.ts index 2cfd78dfa..308bafaf1 100644 --- a/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/utilSelf.ts +++ b/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/utilSelf.ts @@ -2,11 +2,11 @@ import { cloneDeep } from '@vben/utils'; export function initListenerForm(listener: any) { - let self = { + let localSelf = { ...listener, }; if (listener.script) { - self = { + localSelf = { ...listener, ...listener.script, scriptType: listener.script.resource ? 'externalScript' : 'inlineScript', @@ -22,13 +22,13 @@ export function initListenerForm(listener: any) { // console.log(listener.eventDefinitions, key); if (key.includes('time')) { k = key; - self.eventDefinitionType = key.replace('time', '').toLowerCase(); + localSelf.eventDefinitionType = key.replace('time', '').toLowerCase(); } } // console.log(k); - self.eventTimeDefinitions = listener.eventDefinitions[0][k].body; + localSelf.eventTimeDefinitions = listener.eventDefinitions[0][k].body; } - return self; + return localSelf; } export function initListenerType(listener: any) { diff --git a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue index 403a7932c..658c61143 100644 --- a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue +++ b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue @@ -259,14 +259,14 @@ function updateFormFieldKey( ) { if (!formSetting?.updateFormFields || !newKey) return; const value = formSetting.updateFormFields[oldKey]; - delete formSetting.updateFormFields[oldKey]; + delete formSetting.updateFormFields.oldKey; formSetting.updateFormFields[String(newKey)] = value; } /** 删除修改字段设置项 */ function deleteFormFieldSetting(formSetting: FormTriggerSetting, key: string) { if (!formSetting?.updateFormFields) return; - delete formSetting.updateFormFields[key]; + delete formSetting.updateFormFields.key; } /** 保存配置 */ diff --git a/apps/web-antd/src/views/bpm/processInstance/create/modules/form.vue b/apps/web-antd/src/views/bpm/processInstance/create/modules/form.vue index 2d9cf8a68..ab6fab7ac 100644 --- a/apps/web-antd/src/views/bpm/processInstance/create/modules/form.vue +++ b/apps/web-antd/src/views/bpm/processInstance/create/modules/form.vue @@ -132,7 +132,7 @@ async function initProcessInfo(row: any, formVariables?: any) { if (formVariables) { for (const key in formVariables) { if (!allowedFields.has(key)) { - delete formVariables[key]; + delete formVariables.key; } } } diff --git a/apps/web-antd/src/views/iot/product/product/components/select.vue b/apps/web-antd/src/views/iot/product/product/components/select.vue index b73a8b9ce..3f92894f1 100644 --- a/apps/web-antd/src/views/iot/product/product/components/select.vue +++ b/apps/web-antd/src/views/iot/product/product/components/select.vue @@ -16,8 +16,7 @@ const props = defineProps<{ }>(); const emit = defineEmits<{ - (e: 'update:modelValue', value?: number): void; - (e: 'change', value?: number): void; + (e: 'change' | 'update:modelValue', value?: number): void; }>(); const loading = ref(false); diff --git a/apps/web-antd/src/views/iot/rule/scene/form/selectors/device-selector.vue b/apps/web-antd/src/views/iot/rule/scene/form/selectors/device-selector.vue index acd2d6298..4e4f7a0bd 100644 --- a/apps/web-antd/src/views/iot/rule/scene/form/selectors/device-selector.vue +++ b/apps/web-antd/src/views/iot/rule/scene/form/selectors/device-selector.vue @@ -18,8 +18,7 @@ const props = defineProps<{ }>(); const emit = defineEmits<{ - (e: 'update:modelValue', value?: number): void; - (e: 'change', value?: number): void; + (e: 'change' | 'update:modelValue', value?: number): void; }>(); const deviceLoading = ref(false); // 设备加载状态 diff --git a/apps/web-antd/src/views/iot/rule/scene/form/selectors/operator-selector.vue b/apps/web-antd/src/views/iot/rule/scene/form/selectors/operator-selector.vue index d0106ef35..148b2ca2b 100644 --- a/apps/web-antd/src/views/iot/rule/scene/form/selectors/operator-selector.vue +++ b/apps/web-antd/src/views/iot/rule/scene/form/selectors/operator-selector.vue @@ -19,8 +19,7 @@ const props = defineProps<{ }>(); const emit = defineEmits<{ - (e: 'update:modelValue', value: string): void; - (e: 'change', value: string): void; + (e: 'change' | 'update:modelValue', value: string): void; }>(); const localValue = useVModel(props, 'modelValue', emit); diff --git a/apps/web-antd/src/views/iot/rule/scene/form/selectors/product-selector.vue b/apps/web-antd/src/views/iot/rule/scene/form/selectors/product-selector.vue index cea808eb0..db7c2eaed 100644 --- a/apps/web-antd/src/views/iot/rule/scene/form/selectors/product-selector.vue +++ b/apps/web-antd/src/views/iot/rule/scene/form/selectors/product-selector.vue @@ -17,8 +17,7 @@ defineProps<{ }>(); const emit = defineEmits<{ - (e: 'update:modelValue', value?: number): void; - (e: 'change', value?: number): void; + (e: 'change' | 'update:modelValue', value?: number): void; }>(); const productLoading = ref(false); // 产品加载状态 diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/component-container.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/component-container.vue index a2a16d657..e2e248056 100644 --- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/component-container.vue +++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/component-container.vue @@ -42,8 +42,7 @@ const props = defineProps({ const emits = defineEmits<{ (e: 'move', direction: number): void; - (e: 'copy'): void; - (e: 'delete'): void; + (e: 'copy' | 'delete'): void; }>(); type DiyComponentWithStyle = DiyComponent & { diff --git a/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue index 20a7b9309..d5191a214 100644 --- a/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue +++ b/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue @@ -27,14 +27,15 @@ import RewardRule from './reward-rule.vue'; const emit = defineEmits(['success']); -const createDefaultFormData = (): Partial => ({ - conditionType: PromotionConditionTypeEnum.PRICE.type, - productScope: PromotionProductScopeEnum.ALL.scope, - productScopeValues: [], - productCategoryIds: [], - productSpuIds: [], - rules: [], -}); +const createDefaultFormData = + (): Partial => ({ + conditionType: PromotionConditionTypeEnum.PRICE.type, + productScope: PromotionProductScopeEnum.ALL.scope, + productScopeValues: [], + productCategoryIds: [], + productSpuIds: [], + rules: [], + }); const formData = ref>( createDefaultFormData(), diff --git a/apps/web-antd/src/views/mes/wm/itemreceipt/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/itemreceipt/modules/line-list.vue index c83c8e65c..d5ca6c59d 100644 --- a/apps/web-antd/src/views/mes/wm/itemreceipt/modules/line-list.vue +++ b/apps/web-antd/src/views/mes/wm/itemreceipt/modules/line-list.vue @@ -53,7 +53,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-list.vue index 8341c0274..f8144762f 100644 --- a/apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-list.vue +++ b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-list.vue @@ -51,7 +51,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-list.vue index 386e1b76d..b010c082e 100644 --- a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-list.vue +++ b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-list.vue @@ -52,7 +52,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antd/src/views/mes/wm/productissue/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/productissue/modules/line-list.vue index 7b8352362..51cb475e6 100644 --- a/apps/web-antd/src/views/mes/wm/productissue/modules/line-list.vue +++ b/apps/web-antd/src/views/mes/wm/productissue/modules/line-list.vue @@ -51,7 +51,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antd/src/views/mes/wm/productreceipt/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/productreceipt/modules/line-list.vue index 697d501fa..812dbd712 100644 --- a/apps/web-antd/src/views/mes/wm/productreceipt/modules/line-list.vue +++ b/apps/web-antd/src/views/mes/wm/productreceipt/modules/line-list.vue @@ -54,7 +54,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antd/src/views/mes/wm/productsales/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/productsales/modules/line-list.vue index 0cdc20415..85d26a0bb 100644 --- a/apps/web-antd/src/views/mes/wm/productsales/modules/line-list.vue +++ b/apps/web-antd/src/views/mes/wm/productsales/modules/line-list.vue @@ -52,7 +52,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antd/src/views/mes/wm/returnissue/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/returnissue/modules/line-list.vue index 7be396279..423cb362f 100644 --- a/apps/web-antd/src/views/mes/wm/returnissue/modules/line-list.vue +++ b/apps/web-antd/src/views/mes/wm/returnissue/modules/line-list.vue @@ -54,7 +54,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antd/src/views/mes/wm/returnsales/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/returnsales/modules/line-list.vue index cf0b405df..b45897cf6 100644 --- a/apps/web-antd/src/views/mes/wm/returnsales/modules/line-list.vue +++ b/apps/web-antd/src/views/mes/wm/returnsales/modules/line-list.vue @@ -54,7 +54,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antd/src/views/mes/wm/returnvendor/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/returnvendor/modules/line-list.vue index 541ba8567..ecfaaa0bb 100644 --- a/apps/web-antd/src/views/mes/wm/returnvendor/modules/line-list.vue +++ b/apps/web-antd/src/views/mes/wm/returnvendor/modules/line-list.vue @@ -53,7 +53,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antd/src/views/mes/wm/transfer/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/transfer/modules/line-list.vue index 12c1537d6..a081094ac 100644 --- a/apps/web-antd/src/views/mes/wm/transfer/modules/line-list.vue +++ b/apps/web-antd/src/views/mes/wm/transfer/modules/line-list.vue @@ -51,7 +51,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antd/src/views/mp/components/wx-reply/tab-text.vue b/apps/web-antd/src/views/mp/components/wx-reply/tab-text.vue index 914d943a6..a5fd06502 100644 --- a/apps/web-antd/src/views/mp/components/wx-reply/tab-text.vue +++ b/apps/web-antd/src/views/mp/components/wx-reply/tab-text.vue @@ -8,8 +8,7 @@ const props = defineProps<{ }>(); const emit = defineEmits<{ - (e: 'input', v: null | string): void; - (e: 'update:modelValue', v: null | string): void; + (e: 'input' | 'update:modelValue', v: null | string): void; }>(); const content = computed({ diff --git a/apps/web-antd/src/views/mp/material/modules/UploadFile.vue b/apps/web-antd/src/views/mp/material/modules/UploadFile.vue index 51d46894b..19e229977 100644 --- a/apps/web-antd/src/views/mp/material/modules/UploadFile.vue +++ b/apps/web-antd/src/views/mp/material/modules/UploadFile.vue @@ -20,7 +20,7 @@ import { const props = defineProps<{ type: UploadType }>(); const emit = defineEmits<{ - uploaded: [v: void]; + uploaded: [v: Promise]; }>(); const accountId = inject('accountId'); diff --git a/apps/web-antd/src/views/mp/material/modules/UploadVideo.vue b/apps/web-antd/src/views/mp/material/modules/UploadVideo.vue index a2f4a09ee..2c5a30261 100644 --- a/apps/web-antd/src/views/mp/material/modules/UploadVideo.vue +++ b/apps/web-antd/src/views/mp/material/modules/UploadVideo.vue @@ -30,7 +30,7 @@ withDefaults( const emit = defineEmits<{ 'update:open': [v: boolean]; - uploaded: [v: void]; + uploaded: [v: Promise]; }>(); const accountId = inject('accountId'); diff --git a/apps/web-antd/src/views/mp/menu/modules/editor.vue b/apps/web-antd/src/views/mp/menu/modules/editor.vue index 634ddc679..9412ffc1a 100644 --- a/apps/web-antd/src/views/mp/menu/modules/editor.vue +++ b/apps/web-antd/src/views/mp/menu/modules/editor.vue @@ -24,7 +24,7 @@ const props = defineProps<{ }>(); const emit = defineEmits<{ - (e: 'delete', v: void): void; + (e: 'delete', v: Promise): void; (e: 'update:modelValue', v: any): void; }>(); diff --git a/apps/web-antd/src/views/system/user/components/select.vue b/apps/web-antd/src/views/system/user/components/select.vue index 68d39d6b6..7df4987fa 100644 --- a/apps/web-antd/src/views/system/user/components/select.vue +++ b/apps/web-antd/src/views/system/user/components/select.vue @@ -66,9 +66,7 @@ function hasValue() { } /** 根据编号查询用户信息(用于编辑回显) */ -async function resolveItemsById( - value: null | number | number[] | undefined, -) { +async function resolveItemsById(value: null | number | number[] | undefined) { const ids = getSelectedIds(value); if (ids.length === 0) { selectedItems.value = []; @@ -89,7 +87,10 @@ async function resolveItemsById( .filter((item): item is SystemUserApi.User => !!item); } -watch(() => props.modelValue, resolveItemsById, { deep: true, immediate: true }); +watch(() => props.modelValue, resolveItemsById, { + deep: true, + immediate: true, +}); /** 清空已选用户 */ function clearSelected() { diff --git a/apps/web-antd/src/views/wms/order/check/index.vue b/apps/web-antd/src/views/wms/order/check/index.vue index eb6ddfeaa..d633cc1ad 100644 --- a/apps/web-antd/src/views/wms/order/check/index.vue +++ b/apps/web-antd/src/views/wms/order/check/index.vue @@ -67,7 +67,8 @@ const [DetailModal, detailModalApi] = useVbenModal({ /** 清空展开明细缓存 */ function clearDetailMap() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } } @@ -105,7 +106,8 @@ async function handleExpandChange( if (!expanded) { return; } - delete detailMap[row.id!]; + const key = row.id; + delete detailMap.key; detailMap[row.id!] = await getCheckOrderDetailListByOrderId(row.id!); } diff --git a/apps/web-antd/src/views/wms/order/movement/index.vue b/apps/web-antd/src/views/wms/order/movement/index.vue index 34730a978..0202445f9 100644 --- a/apps/web-antd/src/views/wms/order/movement/index.vue +++ b/apps/web-antd/src/views/wms/order/movement/index.vue @@ -60,7 +60,8 @@ const [DetailModal, detailModalApi] = useVbenModal({ /** 清空展开明细缓存 */ function clearDetailMap() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } } @@ -105,7 +106,8 @@ async function handleExpandChange( if (!expanded) { return; } - delete detailMap[row.id!]; + const key = row.id; + delete detailMap.key; detailMap[row.id!] = await getMovementOrderDetailListByOrderId(row.id!); } diff --git a/apps/web-antd/src/views/wms/order/receipt/index.vue b/apps/web-antd/src/views/wms/order/receipt/index.vue index 37e2f0817..e78e56b22 100644 --- a/apps/web-antd/src/views/wms/order/receipt/index.vue +++ b/apps/web-antd/src/views/wms/order/receipt/index.vue @@ -60,7 +60,8 @@ const [DetailModal, detailModalApi] = useVbenModal({ /** 清空展开明细缓存 */ function clearDetailMap() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } } @@ -105,7 +106,8 @@ async function handleExpandChange( if (!expanded) { return; } - delete detailMap[row.id!]; + const key = row.id; + delete detailMap.key; detailMap[row.id!] = await getReceiptOrderDetailListByOrderId(row.id!); } diff --git a/apps/web-antd/src/views/wms/order/shipment/index.vue b/apps/web-antd/src/views/wms/order/shipment/index.vue index ef9a8ff40..a3d0b38aa 100644 --- a/apps/web-antd/src/views/wms/order/shipment/index.vue +++ b/apps/web-antd/src/views/wms/order/shipment/index.vue @@ -60,7 +60,8 @@ const [DetailModal, detailModalApi] = useVbenModal({ /** 清空展开明细缓存 */ function clearDetailMap() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } } @@ -105,7 +106,8 @@ async function handleExpandChange( if (!expanded) { return; } - delete detailMap[row.id!]; + const key = row.id; + delete detailMap.key; detailMap[row.id!] = await getShipmentOrderDetailListByOrderId(row.id!); } diff --git a/apps/web-antdv-next/src/components/form-create/components/area-select.vue b/apps/web-antdv-next/src/components/form-create/components/area-select.vue index 4e6810006..2a50e8f4e 100644 --- a/apps/web-antdv-next/src/components/form-create/components/area-select.vue +++ b/apps/web-antdv-next/src/components/form-create/components/area-select.vue @@ -22,8 +22,10 @@ const props = withDefaults(defineProps(), { }); const emit = defineEmits<{ - (e: 'update:modelValue', value: number[] | string[] | undefined): void; - (e: 'update:value', value: number[] | string[] | undefined): void; + ( + e: 'update:modelValue' | 'update:value', + value: number[] | string[] | undefined, + ): void; }>(); // 地区数据接口 diff --git a/apps/web-antdv-next/src/components/upload/input-upload.vue b/apps/web-antdv-next/src/components/upload/input-upload.vue index 0ab67425b..372006730 100644 --- a/apps/web-antdv-next/src/components/upload/input-upload.vue +++ b/apps/web-antdv-next/src/components/upload/input-upload.vue @@ -20,9 +20,10 @@ const props = defineProps<{ }>(); const emits = defineEmits<{ - (e: 'change', payload: number | string): void; - (e: 'update:value', payload: number | string): void; - (e: 'update:modelValue', payload: number | string): void; + ( + e: 'change' | 'update:modelValue' | 'update:value', + payload: number | string, + ): void; }>(); const modelValue = useVModel(props, 'modelValue', emits, { diff --git a/apps/web-antdv-next/src/views/ai/image/index/modules/card.vue b/apps/web-antdv-next/src/views/ai/image/index/modules/card.vue index b6244d4a5..23e3f69f7 100644 --- a/apps/web-antdv-next/src/views/ai/image/index/modules/card.vue +++ b/apps/web-antdv-next/src/views/ai/image/index/modules/card.vue @@ -97,11 +97,7 @@ onMounted(async () => { > - diff --git a/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/extension-moddle/camunda/extension.js b/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/extension-moddle/camunda/extension.js index 3956be680..b9c3ae9a4 100644 --- a/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/extension-moddle/camunda/extension.js +++ b/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/extension-moddle/camunda/extension.js @@ -3,14 +3,11 @@ import { isFunction, isObject } from '@vben/utils'; const WILDCARD = '*'; function CamundaModdleExtension(eventBus) { - // eslint-disable-next-line unicorn/no-this-assignment, @typescript-eslint/no-this-alias - const self = this; - eventBus.on('moddleCopy.canCopyProperty', (context) => { const parent = context.parent; const property = context.property; - return self.canCopyProperty(property, parent); + return this.canCopyProperty(property, parent); }); } diff --git a/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/utilSelf.ts b/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/utilSelf.ts index 2cfd78dfa..308bafaf1 100644 --- a/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/utilSelf.ts +++ b/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/utilSelf.ts @@ -2,11 +2,11 @@ import { cloneDeep } from '@vben/utils'; export function initListenerForm(listener: any) { - let self = { + let localSelf = { ...listener, }; if (listener.script) { - self = { + localSelf = { ...listener, ...listener.script, scriptType: listener.script.resource ? 'externalScript' : 'inlineScript', @@ -22,13 +22,13 @@ export function initListenerForm(listener: any) { // console.log(listener.eventDefinitions, key); if (key.includes('time')) { k = key; - self.eventDefinitionType = key.replace('time', '').toLowerCase(); + localSelf.eventDefinitionType = key.replace('time', '').toLowerCase(); } } // console.log(k); - self.eventTimeDefinitions = listener.eventDefinitions[0][k].body; + localSelf.eventTimeDefinitions = listener.eventDefinitions[0][k].body; } - return self; + return localSelf; } export function initListenerType(listener: any) { diff --git a/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue b/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue index 84f9e0d23..2bb33304e 100644 --- a/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue +++ b/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue @@ -258,14 +258,14 @@ function updateFormFieldKey( ) { if (!formSetting?.updateFormFields || !newKey) return; const value = formSetting.updateFormFields[oldKey]; - delete formSetting.updateFormFields[oldKey]; + delete formSetting.updateFormFields.oldKey; formSetting.updateFormFields[String(newKey)] = value; } /** 删除修改字段设置项 */ function deleteFormFieldSetting(formSetting: FormTriggerSetting, key: string) { if (!formSetting?.updateFormFields) return; - delete formSetting.updateFormFields[key]; + delete formSetting.updateFormFields.key; } /** 保存配置 */ diff --git a/apps/web-antdv-next/src/views/bpm/processInstance/create/modules/form.vue b/apps/web-antdv-next/src/views/bpm/processInstance/create/modules/form.vue index d8578e1b3..4021ff2df 100644 --- a/apps/web-antdv-next/src/views/bpm/processInstance/create/modules/form.vue +++ b/apps/web-antdv-next/src/views/bpm/processInstance/create/modules/form.vue @@ -141,7 +141,7 @@ async function initProcessInfo(row: any, formVariables?: any) { if (formVariables) { for (const key in formVariables) { if (!allowedFields.has(key)) { - delete formVariables[key]; + delete formVariables.key; } } } diff --git a/apps/web-antdv-next/src/views/infra/build/index.vue b/apps/web-antdv-next/src/views/infra/build/index.vue index 1984342e9..4a94af10e 100644 --- a/apps/web-antdv-next/src/views/infra/build/index.vue +++ b/apps/web-antdv-next/src/views/infra/build/index.vue @@ -104,7 +104,7 @@ function makeTemplate() { const rule = ref('') const option = ref('') const init = () => { - rule.value = formCreate.parseJson('${formCreate.toJson(rule).replaceAll('\\', '\\\\')}') + rule.value = formCreate.parseJson('${formCreate.toJson(rule).replaceAll('\\', String.raw`\\`)}') option.value = formCreate.parseJson('${JSON.stringify(opt, null, 2)}') } const onSubmit = (formData) => { diff --git a/apps/web-antdv-next/src/views/iot/product/product/components/select.vue b/apps/web-antdv-next/src/views/iot/product/product/components/select.vue index 3dedd730e..bc1c6f9b1 100644 --- a/apps/web-antdv-next/src/views/iot/product/product/components/select.vue +++ b/apps/web-antdv-next/src/views/iot/product/product/components/select.vue @@ -16,8 +16,7 @@ const props = defineProps<{ }>(); const emit = defineEmits<{ - (e: 'update:modelValue', value?: number): void; - (e: 'change', value?: number): void; + (e: 'change' | 'update:modelValue', value?: number): void; }>(); const loading = ref(false); diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/device-selector.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/device-selector.vue index eee109ea9..8b1d55277 100644 --- a/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/device-selector.vue +++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/device-selector.vue @@ -18,8 +18,7 @@ const props = defineProps<{ }>(); const emit = defineEmits<{ - (e: 'update:modelValue', value?: number): void; - (e: 'change', value?: number): void; + (e: 'change' | 'update:modelValue', value?: number): void; }>(); const deviceLoading = ref(false); // 设备加载状态 diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/operator-selector.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/operator-selector.vue index b6e2c0894..570d1efdb 100644 --- a/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/operator-selector.vue +++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/operator-selector.vue @@ -19,8 +19,7 @@ const props = defineProps<{ }>(); const emit = defineEmits<{ - (e: 'update:modelValue', value: string): void; - (e: 'change', value: string): void; + (e: 'change' | 'update:modelValue', value: string): void; }>(); const localValue = useVModel(props, 'modelValue', emit); diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/product-selector.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/product-selector.vue index 634d7c38e..46c19b133 100644 --- a/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/product-selector.vue +++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/product-selector.vue @@ -17,8 +17,7 @@ defineProps<{ }>(); const emit = defineEmits<{ - (e: 'update:modelValue', value?: number): void; - (e: 'change', value?: number): void; + (e: 'change' | 'update:modelValue', value?: number): void; }>(); const productLoading = ref(false); // 产品加载状态 diff --git a/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/components/component-container.vue b/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/components/component-container.vue index 72e165b1d..fdf1f00d1 100644 --- a/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/components/component-container.vue +++ b/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/components/component-container.vue @@ -42,8 +42,7 @@ const props = defineProps({ const emits = defineEmits<{ (e: 'move', direction: number): void; - (e: 'copy'): void; - (e: 'delete'): void; + (e: 'copy' | 'delete'): void; }>(); type DiyComponentWithStyle = DiyComponent & { diff --git a/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/components/mobile/product-list/index.vue b/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/components/mobile/product-list/index.vue index c15dec4d0..602488ea2 100644 --- a/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/components/mobile/product-list/index.vue +++ b/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/components/mobile/product-list/index.vue @@ -21,9 +21,10 @@ const spuList = ref([]); watch( () => props.property.spuIds, async () => { - spuList.value = props.property.spuIds.length > 0 - ? await getSpuDetailList(props.property.spuIds) - : []; + spuList.value = + props.property.spuIds.length > 0 + ? await getSpuDetailList(props.property.spuIds) + : []; }, { immediate: true, diff --git a/apps/web-antdv-next/src/views/mall/promotion/rewardActivity/modules/form.vue b/apps/web-antdv-next/src/views/mall/promotion/rewardActivity/modules/form.vue index 0665bdb36..0b57c0266 100644 --- a/apps/web-antdv-next/src/views/mall/promotion/rewardActivity/modules/form.vue +++ b/apps/web-antdv-next/src/views/mall/promotion/rewardActivity/modules/form.vue @@ -27,14 +27,15 @@ import RewardRule from './reward-rule.vue'; const emit = defineEmits(['success']); -const createDefaultFormData = (): Partial => ({ - conditionType: PromotionConditionTypeEnum.PRICE.type, - productScope: PromotionProductScopeEnum.ALL.scope, - productScopeValues: [], - productCategoryIds: [], - productSpuIds: [], - rules: [], -}); +const createDefaultFormData = + (): Partial => ({ + conditionType: PromotionConditionTypeEnum.PRICE.type, + productScope: PromotionProductScopeEnum.ALL.scope, + productScopeValues: [], + productCategoryIds: [], + productSpuIds: [], + rules: [], + }); const formData = ref>( createDefaultFormData(), diff --git a/apps/web-antdv-next/src/views/mes/wm/itemreceipt/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/itemreceipt/modules/line-list.vue index e7bf21cd3..7a6889a15 100644 --- a/apps/web-antdv-next/src/views/mes/wm/itemreceipt/modules/line-list.vue +++ b/apps/web-antdv-next/src/views/mes/wm/itemreceipt/modules/line-list.vue @@ -53,7 +53,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antdv-next/src/views/mes/wm/outsourceissue/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/outsourceissue/modules/line-list.vue index c67f5a045..e5b1dbae9 100644 --- a/apps/web-antdv-next/src/views/mes/wm/outsourceissue/modules/line-list.vue +++ b/apps/web-antdv-next/src/views/mes/wm/outsourceissue/modules/line-list.vue @@ -51,7 +51,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antdv-next/src/views/mes/wm/outsourcereceipt/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/outsourcereceipt/modules/line-list.vue index facd4f587..131b4cf64 100644 --- a/apps/web-antdv-next/src/views/mes/wm/outsourcereceipt/modules/line-list.vue +++ b/apps/web-antdv-next/src/views/mes/wm/outsourcereceipt/modules/line-list.vue @@ -52,7 +52,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antdv-next/src/views/mes/wm/productissue/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/productissue/modules/line-list.vue index 44c1d4a62..628a323e0 100644 --- a/apps/web-antdv-next/src/views/mes/wm/productissue/modules/line-list.vue +++ b/apps/web-antdv-next/src/views/mes/wm/productissue/modules/line-list.vue @@ -51,7 +51,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antdv-next/src/views/mes/wm/productreceipt/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/productreceipt/modules/line-list.vue index 368bc5cab..8a17df20f 100644 --- a/apps/web-antdv-next/src/views/mes/wm/productreceipt/modules/line-list.vue +++ b/apps/web-antdv-next/src/views/mes/wm/productreceipt/modules/line-list.vue @@ -54,7 +54,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antdv-next/src/views/mes/wm/productsales/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/productsales/modules/line-list.vue index ca365eb01..ad05a3a40 100644 --- a/apps/web-antdv-next/src/views/mes/wm/productsales/modules/line-list.vue +++ b/apps/web-antdv-next/src/views/mes/wm/productsales/modules/line-list.vue @@ -52,7 +52,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antdv-next/src/views/mes/wm/returnissue/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/returnissue/modules/line-list.vue index 0b44e3227..0a9430718 100644 --- a/apps/web-antdv-next/src/views/mes/wm/returnissue/modules/line-list.vue +++ b/apps/web-antdv-next/src/views/mes/wm/returnissue/modules/line-list.vue @@ -54,7 +54,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antdv-next/src/views/mes/wm/returnsales/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/returnsales/modules/line-list.vue index b54daf917..55eee56a4 100644 --- a/apps/web-antdv-next/src/views/mes/wm/returnsales/modules/line-list.vue +++ b/apps/web-antdv-next/src/views/mes/wm/returnsales/modules/line-list.vue @@ -54,7 +54,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antdv-next/src/views/mes/wm/returnvendor/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/returnvendor/modules/line-list.vue index 2ffc72d3e..4d0a3fc52 100644 --- a/apps/web-antdv-next/src/views/mes/wm/returnvendor/modules/line-list.vue +++ b/apps/web-antdv-next/src/views/mes/wm/returnvendor/modules/line-list.vue @@ -53,7 +53,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antdv-next/src/views/mes/wm/transfer/modules/line-list.vue b/apps/web-antdv-next/src/views/mes/wm/transfer/modules/line-list.vue index c0203d743..1a76f0704 100644 --- a/apps/web-antdv-next/src/views/mes/wm/transfer/modules/line-list.vue +++ b/apps/web-antdv-next/src/views/mes/wm/transfer/modules/line-list.vue @@ -51,7 +51,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-antdv-next/src/views/mp/components/wx-reply/tab-text.vue b/apps/web-antdv-next/src/views/mp/components/wx-reply/tab-text.vue index 243ff96e3..4ee010089 100644 --- a/apps/web-antdv-next/src/views/mp/components/wx-reply/tab-text.vue +++ b/apps/web-antdv-next/src/views/mp/components/wx-reply/tab-text.vue @@ -8,8 +8,7 @@ const props = defineProps<{ }>(); const emit = defineEmits<{ - (e: 'input', v: null | string): void; - (e: 'update:modelValue', v: null | string): void; + (e: 'input' | 'update:modelValue', v: null | string): void; }>(); const content = computed({ diff --git a/apps/web-antdv-next/src/views/mp/material/modules/UploadFile.vue b/apps/web-antdv-next/src/views/mp/material/modules/UploadFile.vue index 80bc430d2..65f67e3a1 100644 --- a/apps/web-antdv-next/src/views/mp/material/modules/UploadFile.vue +++ b/apps/web-antdv-next/src/views/mp/material/modules/UploadFile.vue @@ -20,7 +20,7 @@ import { const props = defineProps<{ type: UploadType }>(); const emit = defineEmits<{ - uploaded: [v: void]; + uploaded: [v: Promise]; }>(); const accountId = inject('accountId'); diff --git a/apps/web-antdv-next/src/views/mp/material/modules/UploadVideo.vue b/apps/web-antdv-next/src/views/mp/material/modules/UploadVideo.vue index 6dc6eee77..b54965375 100644 --- a/apps/web-antdv-next/src/views/mp/material/modules/UploadVideo.vue +++ b/apps/web-antdv-next/src/views/mp/material/modules/UploadVideo.vue @@ -32,7 +32,7 @@ withDefaults( const emit = defineEmits<{ 'update:open': [v: boolean]; - uploaded: [v: void]; + uploaded: [v: Promise]; }>(); const accountId = inject('accountId'); diff --git a/apps/web-antdv-next/src/views/mp/menu/modules/editor.vue b/apps/web-antdv-next/src/views/mp/menu/modules/editor.vue index c7223af1b..564340f23 100644 --- a/apps/web-antdv-next/src/views/mp/menu/modules/editor.vue +++ b/apps/web-antdv-next/src/views/mp/menu/modules/editor.vue @@ -16,7 +16,7 @@ const props = defineProps<{ }>(); const emit = defineEmits<{ - (e: 'delete', v: void): void; + (e: 'delete', v: Promise): void; (e: 'update:modelValue', v: any): void; }>(); diff --git a/apps/web-antdv-next/src/views/system/user/components/select.vue b/apps/web-antdv-next/src/views/system/user/components/select.vue index 9a88e852f..ade886b53 100644 --- a/apps/web-antdv-next/src/views/system/user/components/select.vue +++ b/apps/web-antdv-next/src/views/system/user/components/select.vue @@ -63,9 +63,7 @@ function getSelectedIds(value: null | number | number[] | undefined) { } /** 根据编号查询用户信息(用于编辑回显) */ -async function resolveItemsById( - value: null | number | number[] | undefined, -) { +async function resolveItemsById(value: null | number | number[] | undefined) { const ids = getSelectedIds(value); if (ids.length === 0) { selectedItems.value = []; diff --git a/apps/web-antdv-next/src/views/wms/order/check/index.vue b/apps/web-antdv-next/src/views/wms/order/check/index.vue index f33acc328..8416dc44f 100644 --- a/apps/web-antdv-next/src/views/wms/order/check/index.vue +++ b/apps/web-antdv-next/src/views/wms/order/check/index.vue @@ -67,7 +67,8 @@ const [DetailModal, detailModalApi] = useVbenModal({ /** 清空展开明细缓存 */ function clearDetailMap() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } } @@ -105,7 +106,8 @@ async function handleExpandChange( if (!expanded) { return; } - delete detailMap[row.id!]; + const key = row.id; + delete detailMap.key; detailMap[row.id!] = await getCheckOrderDetailListByOrderId(row.id!); } diff --git a/apps/web-antdv-next/src/views/wms/order/movement/index.vue b/apps/web-antdv-next/src/views/wms/order/movement/index.vue index 83c8b14d9..cf8ed3a26 100644 --- a/apps/web-antdv-next/src/views/wms/order/movement/index.vue +++ b/apps/web-antdv-next/src/views/wms/order/movement/index.vue @@ -60,7 +60,8 @@ const [DetailModal, detailModalApi] = useVbenModal({ /** 清空展开明细缓存 */ function clearDetailMap() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } } @@ -105,7 +106,8 @@ async function handleExpandChange( if (!expanded) { return; } - delete detailMap[row.id!]; + const key = row.id; + delete detailMap.key; detailMap[row.id!] = await getMovementOrderDetailListByOrderId(row.id!); } diff --git a/apps/web-antdv-next/src/views/wms/order/receipt/index.vue b/apps/web-antdv-next/src/views/wms/order/receipt/index.vue index c11d4047c..9a4445750 100644 --- a/apps/web-antdv-next/src/views/wms/order/receipt/index.vue +++ b/apps/web-antdv-next/src/views/wms/order/receipt/index.vue @@ -60,7 +60,8 @@ const [DetailModal, detailModalApi] = useVbenModal({ /** 清空展开明细缓存 */ function clearDetailMap() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } } @@ -105,7 +106,8 @@ async function handleExpandChange( if (!expanded) { return; } - delete detailMap[row.id!]; + const key = row.id; + delete detailMap.key; detailMap[row.id!] = await getReceiptOrderDetailListByOrderId(row.id!); } diff --git a/apps/web-antdv-next/src/views/wms/order/shipment/index.vue b/apps/web-antdv-next/src/views/wms/order/shipment/index.vue index dbefe406b..86e6a0a0c 100644 --- a/apps/web-antdv-next/src/views/wms/order/shipment/index.vue +++ b/apps/web-antdv-next/src/views/wms/order/shipment/index.vue @@ -60,7 +60,8 @@ const [DetailModal, detailModalApi] = useVbenModal({ /** 清空展开明细缓存 */ function clearDetailMap() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } } @@ -105,7 +106,8 @@ async function handleExpandChange( if (!expanded) { return; } - delete detailMap[row.id!]; + const key = row.id; + delete detailMap.key; detailMap[row.id!] = await getShipmentOrderDetailListByOrderId(row.id!); } diff --git a/apps/web-ele/src/components/upload/input-upload.vue b/apps/web-ele/src/components/upload/input-upload.vue index 6ae7c85bd..60c4034db 100644 --- a/apps/web-ele/src/components/upload/input-upload.vue +++ b/apps/web-ele/src/components/upload/input-upload.vue @@ -20,9 +20,10 @@ const props = defineProps<{ }>(); const emits = defineEmits<{ - (e: 'change', payload: number | string): void; - (e: 'update:value', payload: number | string): void; - (e: 'update:modelValue', payload: number | string): void; + ( + e: 'change' | 'update:modelValue' | 'update:value', + payload: number | string, + ): void; }>(); const modelValue = useVModel(props, 'modelValue', emits, { diff --git a/apps/web-ele/src/views/ai/image/index/modules/card.vue b/apps/web-ele/src/views/ai/image/index/modules/card.vue index 56f794e5a..9f41b68ee 100644 --- a/apps/web-ele/src/views/ai/image/index/modules/card.vue +++ b/apps/web-ele/src/views/ai/image/index/modules/card.vue @@ -81,11 +81,7 @@ onMounted(async () => {
- + { > - + - +
diff --git a/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/utilSelf.ts b/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/utilSelf.ts index 2cfd78dfa..308bafaf1 100644 --- a/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/utilSelf.ts +++ b/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/utilSelf.ts @@ -2,11 +2,11 @@ import { cloneDeep } from '@vben/utils'; export function initListenerForm(listener: any) { - let self = { + let localSelf = { ...listener, }; if (listener.script) { - self = { + localSelf = { ...listener, ...listener.script, scriptType: listener.script.resource ? 'externalScript' : 'inlineScript', @@ -22,13 +22,13 @@ export function initListenerForm(listener: any) { // console.log(listener.eventDefinitions, key); if (key.includes('time')) { k = key; - self.eventDefinitionType = key.replace('time', '').toLowerCase(); + localSelf.eventDefinitionType = key.replace('time', '').toLowerCase(); } } // console.log(k); - self.eventTimeDefinitions = listener.eventDefinitions[0][k].body; + localSelf.eventTimeDefinitions = listener.eventDefinitions[0][k].body; } - return self; + return localSelf; } export function initListenerType(listener: any) { diff --git a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue index ff1e53fbf..b4c7c442c 100644 --- a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue +++ b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue @@ -258,14 +258,14 @@ function updateFormFieldKey( ) { if (!formSetting?.updateFormFields || !newKey) return; const value = formSetting.updateFormFields[oldKey]; - delete formSetting.updateFormFields[oldKey]; + delete formSetting.updateFormFields.oldkey; formSetting.updateFormFields[String(newKey)] = value; } /** 删除修改字段设置项 */ function deleteFormFieldSetting(formSetting: FormTriggerSetting, key: string) { if (!formSetting?.updateFormFields) return; - delete formSetting.updateFormFields[key]; + delete formSetting.updateFormFields.key; } /** 保存配置 */ diff --git a/apps/web-ele/src/views/bpm/model/form/modules/extra-setting.vue b/apps/web-ele/src/views/bpm/model/form/modules/extra-setting.vue index 853ea5427..b7f2980cf 100644 --- a/apps/web-ele/src/views/bpm/model/form/modules/extra-setting.vue +++ b/apps/web-ele/src/views/bpm/model/form/modules/extra-setting.vue @@ -159,18 +159,20 @@ const formFieldOptions4Title = computed(() => { }; }); // 固定添加发起人 ID 字段 - cloneFormField.unshift({ - label: '流程名称', - value: ProcessVariableEnum.PROCESS_DEFINITION_NAME, - }); - cloneFormField.unshift({ - label: '发起时间', - value: ProcessVariableEnum.START_TIME, - }); - cloneFormField.unshift({ - label: '发起人', - value: ProcessVariableEnum.START_USER_ID, - }); + cloneFormField.unshift( + { + label: '发起人', + value: ProcessVariableEnum.START_USER_ID, + }, + { + label: '发起时间', + value: ProcessVariableEnum.START_TIME, + }, + { + label: '流程名称', + value: ProcessVariableEnum.PROCESS_DEFINITION_NAME, + }, + ); return cloneFormField; }); const formFieldOptions4Summary = computed(() => { diff --git a/apps/web-ele/src/views/bpm/processInstance/create/modules/form.vue b/apps/web-ele/src/views/bpm/processInstance/create/modules/form.vue index 7fcd987d0..aeb53509a 100644 --- a/apps/web-ele/src/views/bpm/processInstance/create/modules/form.vue +++ b/apps/web-ele/src/views/bpm/processInstance/create/modules/form.vue @@ -142,7 +142,7 @@ async function initProcessInfo(row: any, formVariables?: any) { if (formVariables) { for (const key in formVariables) { if (!allowedFields.has(key)) { - delete formVariables[key]; + delete formVariables.key; } } } diff --git a/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue b/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue index e76cd6e54..9d5c839d2 100644 --- a/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue +++ b/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue @@ -365,7 +365,8 @@ async function initNextAssigneesFormField() { node.candidateStrategy) || // 情况二:当前节点是审批人自选 (isEmpty(node.candidateUsers) && - BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy) + BpmCandidateStrategyEnum.APPROVE_USER_SELECT === + node.candidateStrategy) ) { nextAssigneesActivityNode.value.push(node); } @@ -407,7 +408,10 @@ function validateNextAssignees() { } // 如果需要自选审批人,则校验每个节点是否都已配置审批人 for (const item of nextAssigneesActivityNode.value) { - if (isEmpty(item.candidateUsers) && isEmpty(approveReasonForm.nextAssignees[item.id])) { + if ( + isEmpty(item.candidateUsers) && + isEmpty(approveReasonForm.nextAssignees[item.id]) + ) { ElMessage.warning('下一个节点的审批人不能为空!'); return false; } @@ -797,9 +801,7 @@ function handleSignFinish(url: string) { /** 判断文件是否为图片类型 */ function isImageUrl(url: string) { - return /\.(jpg|jpeg|png|gif|bmp|webp|svg)$/i.test( - url.split(/[?#]/)[0] || '', - ); + return /\.(jpg|jpeg|png|gif|bmp|webp|svg)$/i.test(url.split(/[?#]/)[0] || ''); } /** 附件图片预览 */ diff --git a/apps/web-ele/src/views/bpm/processInstance/detail/modules/time-line.vue b/apps/web-ele/src/views/bpm/processInstance/detail/modules/time-line.vue index e53c62629..22c492802 100644 --- a/apps/web-ele/src/views/bpm/processInstance/detail/modules/time-line.vue +++ b/apps/web-ele/src/views/bpm/processInstance/detail/modules/time-line.vue @@ -430,69 +430,67 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers }); v-if="shouldShowReasonAndAttachment(task, activity.nodeType)" class="mt-1 w-full rounded-md bg-gray-100 p-2 text-sm text-gray-500" > -
审批意见:{{ task.reason }}
-
-
- 附件列表: -
-
- -
+
审批意见:{{ task.reason }}
+
+
+ 附件列表: +
+
+
-
- 签名: - -
+
+
+ 签名: + +
diff --git a/apps/web-ele/src/views/infra/build/index.vue b/apps/web-ele/src/views/infra/build/index.vue index 4648dd650..edec03bc9 100644 --- a/apps/web-ele/src/views/infra/build/index.vue +++ b/apps/web-ele/src/views/infra/build/index.vue @@ -104,7 +104,7 @@ function makeTemplate() { const rule = ref('') const option = ref('') const init = () => { - rule.value = formCreate.parseJson('${formCreate.toJson(rule).replaceAll('\\', '\\\\')}') + rule.value = formCreate.parseJson('${formCreate.toJson(rule).replaceAll('\\', String.raw`\\`)}') option.value = formCreate.parseJson('${JSON.stringify(opt, null, 2)}') } const onSubmit = (formData) => { diff --git a/apps/web-ele/src/views/iot/product/product/components/select.vue b/apps/web-ele/src/views/iot/product/product/components/select.vue index 895858700..d3e3f7118 100644 --- a/apps/web-ele/src/views/iot/product/product/components/select.vue +++ b/apps/web-ele/src/views/iot/product/product/components/select.vue @@ -16,8 +16,7 @@ const props = defineProps<{ }>(); const emit = defineEmits<{ - (e: 'update:modelValue', value?: number): void; - (e: 'change', value?: number): void; + (e: 'change' | 'update:modelValue', value?: number): void; }>(); const loading = ref(false); diff --git a/apps/web-ele/src/views/iot/rule/scene/form/selectors/device-selector.vue b/apps/web-ele/src/views/iot/rule/scene/form/selectors/device-selector.vue index 4f0d77dc3..783f38028 100644 --- a/apps/web-ele/src/views/iot/rule/scene/form/selectors/device-selector.vue +++ b/apps/web-ele/src/views/iot/rule/scene/form/selectors/device-selector.vue @@ -17,8 +17,7 @@ const props = defineProps<{ }>(); const emit = defineEmits<{ - (e: 'update:modelValue', value?: number): void; - (e: 'change', value?: number): void; + (e: 'change' | 'update:modelValue', value?: number): void; }>(); const deviceLoading = ref(false); // 设备加载状态 diff --git a/apps/web-ele/src/views/iot/rule/scene/form/selectors/operator-selector.vue b/apps/web-ele/src/views/iot/rule/scene/form/selectors/operator-selector.vue index 05239aeff..cc230e849 100644 --- a/apps/web-ele/src/views/iot/rule/scene/form/selectors/operator-selector.vue +++ b/apps/web-ele/src/views/iot/rule/scene/form/selectors/operator-selector.vue @@ -19,8 +19,7 @@ const props = defineProps<{ }>(); const emit = defineEmits<{ - (e: 'update:modelValue', value: string): void; - (e: 'change', value: string): void; + (e: 'change' | 'update:modelValue', value: string): void; }>(); const localValue = useVModel(props, 'modelValue', emit); diff --git a/apps/web-ele/src/views/iot/rule/scene/form/selectors/product-selector.vue b/apps/web-ele/src/views/iot/rule/scene/form/selectors/product-selector.vue index 3d89cd191..e1959d807 100644 --- a/apps/web-ele/src/views/iot/rule/scene/form/selectors/product-selector.vue +++ b/apps/web-ele/src/views/iot/rule/scene/form/selectors/product-selector.vue @@ -17,8 +17,7 @@ defineProps<{ }>(); const emit = defineEmits<{ - (e: 'update:modelValue', value?: number): void; - (e: 'change', value?: number): void; + (e: 'change' | 'update:modelValue', value?: number): void; }>(); const productLoading = ref(false); // 产品加载状态 diff --git a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/component-container.vue b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/component-container.vue index a0321879d..56c0e7307 100644 --- a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/component-container.vue +++ b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/component-container.vue @@ -42,8 +42,7 @@ const props = defineProps({ const emits = defineEmits<{ (e: 'move', direction: number): void; - (e: 'copy'): void; - (e: 'delete'): void; + (e: 'copy' | 'delete'): void; }>(); type DiyComponentWithStyle = DiyComponent & { diff --git a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/product-list/index.vue b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/product-list/index.vue index 05ec210ac..14e4bd2b2 100644 --- a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/product-list/index.vue +++ b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/product-list/index.vue @@ -21,9 +21,10 @@ const spuList = ref([]); watch( () => props.property.spuIds, async () => { - spuList.value = props.property.spuIds.length > 0 - ? await getSpuDetailList(props.property.spuIds) - : []; + spuList.value = + props.property.spuIds.length > 0 + ? await getSpuDetailList(props.property.spuIds) + : []; }, { immediate: true, diff --git a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue index 45126db6d..cbebe8ee9 100644 --- a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue +++ b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue @@ -27,14 +27,15 @@ import RewardRule from './reward-rule.vue'; const emit = defineEmits(['success']); -const createDefaultFormData = (): Partial => ({ - conditionType: PromotionConditionTypeEnum.PRICE.type, - productScope: PromotionProductScopeEnum.ALL.scope, - productScopeValues: [], - productCategoryIds: [], - productSpuIds: [], - rules: [], -}); +const createDefaultFormData = + (): Partial => ({ + conditionType: PromotionConditionTypeEnum.PRICE.type, + productScope: PromotionProductScopeEnum.ALL.scope, + productScopeValues: [], + productCategoryIds: [], + productSpuIds: [], + rules: [], + }); const formData = ref>( createDefaultFormData(), diff --git a/apps/web-ele/src/views/mes/wm/itemreceipt/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/itemreceipt/modules/line-list.vue index 4228cb093..1c79a016b 100644 --- a/apps/web-ele/src/views/mes/wm/itemreceipt/modules/line-list.vue +++ b/apps/web-ele/src/views/mes/wm/itemreceipt/modules/line-list.vue @@ -53,7 +53,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-list.vue index 16d228267..3edd198a7 100644 --- a/apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-list.vue +++ b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-list.vue @@ -51,7 +51,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-list.vue index 8112c25f6..5f9d310c4 100644 --- a/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-list.vue +++ b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-list.vue @@ -52,7 +52,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-ele/src/views/mes/wm/productissue/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/productissue/modules/line-list.vue index 81f63f2b4..7f08e1a1a 100644 --- a/apps/web-ele/src/views/mes/wm/productissue/modules/line-list.vue +++ b/apps/web-ele/src/views/mes/wm/productissue/modules/line-list.vue @@ -51,7 +51,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-ele/src/views/mes/wm/productreceipt/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/productreceipt/modules/line-list.vue index 014c211a0..2ee341c57 100644 --- a/apps/web-ele/src/views/mes/wm/productreceipt/modules/line-list.vue +++ b/apps/web-ele/src/views/mes/wm/productreceipt/modules/line-list.vue @@ -54,7 +54,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-ele/src/views/mes/wm/productsales/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/productsales/modules/line-list.vue index 1a4889c70..dff0ffbde 100644 --- a/apps/web-ele/src/views/mes/wm/productsales/modules/line-list.vue +++ b/apps/web-ele/src/views/mes/wm/productsales/modules/line-list.vue @@ -52,7 +52,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-ele/src/views/mes/wm/returnissue/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/returnissue/modules/line-list.vue index d0a0b1629..d629b4837 100644 --- a/apps/web-ele/src/views/mes/wm/returnissue/modules/line-list.vue +++ b/apps/web-ele/src/views/mes/wm/returnissue/modules/line-list.vue @@ -54,7 +54,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-ele/src/views/mes/wm/returnsales/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/returnsales/modules/line-list.vue index b88431c5b..62ac8264b 100644 --- a/apps/web-ele/src/views/mes/wm/returnsales/modules/line-list.vue +++ b/apps/web-ele/src/views/mes/wm/returnsales/modules/line-list.vue @@ -54,7 +54,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-ele/src/views/mes/wm/returnvendor/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/returnvendor/modules/line-list.vue index 5b8d25115..0d4c5cefa 100644 --- a/apps/web-ele/src/views/mes/wm/returnvendor/modules/line-list.vue +++ b/apps/web-ele/src/views/mes/wm/returnvendor/modules/line-list.vue @@ -53,7 +53,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-ele/src/views/mes/wm/transfer/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/transfer/modules/line-list.vue index a70a31f4b..c186b014a 100644 --- a/apps/web-ele/src/views/mes/wm/transfer/modules/line-list.vue +++ b/apps/web-ele/src/views/mes/wm/transfer/modules/line-list.vue @@ -51,7 +51,8 @@ const [DetailFormModal, detailFormModalApi] = useVbenModal({ /** 刷新表格 */ function handleRefresh() { for (const id of Object.keys(detailMap)) { - delete detailMap[Number(id)]; + const key = Number(id); + delete detailMap.key; } gridApi.query(); } diff --git a/apps/web-ele/src/views/mp/components/wx-reply/tab-text.vue b/apps/web-ele/src/views/mp/components/wx-reply/tab-text.vue index 790f7fabd..e75319cb5 100644 --- a/apps/web-ele/src/views/mp/components/wx-reply/tab-text.vue +++ b/apps/web-ele/src/views/mp/components/wx-reply/tab-text.vue @@ -8,8 +8,7 @@ const props = defineProps<{ }>(); const emit = defineEmits<{ - (e: 'update:modelValue', v: null | string): void; - (e: 'input', v: null | string): void; + (e: 'input' | 'update:modelValue', v: null | string): void; }>(); const content = computed({ diff --git a/apps/web-ele/src/views/mp/material/modules/UploadFile.vue b/apps/web-ele/src/views/mp/material/modules/UploadFile.vue index fe364e972..ce6806727 100644 --- a/apps/web-ele/src/views/mp/material/modules/UploadFile.vue +++ b/apps/web-ele/src/views/mp/material/modules/UploadFile.vue @@ -20,7 +20,7 @@ import { const props = defineProps<{ type: UploadType }>(); const emit = defineEmits<{ - uploaded: [v: void]; + uploaded: [v: Promise]; }>(); const accountId = inject('accountId'); diff --git a/apps/web-ele/src/views/mp/material/modules/UploadVideo.vue b/apps/web-ele/src/views/mp/material/modules/UploadVideo.vue index cbf187e5a..421bd4cf8 100644 --- a/apps/web-ele/src/views/mp/material/modules/UploadVideo.vue +++ b/apps/web-ele/src/views/mp/material/modules/UploadVideo.vue @@ -31,7 +31,7 @@ withDefaults( const emit = defineEmits<{ 'update:open': [v: boolean]; - uploaded: [v: void]; + uploaded: [v: Promise]; }>(); const accountId = inject('accountId'); diff --git a/apps/web-ele/src/views/mp/menu/modules/editor.vue b/apps/web-ele/src/views/mp/menu/modules/editor.vue index 103b2dea4..c8777a614 100644 --- a/apps/web-ele/src/views/mp/menu/modules/editor.vue +++ b/apps/web-ele/src/views/mp/menu/modules/editor.vue @@ -25,7 +25,7 @@ const props = defineProps<{ }>(); const emit = defineEmits<{ - (e: 'delete', v: void): void; + (e: 'delete', v: Promise): void; (e: 'update:modelValue', v: any): void; }>(); diff --git a/apps/web-ele/src/views/system/menu/data.ts b/apps/web-ele/src/views/system/menu/data.ts index 9300d1695..67c0ce56a 100644 --- a/apps/web-ele/src/views/system/menu/data.ts +++ b/apps/web-ele/src/views/system/menu/data.ts @@ -174,7 +174,7 @@ export function useFormSchema(): VbenFormSchema[] { }; }; const results = queryString - ? options.filter(createFilter(queryString)) + ? options.filter(() => createFilter(queryString)) : options; cb(results); }, diff --git a/apps/web-ele/src/views/system/user/components/select.vue b/apps/web-ele/src/views/system/user/components/select.vue index 53773adca..1edc21160 100644 --- a/apps/web-ele/src/views/system/user/components/select.vue +++ b/apps/web-ele/src/views/system/user/components/select.vue @@ -85,7 +85,10 @@ async function resolveItemsById(value: null | number | number[] | undefined) { .filter((item): item is SystemUserApi.User => !!item); } -watch(() => props.modelValue, resolveItemsById, { deep: true, immediate: true }); +watch(() => props.modelValue, resolveItemsById, { + deep: true, + immediate: true, +}); /** 清空已选用户 */ function clearSelected() { @@ -147,7 +150,11 @@ function handleSelected(rows: SystemUserApi.User[]) { @mouseenter="hovering = true" @mouseleave="hovering = false" > - +