diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index 77aabdbc6..c2237dda6 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -55,7 +55,6 @@ "diagram-js": "catalog:", "fast-xml-parser": "catalog:", "highlight.js": "catalog:", - "min-dash": "catalog:", "pinia": "catalog:", "steady-xml": "catalog:", "tinymce": "catalog:", diff --git a/apps/web-antd/src/adapter/vxe-table.ts b/apps/web-antd/src/adapter/vxe-table.ts index 7fe887645..200ea61d5 100644 --- a/apps/web-antd/src/adapter/vxe-table.ts +++ b/apps/web-antd/src/adapter/vxe-table.ts @@ -350,6 +350,18 @@ setupVbenVxeTable({ return `${erpNumberFormatter(fenToYuan(cellValue), digits)}`; }, }); + + // add by 星语:文件大小格式化 + vxeUI.formats.add('formatFileSize', { + tableCellFormatMethod({ cellValue }, digits = 2) { + if (!cellValue) return '0 B'; + const unitArr = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; + const index = Math.floor(Math.log(cellValue) / Math.log(1024)); + const size = cellValue / 1024 ** index; + const formattedSize = size.toFixed(digits); + return `${formattedSize} ${unitArr[index]}`; + }, + }); }, useVbenForm, }); diff --git a/apps/web-antd/src/api/mall/promotion/coupon/couponTemplate.ts b/apps/web-antd/src/api/mall/promotion/coupon/couponTemplate.ts index 688e1db5b..d5453ed79 100644 --- a/apps/web-antd/src/api/mall/promotion/coupon/couponTemplate.ts +++ b/apps/web-antd/src/api/mall/promotion/coupon/couponTemplate.ts @@ -20,18 +20,12 @@ export namespace MallCouponTemplateApi { fixedStartTerm: number; // 领取日期-开始天数 fixedEndTerm: number; // 领取日期-结束天数 discountType: number; // 优惠类型 - discountPercent: number; // 折扣百分比 + discountPercent?: number; // 折扣百分比 discountPrice: number; // 优惠金额 - discountLimitPrice: number; // 折扣上限 + discountLimitPrice?: number; // 折扣上限 takeCount: number; // 已领取数量 useCount: number; // 已使用数量 } - - /** 优惠券模板状态更新 */ - export interface StatusUpdate { - id: number; // 模板编号 - status: 0 | 1; // 状态 - } } /** 创建优惠劵模板 */ @@ -49,9 +43,11 @@ export function updateCouponTemplate( } /** 更新优惠劵模板的状态 */ -export function updateCouponTemplateStatus(id: number, status: 0 | 1) { - const data: MallCouponTemplateApi.StatusUpdate = { id, status }; - return requestClient.put('/promotion/coupon-template/update-status', data); +export function updateCouponTemplateStatus(id: number, status: number) { + return requestClient.put('/promotion/coupon-template/update-status', { + id, + status, + }); } /** 删除优惠劵模板 */ @@ -80,11 +76,3 @@ export function getCouponTemplateList(ids: number[]) { `/promotion/coupon-template/list?ids=${ids}`, ); } - -/** 导出优惠劵模板 Excel */ -export function exportCouponTemplateExcel(params: PageParam) { - return requestClient.get('/promotion/coupon-template/export-excel', { - params, - responseType: 'blob', - }); -} diff --git a/apps/web-antd/src/api/mall/trade/afterSale/index.ts b/apps/web-antd/src/api/mall/trade/afterSale/index.ts index 95326af01..74c684857 100644 --- a/apps/web-antd/src/api/mall/trade/afterSale/index.ts +++ b/apps/web-antd/src/api/mall/trade/afterSale/index.ts @@ -1,5 +1,7 @@ import type { PageParam, PageResult } from '@vben/request'; +import type { MallOrderApi } from '#/api/mall/trade/order'; + import { requestClient } from '#/api/request'; export namespace MallAfterSaleApi { @@ -75,6 +77,9 @@ export namespace MallAfterSaleApi { receiveTime?: Date; /** 收货备注 */ receiveReason?: string; + order?: MallOrderApi.Order; // 关联订单 + orderItem?: MallOrderApi.OrderItem; // 关联订单项 + logs?: any[]; // 关联售后日志 } /** 拒绝售后请求 */ @@ -102,26 +107,26 @@ export function getAfterSale(id: number) { } /** 同意售后 */ -export function agree(id: number) { +export function agreeAfterSale(id: number) { return requestClient.put(`/trade/after-sale/agree?id=${id}`); } /** 拒绝售后 */ -export function disagree(data: MallAfterSaleApi.DisagreeRequest) { +export function disagreeAfterSale(data: MallAfterSaleApi.DisagreeRequest) { return requestClient.put('/trade/after-sale/disagree', data); } /** 确认收货 */ -export function receive(id: number) { +export function receiveAfterSale(id: number) { return requestClient.put(`/trade/after-sale/receive?id=${id}`); } /** 拒绝收货 */ -export function refuse(id: number) { +export function refuseAfterSale(id: number) { return requestClient.put(`/trade/after-sale/refuse?id=${id}`); } /** 确认退款 */ -export function refund(id: number) { +export function refundAfterSale(id: number) { return requestClient.put(`/trade/after-sale/refund?id=${id}`); } diff --git a/apps/web-antd/src/api/mall/trade/order/index.ts b/apps/web-antd/src/api/mall/trade/order/index.ts index 6017fa5f5..c2410f9cf 100644 --- a/apps/web-antd/src/api/mall/trade/order/index.ts +++ b/apps/web-antd/src/api/mall/trade/order/index.ts @@ -6,11 +6,11 @@ export namespace MallOrderApi { /** 商品属性 */ export interface ProductProperty { /** 属性的编号 */ - propertyId?: null | number; + propertyId?: number; /** 属性的名称 */ propertyName?: string; /** 属性值的编号 */ - valueId?: null | number; + valueId?: number; /** 属性值的名称 */ valueName?: string; } @@ -18,37 +18,38 @@ export namespace MallOrderApi { /** 订单项 */ export interface OrderItem { /** 编号 */ - id?: null | number; + id?: number; /** 用户编号 */ - userId?: null | number; + userId?: number; /** 订单编号 */ - orderId?: null | number; + orderId?: number; /** 商品 SPU 编号 */ - spuId?: null | number; + spuId?: number; /** 商品 SPU 名称 */ spuName?: string; /** 商品 SKU 编号 */ - skuId?: null | number; + skuId?: number; /** 商品图片 */ picUrl?: string; /** 购买数量 */ - count?: null | number; + count?: number; /** 商品原价(总) */ - originalPrice?: null | number; + originalPrice?: number; /** 商品原价(单) */ - originalUnitPrice?: null | number; + originalUnitPrice?: number; /** 商品优惠(总) */ - discountPrice?: null | number; + discountPrice?: number; /** 商品实付金额(总) */ - payPrice?: null | number; + payPrice?: number; /** 子订单分摊金额(总) */ - orderPartPrice?: null | number; + orderPartPrice?: number; /** 分摊后子订单实付金额(总) */ - orderDividePrice?: null | number; + orderDividePrice?: number; /** 售后状态 */ - afterSaleStatus?: null | number; + afterSaleStatus?: number; /** 属性数组 */ properties?: ProductProperty[]; + price?: number; } /** 订单日志 */ @@ -59,96 +60,98 @@ export namespace MallOrderApi { createTime?: Date; /** 用户类型 */ userType?: number; + /** 用户编号 */ + userId?: number; } /** 订单 */ export interface Order { /** 订单编号 */ - id?: null | number; + id?: number; /** 订单流水号 */ no?: string; /** 下单时间 */ - createTime?: Date | null; + createTime?: Date; /** 订单类型 */ - type?: null | number; + type?: number; /** 订单来源 */ - terminal?: null | number; + terminal?: number; /** 用户编号 */ - userId?: null | number; + userId?: number; /** 用户 IP */ userIp?: string; /** 用户备注 */ userRemark?: string; /** 订单状态 */ - status?: null | number; + status?: number; /** 购买的商品数量 */ - productCount?: null | number; + productCount?: number; /** 订单完成时间 */ - finishTime?: Date | null; + finishTime?: Date; /** 订单取消时间 */ - cancelTime?: Date | null; + cancelTime?: Date; /** 取消类型 */ - cancelType?: null | number; + cancelType?: number; /** 商家备注 */ remark?: string; /** 支付订单编号 */ - payOrderId?: null | number; + payOrderId?: number; /** 是否已支付 */ payStatus?: boolean; /** 付款时间 */ - payTime?: Date | null; + payTime?: Date; /** 支付渠道 */ payChannelCode?: string; /** 商品原价(总) */ - totalPrice?: null | number; + totalPrice?: number; /** 订单优惠(总) */ - discountPrice?: null | number; + discountPrice?: number; /** 运费金额 */ - deliveryPrice?: null | number; + deliveryPrice?: number; /** 订单调价(总) */ - adjustPrice?: null | number; + adjustPrice?: number; /** 应付金额(总) */ - payPrice?: null | number; + payPrice?: number; /** 发货方式 */ - deliveryType?: null | number; + deliveryType?: number; /** 自提门店编号 */ pickUpStoreId?: number; /** 自提核销码 */ pickUpVerifyCode?: string; /** 配送模板编号 */ - deliveryTemplateId?: null | number; + deliveryTemplateId?: number; /** 发货物流公司编号 */ - logisticsId?: null | number; + logisticsId?: number; /** 发货物流单号 */ logisticsNo?: string; /** 发货时间 */ - deliveryTime?: Date | null; + deliveryTime?: Date; /** 收货时间 */ - receiveTime?: Date | null; + receiveTime?: Date; /** 收件人名称 */ receiverName?: string; /** 收件人手机 */ receiverMobile?: string; /** 收件人邮编 */ - receiverPostCode?: null | number; + receiverPostCode?: number; /** 收件人地区编号 */ - receiverAreaId?: null | number; + receiverAreaId?: number; /** 收件人地区名字 */ receiverAreaName?: string; /** 收件人详细地址 */ receiverDetailAddress?: string; /** 售后状态 */ - afterSaleStatus?: null | number; + afterSaleStatus?: number; /** 退款金额 */ - refundPrice?: null | number; + refundPrice?: number; /** 优惠劵编号 */ - couponId?: null | number; + couponId?: number; /** 优惠劵减免金额 */ - couponPrice?: null | number; + couponPrice?: number; /** 积分抵扣的金额 */ - pointPrice?: null | number; + pointPrice?: number; /** VIP 减免金额 */ - vipPrice?: null | number; + vipPrice?: number; /** 订单项列表 */ items?: OrderItem[]; /** 下单用户信息 */ @@ -156,7 +159,7 @@ export namespace MallOrderApi { /** 用户头像 */ avatar?: string; /** 用户编号 */ - id?: null | number; + id?: number; /** 用户昵称 */ nickname?: string; }; @@ -165,7 +168,7 @@ export namespace MallOrderApi { /** 用户头像 */ avatar?: string; /** 用户编号 */ - id?: null | number; + id?: number; /** 用户昵称 */ nickname?: string; }; @@ -192,7 +195,7 @@ export namespace MallOrderApi { /** 发货方式 */ expressType: string; /** 物流公司编号 */ - logisticsId: null | number; + logisticsId: number; /** 物流编号 */ logisticsNo: string; } @@ -239,7 +242,7 @@ export function getOrderPage(params: PageParam) { } /** 查询交易订单统计 */ -export function getOrderSummary(params: PageParam) { +export function getOrderSummary(params: any) { return requestClient.get('/trade/order/summary', { params, }); @@ -284,7 +287,7 @@ export function pickUpOrder(id: number) { /** 订单核销 */ export function pickUpOrderByVerifyCode(pickUpVerifyCode: string) { - return requestClient.put('/trade/order/pick-up-by-verify-code', { + return requestClient.put('/trade/order/pick-up-by-verify-code', undefined, { params: { pickUpVerifyCode }, }); } diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js index dbc0b25a5..638317fb8 100644 --- a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js +++ b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js @@ -3,7 +3,6 @@ import { isAny } from 'bpmn-js/lib/features/modeling/util/ModelingUtil'; import { isEventSubProcess, isExpanded } from 'bpmn-js/lib/util/DiUtil'; import { is } from 'bpmn-js/lib/util/ModelUtil'; import { hasPrimaryModifier } from 'diagram-js/lib/util/Mouse'; -import { assign, forEach, isArray } from 'min-dash'; /** * A provider for BPMN 2.0 elements context pad @@ -139,7 +138,9 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { } function appendStart(event, element) { - const shape = elementFactory.createShape(assign({ type }, options)); + const shape = elementFactory.createShape( + Object.assign({ type }, options), + ); create.start(event, shape, { source: element, }); @@ -147,7 +148,9 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { const append = autoPlace ? function (event, element) { - const shape = elementFactory.createShape(assign({ type }, options)); + const shape = elementFactory.createShape( + Object.assign({ type }, options), + ); autoPlace.append(element, shape); } @@ -181,7 +184,7 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { ) { const childLanes = getChildLanes(element); - assign(actions, { + Object.assign(actions, { 'lane-insert-above': { group: 'lane-insert-above', className: 'bpmn-icon-lane-insert-above', @@ -196,7 +199,7 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { if (childLanes.length < 2) { if (element.height >= 120) { - assign(actions, { + Object.assign(actions, { 'lane-divide-two': { group: 'lane-divide', className: 'bpmn-icon-lane-divide-two', @@ -209,7 +212,7 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { } if (element.height >= 180) { - assign(actions, { + Object.assign(actions, { 'lane-divide-three': { group: 'lane-divide', className: 'bpmn-icon-lane-divide-three', @@ -222,7 +225,7 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { } } - assign(actions, { + Object.assign(actions, { 'lane-insert-below': { group: 'lane-insert-below', className: 'bpmn-icon-lane-insert-below', @@ -238,7 +241,7 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { if (is(businessObject, 'bpmn:FlowNode')) { if (is(businessObject, 'bpmn:EventBasedGateway')) { - assign(actions, { + Object.assign(actions, { 'append.receive-task': appendAction( 'bpmn:ReceiveTask', 'bpmn-icon-receive-task', @@ -276,7 +279,7 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { 'bpmn:CompensateEventDefinition', ) ) { - assign(actions, { + Object.assign(actions, { 'append.compensation-activity': appendAction( 'bpmn:Task', 'bpmn-icon-task', @@ -296,7 +299,7 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { ) && !isEventSubProcess(businessObject) ) { - assign(actions, { + Object.assign(actions, { 'append.end-event': appendAction( 'bpmn:EndEvent', 'bpmn-icon-end-event-none', @@ -323,14 +326,14 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { if (!popupMenu.isEmpty(element, 'bpmn-replace')) { // Replace menu entry - assign(actions, { + Object.assign(actions, { replace: { group: 'edit', className: 'bpmn-icon-screw-wrench', title: '修改类型', action: { click(event, element) { - const position = assign(getReplaceMenuPosition(element), { + const position = Object.assign(getReplaceMenuPosition(element), { cursor: { x: event.x, y: event.y }, }); @@ -349,7 +352,7 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { 'bpmn:DataStoreReference', ]) ) { - assign(actions, { + Object.assign(actions, { 'append.text-annotation': appendAction( 'bpmn:TextAnnotation', 'bpmn-icon-text-annotation', @@ -377,7 +380,7 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { 'bpmn:DataStoreReference', ]) ) { - assign(actions, { + Object.assign(actions, { connect: { group: 'connect', className: 'bpmn-icon-connection-multi', @@ -391,7 +394,7 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { } if (is(businessObject, 'bpmn:Group')) { - assign(actions, { + Object.assign(actions, { 'append.text-annotation': appendAction( 'bpmn:TextAnnotation', 'bpmn-icon-text-annotation', @@ -402,13 +405,13 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { // delete element entry, only show if allowed by rules let deleteAllowed = rules.allowed('elements.delete', { elements: [element] }); - if (isArray(deleteAllowed)) { + if (Array.isArray(deleteAllowed)) { // was the element returned as a deletion candidate? deleteAllowed = deleteAllowed[0] === element; } if (deleteAllowed) { - assign(actions, { + Object.assign(actions, { delete: { group: 'edit', className: 'bpmn-icon-trash', @@ -430,7 +433,7 @@ function isEventType(eventBo, type, definition) { let isDefinition = false; const definitions = eventBo.eventDefinitions || []; - forEach(definitions, (def) => { + definitions.forEach((def) => { if (def.$type === definition) { isDefinition = true; } diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/activiti/activitiExtension.js b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/activiti/activitiExtension.js index 1f04da8f9..54d506019 100644 --- a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/activiti/activitiExtension.js +++ b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/activiti/activitiExtension.js @@ -1,10 +1,3 @@ -'use strict'; - -import { some } from 'min-dash'; - -// const some = require('min-dash').some -// const some = some - const ALLOWED_TYPES = { FailedJobRetryTimeCycle: [ 'bpmn:StartEvent', @@ -25,20 +18,20 @@ function is(element, type) { } function exists(element) { - return element && element.length; + return element && element.length > 0; } function includesType(collection, type) { return ( exists(collection) && - some(collection, (element) => { + collection.some((element) => { return is(element, type); }) ); } function anyType(element, types) { - return some(types, (type) => { + return types.some((type) => { return is(element, type); }); } diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/camunda/extension.js b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/camunda/extension.js index 0b09c782c..3956be680 100644 --- a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/camunda/extension.js +++ b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/camunda/extension.js @@ -1,18 +1,9 @@ -'use strict'; - -import { isFunction, isObject, some } from 'min-dash'; - -// const isFunction = isFunction, -// isObject = isObject, -// some = some -// const isFunction = require('min-dash').isFunction, -// isObject = require('min-dash').isObject, -// some = require('min-dash').some +import { isFunction, isObject } from '@vben/utils'; const WILDCARD = '*'; function CamundaModdleExtension(eventBus) { - // eslint-disable-next-line @typescript-eslint/no-this-alias + // eslint-disable-next-line unicorn/no-this-assignment, @typescript-eslint/no-this-alias const self = this; eventBus.on('moddleCopy.canCopyProperty', (context) => { @@ -122,7 +113,7 @@ function is(element, type) { } function isAny(element, types) { - return some(types, (t) => { + return types.some((t) => { return is(element, t); }); } @@ -155,7 +146,7 @@ function isAllowedInParent(property, parent) { } // (2) check wether property has parent of allowed type - return some(allowedIn, (type) => { + return allowedIn.some((type) => { return getParent(parent, type); }); } diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/flowable/flowableExtension.js b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/flowable/flowableExtension.js index a891727c7..25fa1cc8e 100644 --- a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/flowable/flowableExtension.js +++ b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/flowable/flowableExtension.js @@ -1,10 +1,3 @@ -'use strict'; - -import { some } from 'min-dash'; - -// const some = some -// const some = require('min-dash').some - const ALLOWED_TYPES = { FailedJobRetryTimeCycle: [ 'bpmn:StartEvent', @@ -25,20 +18,20 @@ function is(element, type) { } function exists(element) { - return element && element.length; + return element && element.length > 0; } function includesType(collection, type) { return ( exists(collection) && - some(collection, (element) => { + collection.some((element) => { return is(element, type); }) ); } function anyType(element, types) { - return some(types, (type) => { + return types.some((type) => { return is(element, type); }); } diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/palette/CustomPalette.js b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/palette/CustomPalette.js index 0299c5acb..75b491ccb 100644 --- a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/palette/CustomPalette.js +++ b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/palette/CustomPalette.js @@ -1,5 +1,4 @@ import PaletteProvider from 'bpmn-js/lib/features/palette/PaletteProvider'; -import { assign } from 'min-dash'; export default function CustomPalette( palette, @@ -41,7 +40,9 @@ F.prototype.getPaletteEntries = function () { function createAction(type, group, className, title, options) { function createListener(event) { - const shape = elementFactory.createShape(assign({ type }, options)); + const shape = Object.assign( + elementFactory.createShape({ type }, options), + ); if (options) { shape.businessObject.di.isExpanded = options.isExpanded; @@ -89,7 +90,7 @@ F.prototype.getPaletteEntries = function () { create.start(event, elementFactory.createParticipantShape()); } - assign(actions, { + Object.assign(actions, { 'hand-tool': { group: 'tools', className: 'bpmn-icon-hand-tool', diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/palette/paletteProvider.js b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/palette/paletteProvider.js index 8a022542b..70a27a9a6 100644 --- a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/palette/paletteProvider.js +++ b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/palette/paletteProvider.js @@ -1,5 +1,3 @@ -import { assign } from 'min-dash'; - /** * A palette provider for BPMN 2.0 elements. */ @@ -48,7 +46,9 @@ PaletteProvider.prototype.getPaletteEntries = function () { function createAction(type, group, className, title, options) { function createListener(event) { - const shape = elementFactory.createShape(assign({ type }, options)); + const shape = elementFactory.createShape( + Object.assign({ type }, options), + ); if (options) { shape.businessObject.di.isExpanded = options.isExpanded; @@ -96,7 +96,7 @@ PaletteProvider.prototype.getPaletteEntries = function () { create.start(event, elementFactory.createParticipantShape()); } - assign(actions, { + Object.assign(actions, { 'hand-tool': { group: 'tools', className: 'bpmn-icon-hand-tool', diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/palette/ProcessPalette.vue b/apps/web-antd/src/components/bpmn-process-designer/package/palette/ProcessPalette.vue index ab494d47a..1bb79de35 100644 --- a/apps/web-antd/src/components/bpmn-process-designer/package/palette/ProcessPalette.vue +++ b/apps/web-antd/src/components/bpmn-process-designer/package/palette/ProcessPalette.vue @@ -1,6 +1,5 @@ -

{{ formatDateTime(log.createTime) }}

-

+

{{ formatDateTime(log.createTime) }}

+

{{ log.userName }} diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/child-process-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/child-process-node.vue index 1a8fe72ed..09d0d2dd4 100644 --- a/apps/web-antd/src/components/simple-process-design/components/nodes/child-process-node.vue +++ b/apps/web-antd/src/components/simple-process-design/components/nodes/child-process-node.vue @@ -40,17 +40,17 @@ const { showInput, changeNodeName, clickTitle, inputRef } = useNodeName2( const nodeConfigRef = ref(); /** 打开节点配置 */ -const openNodeConfig = () => { +function openNodeConfig() { if (readonly) { return; } nodeConfigRef.value.showChildProcessNodeConfig(currentNode.value); -}; +} /** 删除节点。更新当前节点为孩子节点 */ -const deleteNode = () => { +function deleteNode() { emits('update:flowNode', currentNode.value.childNode); -}; +} - - diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/exclusive-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/exclusive-node.vue index dbed9f783..bc53b0e0d 100644 --- a/apps/web-antd/src/components/simple-process-design/components/nodes/exclusive-node.vue +++ b/apps/web-antd/src/components/simple-process-design/components/nodes/exclusive-node.vue @@ -33,7 +33,7 @@ const emits = defineEmits<{ findParentNode: [nodeList: SimpleFlowNode[], nodeType: number]; recursiveFindParentNode: [ nodeList: SimpleFlowNode[], - curentNode: SimpleFlowNode, + currentNode: SimpleFlowNode, nodeType: number, ]; 'update:modelValue': [node: SimpleFlowNode | undefined]; diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/inclusive-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/inclusive-node.vue index 50e2d1a09..5bd490df4 100644 --- a/apps/web-antd/src/components/simple-process-design/components/nodes/inclusive-node.vue +++ b/apps/web-antd/src/components/simple-process-design/components/nodes/inclusive-node.vue @@ -38,7 +38,7 @@ const emits = defineEmits<{ findParentNode: [nodeList: SimpleFlowNode[], nodeType: number]; recursiveFindParentNode: [ nodeList: SimpleFlowNode[], - curentNode: SimpleFlowNode, + currentNode: SimpleFlowNode, nodeType: number, ]; 'update:modelValue': [node: SimpleFlowNode | undefined]; diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/modules/process-instance-data.ts b/apps/web-antd/src/components/simple-process-design/components/nodes/modules/process-instance-data.ts index e8664cdf5..a9f2a06bb 100644 --- a/apps/web-antd/src/components/simple-process-design/components/nodes/modules/process-instance-data.ts +++ b/apps/web-antd/src/components/simple-process-design/components/nodes/modules/process-instance-data.ts @@ -1,4 +1,4 @@ -import type { VxeTableGridOptions } from '@vben/plugins/vxe-table'; +import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import { DICT_TYPE } from '@vben/constants'; diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/modules/process-instance-modal.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/modules/process-instance-modal.vue index e9ddbf34b..dec77d854 100644 --- a/apps/web-antd/src/components/simple-process-design/components/nodes/modules/process-instance-modal.vue +++ b/apps/web-antd/src/components/simple-process-design/components/nodes/modules/process-instance-modal.vue @@ -1,6 +1,7 @@ diff --git a/apps/web-antd/src/views/bpm/model/form/index.vue b/apps/web-antd/src/views/bpm/model/form/index.vue index 5e0af4cac..786f2bfde 100644 --- a/apps/web-antd/src/views/bpm/model/form/index.vue +++ b/apps/web-antd/src/views/bpm/model/form/index.vue @@ -15,7 +15,7 @@ import { BpmModelType, } from '@vben/constants'; import { useTabs } from '@vben/hooks'; -import { ArrowLeft } from '@vben/icons'; +import { IconifyIcon } from '@vben/icons'; import { useUserStore } from '@vben/stores'; import { Button, Card, message } from 'ant-design-vue'; @@ -419,7 +419,8 @@ onBeforeUnmount(() => { >

- @@ -455,9 +456,9 @@ onBeforeUnmount(() => { > {{ index + 1 }}
- {{ - step.title - }} + + {{ step.title }} + diff --git a/apps/web-antd/src/views/bpm/model/form/modules/basic-info.vue b/apps/web-antd/src/views/bpm/model/form/modules/basic-info.vue index dde95e5e6..5afadd00a 100644 --- a/apps/web-antd/src/views/bpm/model/form/modules/basic-info.vue +++ b/apps/web-antd/src/views/bpm/model/form/modules/basic-info.vue @@ -78,7 +78,7 @@ const rules: Record = { callback(); return; } - if (!/^[a-z_][\-\w.$]*$/i.test(value)) { + if (!/^[a-z_][-\w.$]*$/i.test(value)) { callback( new Error( '只能包含字母、数字、下划线、连字符和点号,且必须以字母或下划线开头', @@ -460,7 +460,6 @@ defineExpose({ validate }); class="w-3/5" v-model:value="selectedUsers" :multiple="true" - title="选择用户" @confirm="handleUserSelectConfirm" @closed="handleUserSelectClosed" @cancel="handleUserSelectCancel" @@ -468,7 +467,6 @@ defineExpose({ validate }); diff --git a/apps/web-antd/src/views/bpm/model/form/modules/extra-setting.vue b/apps/web-antd/src/views/bpm/model/form/modules/extra-setting.vue index fdcdf7098..0af97f9dc 100644 --- a/apps/web-antd/src/views/bpm/model/form/modules/extra-setting.vue +++ b/apps/web-antd/src/views/bpm/model/form/modules/extra-setting.vue @@ -6,7 +6,7 @@ import { BpmModelFormType, ProcessVariableEnum, } from '@vben/constants'; -import { CircleHelp } from '@vben/icons'; +import { IconifyIcon } from '@vben/icons'; import { Checkbox, @@ -369,7 +369,10 @@ defineExpose({ initData, validate }); title="输入字符 '{' 即可插入表单字段" placement="top" > - + diff --git a/apps/web-antd/src/views/bpm/model/form/modules/form-design.vue b/apps/web-antd/src/views/bpm/model/form/modules/form-design.vue index 47330c9ef..90d80ff2d 100644 --- a/apps/web-antd/src/views/bpm/model/form/modules/form-design.vue +++ b/apps/web-antd/src/views/bpm/model/form/modules/form-design.vue @@ -7,7 +7,7 @@ import { ref, watch } from 'vue'; import { BpmModelFormType, DICT_TYPE } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; -import { CircleHelp } from '@vben/icons'; +import { IconifyIcon } from '@vben/icons'; import FormCreate from '@form-create/ant-design-vue'; import { @@ -22,7 +22,7 @@ import { } from 'ant-design-vue'; import { getFormDetail } from '#/api/bpm/form'; -import { setConfAndFields2 } from '#/utils'; +import { setConfAndFields2 } from '#/components/form-create'; const props = defineProps({ formList: { @@ -138,7 +138,10 @@ defineExpose({ validate }); title="自定义表单的提交路径,使用 Vue 的路由地址, 例如说: bpm/oa/leave/create.vue" placement="top" > - + @@ -157,7 +160,10 @@ defineExpose({ validate }); title="自定义表单的查看组件地址,使用 Vue 的组件地址,例如说:bpm/oa/leave/detail.vue" placement="top" > - + diff --git a/apps/web-antd/src/views/bpm/oa/leave/index.vue b/apps/web-antd/src/views/bpm/oa/leave/index.vue index 6b0002479..17ef3b069 100644 --- a/apps/web-antd/src/views/bpm/oa/leave/index.vue +++ b/apps/web-antd/src/views/bpm/oa/leave/index.vue @@ -71,7 +71,7 @@ function handleCancel(row: BpmOALeaveApi.Leave) { try { await cancelProcessInstanceByStartUser(row.id, scope.value); message.success('取消成功'); - onRefresh(); + handleRefresh(); } catch { return false; } @@ -104,7 +104,7 @@ function handleProgress(row: BpmOALeaveApi.Leave) { } /** 刷新表格 */ -function onRefresh() { +function handleRefresh() { gridApi.query(); } diff --git a/apps/web-antd/src/views/bpm/processExpression/index.vue b/apps/web-antd/src/views/bpm/processExpression/index.vue index 2e5903591..af50ff8e4 100644 --- a/apps/web-antd/src/views/bpm/processExpression/index.vue +++ b/apps/web-antd/src/views/bpm/processExpression/index.vue @@ -22,7 +22,7 @@ const [FormModal, formModalApi] = useVbenModal({ }); /** 刷新表格 */ -function onRefresh() { +function handleRefresh() { gridApi.query(); } @@ -47,7 +47,7 @@ async function handleDelete(row: BpmProcessExpressionApi.ProcessExpression) { message.success({ content: $t('ui.actionMessage.deleteSuccess', [row.name]), }); - onRefresh(); + handleRefresh(); } finally { hideLoading(); } @@ -92,7 +92,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ /> - + - +