review:【antd/ele】【mall】营销模块的迁移

This commit is contained in:
YunaiV
2025-12-21 20:50:27 +08:00
parent a3f282cba3
commit 3ea5510a21
15 changed files with 23 additions and 23 deletions

View File

@@ -3,9 +3,7 @@ import 'bpmn-js/dist/assets/diagram-js.css';
import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css';
import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css';
import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css';
// TODO @puhui999样式问题设计器那位置不太对
export { default as MyProcessDesigner } from './designer';
// TODO @puhui999流程发起时预览相关的需要使用
export { default as MyProcessViewer } from './designer/index2';
export { default as MyProcessPenal } from './penal';

View File

@@ -133,7 +133,7 @@ watch(
<Image
v-if="row.picUrl"
:src="row.picUrl"
class="h-[30px] w-[30px] cursor-pointer"
class="!h-[30px] !w-[30px] cursor-pointer"
:preview="true"
/>
</template>

View File

@@ -217,6 +217,7 @@ export function useFormSchema(): VbenFormSchema[] {
},
rules: 'required',
},
// TODO @puhui9991新增时一直报“请输入优惠设置”2修改老数据出现报“请求参数类型错误:50.00”;
{
fieldName: 'rules',
label: '优惠设置',

View File

@@ -61,7 +61,6 @@ const [Modal, modalApi] = useVbenModal({
// 提交表单
try {
const values = await formApi.getValues();
// 合并表单值和 formData含 id、productSpuIds、productCategoryIds 等)
const data = { ...formData.value, ...values };
if (data.startAndEndTime && Array.isArray(data.startAndEndTime)) {
data.startTime = data.startAndEndTime[0];
@@ -74,7 +73,6 @@ const [Modal, modalApi] = useVbenModal({
item.limit = convertToInteger(item.limit || 0);
}
});
// productScopeValues 已通过 data.ts 中的 dependencies.trigger 自动同步到表单值中
await (data.id
? updateRewardActivity(data as MallRewardActivityApi.RewardActivity)
: createRewardActivity(data as MallRewardActivityApi.RewardActivity));
@@ -99,7 +97,6 @@ const [Modal, modalApi] = useVbenModal({
modalApi.lock();
try {
const result = await getReward(data.id);
// antd RangePicker 需要 dayjs 对象
result.startAndEndTime = [
result.startTime ? dayjs(result.startTime) : undefined,
result.endTime ? dayjs(result.endTime) : undefined,