From 696e85cf6422c703fbba63df097320bd813d9926 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 14 七月 2026 15:40:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
vite.config.ts | 44 -
src/api/mes/pro/route/process/index.ts | 1
src/views/basicData/mdm/data.ts | 381 ++++++++++++-----------
src/views/basicData/mdm/modules/form.vue | 6
src/views/mes/process-design/route/data.ts | 478 ++++++++++++++--------------
5 files changed, 454 insertions(+), 456 deletions(-)
diff --git a/src/api/mes/pro/route/process/index.ts b/src/api/mes/pro/route/process/index.ts
index fee0ce9..f25083d 100644
--- a/src/api/mes/pro/route/process/index.ts
+++ b/src/api/mes/pro/route/process/index.ts
@@ -17,6 +17,7 @@
colorCode?: string;
keyFlag?: boolean;
checkFlag?: boolean;
+ backflushFlag?: boolean;
remark?: string;
createTime?: Date;
}
diff --git a/src/views/basicData/mdm/data.ts b/src/views/basicData/mdm/data.ts
index 910564a..f294908 100644
--- a/src/views/basicData/mdm/data.ts
+++ b/src/views/basicData/mdm/data.ts
@@ -1,155 +1,155 @@
-import type { VbenFormSchema } from '#/adapter/form';
-import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { VbenFormSchema } from "#/adapter/form";
+import type { VxeTableGridOptions } from "#/adapter/vxe-table";
-import { CommonStatusEnum, DICT_TYPE } from '#/packages/constants/src';
-import { getDictOptions } from '#/packages/effects/hooks/src';
+import { CommonStatusEnum, DICT_TYPE } from "#/packages/constants/src";
+import { getDictOptions } from "#/packages/effects/hooks/src";
import { z } from '#/adapter/form';
import { getUnitPage } from '#/api/mdm/unit';
/** 鐗╂枡绫诲瀷閫夐」 */
export const ITEM_TYPE_OPTIONS = [
- { label: '鍘熸枡', value: 1 },
- { label: '鍗婃垚鍝�', value: 2 },
- { label: '鎴愬搧', value: 3 },
- { label: '杈呮枡', value: 4 },
+ { label: "鍘熸枡", value: 1 },
+ { label: "鍗婃垚鍝�", value: 2 },
+ { label: "鎴愬搧", value: 3 },
+ { label: "杈呮枡", value: 4 },
];
/** 鐗╂枡绫诲瀷鏄犲皠 */
export const ITEM_TYPE_MAP: Record<number, string> = {
- 1: '鍘熸枡',
- 2: '鍗婃垚鍝�',
- 3: '鎴愬搧',
- 4: '杈呮枡',
+ 1: "鍘熸枡",
+ 2: "鍗婃垚鍝�",
+ 3: "鎴愬搧",
+ 4: "杈呮枡",
};
/** 鐗╂枡绫诲瀷棰滆壊鏄犲皠 */
export const ITEM_TYPE_COLOR_MAP: Record<number, string> = {
- 1: 'green',
- 2: 'orange',
- 3: 'blue',
- 4: 'purple',
+ 1: "green",
+ 2: "orange",
+ 3: "blue",
+ 4: "purple",
};
/** 鏂板/淇敼鐨勮〃鍗� */
export function useFormSchema(): VbenFormSchema[] {
return [
{
- component: 'Input',
- fieldName: 'id',
+ component: "Input",
+ fieldName: "id",
dependencies: {
- triggerFields: [''],
+ triggerFields: [""],
show: () => false,
},
},
{
- component: 'Input',
- fieldName: 'code',
- label: '鐗╂枡缂栫爜',
+ component: "Input",
+ fieldName: "code",
+ label: "鐗╂枡缂栫爜",
componentProps: {
- placeholder: '璇疯緭鍏ョ墿鏂欑紪鐮�',
+ placeholder: "璇疯緭鍏ョ墿鏂欑紪鐮�",
},
- rules: 'required',
+ rules: "required",
},
{
- component: 'Input',
- fieldName: 'name',
- label: '鐗╂枡鍚嶇О',
+ component: "Input",
+ fieldName: "name",
+ label: "鐗╂枡鍚嶇О",
componentProps: {
- placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
+ placeholder: "璇疯緭鍏ョ墿鏂欏悕绉�",
},
- rules: 'required',
+ rules: "required",
},
{
- component: 'RadioGroup',
- fieldName: 'itemType',
- label: '鐗╂枡绫诲瀷',
+ component: "RadioGroup",
+ fieldName: "itemType",
+ label: "鐗╂枡绫诲瀷",
componentProps: {
options: ITEM_TYPE_OPTIONS,
- buttonStyle: 'solid',
- optionType: 'button',
+ buttonStyle: "solid",
+ optionType: "button",
},
- rules: 'required',
+ rules: "required",
},
{
- component: 'Input',
- fieldName: 'specification',
- label: '瑙勬牸鍨嬪彿',
+ component: "Input",
+ fieldName: "specification",
+ label: "瑙勬牸鍨嬪彿",
componentProps: {
- placeholder: '璇疯緭鍏ヨ鏍煎瀷鍙�',
+ placeholder: "璇疯緭鍏ヨ鏍煎瀷鍙�",
},
},
{
- component: 'ApiSelect',
- fieldName: 'unitMeasureId',
- label: '璁￠噺鍗曚綅',
- rules: 'required',
- formItemClass: 'col-span-1',
+ component: "ApiSelect",
+ fieldName: "unitMeasureId",
+ label: "璁￠噺鍗曚綅",
+ rules: "required",
+ formItemClass: "col-span-1",
componentProps: {
- placeholder: '璇烽�夋嫨璁￠噺鍗曚綅',
+ placeholder: "璇烽�夋嫨璁￠噺鍗曚綅",
allowClear: true,
api: async () => {
const res = await getUnitPage({ pageNo: 1, pageSize: 100, status: 0 });
return res.list || [];
},
- labelField: 'name',
- valueField: 'id',
+ labelField: "name",
+ valueField: "id",
},
},
{
- component: 'ApiSelect',
- fieldName: 'unitMeasureId2',
- label: '杈呭崟浣�1',
- formItemClass: 'col-span-1',
+ component: "ApiSelect",
+ fieldName: "unitMeasureId2",
+ label: "杈呭崟浣�1",
+ formItemClass: "col-span-1",
componentProps: {
- placeholder: '璇烽�夋嫨杈呭崟浣�1',
+ placeholder: "璇烽�夋嫨杈呭崟浣�1",
allowClear: true,
api: async () => {
const res = await getUnitPage({ pageNo: 1, pageSize: 100, status: 0 });
return res.list || [];
},
- labelField: 'name',
- valueField: 'id',
+ labelField: "name",
+ valueField: "id",
},
},
{
- component: 'InputNumber',
- fieldName: 'unitMeasureRate1',
- label: '杈呭崟浣�1鎹㈢畻姣旂巼',
- formItemClass: 'col-span-1',
+ component: "InputNumber",
+ fieldName: "unitMeasureRate1",
+ label: "杈呭崟浣�1鎹㈢畻姣旂巼",
+ formItemClass: "col-span-1",
componentProps: {
- class: '!w-full',
+ class: "!w-full",
min: 0,
precision: 6,
- placeholder: '璇疯緭鍏ユ崲绠楁瘮鐜�',
+ placeholder: "璇疯緭鍏ユ崲绠楁瘮鐜�",
},
},
{
- component: 'ApiSelect',
- fieldName: 'unitMeasureId3',
- label: '杈呭崟浣�2',
- formItemClass: 'col-span-1',
+ component: "ApiSelect",
+ fieldName: "unitMeasureId3",
+ label: "杈呭崟浣�2",
+ formItemClass: "col-span-1",
componentProps: {
- placeholder: '璇烽�夋嫨杈呭崟浣�2',
+ placeholder: "璇烽�夋嫨杈呭崟浣�2",
allowClear: true,
api: async () => {
const res = await getUnitPage({ pageNo: 1, pageSize: 100, status: 0 });
return res.list || [];
},
- labelField: 'name',
- valueField: 'id',
+ labelField: "name",
+ valueField: "id",
},
},
{
- component: 'InputNumber',
- fieldName: 'unitMeasureRate2',
- label: '杈呭崟浣�2鎹㈢畻姣旂巼',
- formItemClass: 'col-span-1',
+ component: "InputNumber",
+ fieldName: "unitMeasureRate2",
+ label: "杈呭崟浣�2鎹㈢畻姣旂巼",
+ formItemClass: "col-span-1",
componentProps: {
- class: '!w-full',
+ class: "!w-full",
min: 0,
precision: 6,
- placeholder: '璇疯緭鍏ユ崲绠楁瘮鐜�',
+ placeholder: "璇疯緭鍏ユ崲绠楁瘮鐜�",
},
},
{
@@ -161,77 +161,77 @@
},
},
{
- component: 'Input',
- fieldName: 'barCode',
- label: '鏉＄爜',
+ component: "Input",
+ fieldName: "barCode",
+ label: "鏉＄爜",
componentProps: {
- placeholder: '璇疯緭鍏ユ潯鐮�',
+ placeholder: "璇疯緭鍏ユ潯鐮�",
},
},
{
- component: 'InputNumber',
- fieldName: 'purchasePrice',
- label: '閲囪喘浠�',
+ component: "InputNumber",
+ fieldName: "purchasePrice",
+ label: "閲囪喘浠�",
componentProps: {
- class: '!w-full',
+ class: "!w-full",
min: 0,
precision: 2,
- placeholder: '璇疯緭鍏ラ噰璐环',
+ placeholder: "璇疯緭鍏ラ噰璐环",
},
},
{
- component: 'InputNumber',
- fieldName: 'salesPrice',
- label: '閿�鍞环',
+ component: "InputNumber",
+ fieldName: "salesPrice",
+ label: "閿�鍞环",
componentProps: {
- class: '!w-full',
+ class: "!w-full",
min: 0,
precision: 2,
- placeholder: '璇疯緭鍏ラ攢鍞环',
+ placeholder: "璇疯緭鍏ラ攢鍞环",
},
},
{
- component: 'InputNumber',
- fieldName: 'costPrice',
- label: '鎴愭湰浠�',
+ component: "InputNumber",
+ fieldName: "costPrice",
+ label: "鎴愭湰浠�",
componentProps: {
- class: '!w-full',
+ class: "!w-full",
min: 0,
precision: 2,
- placeholder: '璇疯緭鍏ユ垚鏈环',
+ placeholder: "璇疯緭鍏ユ垚鏈环",
},
},
{
- component: 'InputNumber',
- fieldName: 'safetyStock',
- label: '瀹夊叏搴撳瓨',
+ component: "InputNumber",
+ fieldName: "safetyStock",
+ label: "瀹夊叏搴撳瓨",
componentProps: {
- class: '!w-full',
+ class: "!w-full",
min: 0,
precision: 2,
- placeholder: '璇疯緭鍏ュ畨鍏ㄥ簱瀛�',
+ placeholder: "璇疯緭鍏ュ畨鍏ㄥ簱瀛�",
},
},
{
- component: 'InputNumber',
- fieldName: 'minStock',
- label: '鏈�浣庡簱瀛�',
+ component: "InputNumber",
+ fieldName: "minStock",
+ label: "鏈�浣庡簱瀛�",
componentProps: {
- class: '!w-full',
+ class: "!w-full",
min: 0,
precision: 2,
- placeholder: '璇疯緭鍏ユ渶浣庡簱瀛�',
+ placeholder: "璇疯緭鍏ユ渶浣庡簱瀛�",
},
},
{
- component: 'InputNumber',
- fieldName: 'maxStock',
- label: '鏈�楂樺簱瀛�',
+ component: "InputNumber",
+ fieldName: "maxStock",
+ label: "鏈�楂樺簱瀛�",
componentProps: {
- class: '!w-full',
+ class: "!w-full",
min: 0,
precision: 2,
- placeholder: '璇疯緭鍏ユ渶楂樺簱瀛�',
+ placeholder: "璇疯緭鍏ユ渶楂樺簱瀛�",
},
},
{
@@ -240,40 +240,51 @@
label: '鎵规绠＄悊',
defaultValue: true,
componentProps: {
- class: 'w-auto',
- checkedChildren: '鏄�',
- unCheckedChildren: '鍚�',
+ class: "w-auto",
+ checkedChildren: "鏄�",
+ unCheckedChildren: "鍚�",
},
rules: z.boolean().default(true),
},
{
- component: 'InputNumber',
- fieldName: 'expiryDay',
- label: '鏈夋晥鏈�(澶�)',
+ component: "Switch",
+ fieldName: "syncMes",
+ label: "鍚屾鍒� MES",
componentProps: {
- class: '!w-full',
+ class: "w-auto",
+ checkedChildren: "鏄�",
+ unCheckedChildren: "鍚�",
+ },
+ rules: z.boolean().default(false),
+ },
+ {
+ component: "InputNumber",
+ fieldName: "expiryDay",
+ label: "鏈夋晥鏈�(澶�)",
+ componentProps: {
+ class: "!w-full",
min: 0,
- placeholder: '璇疯緭鍏ユ湁鏁堟湡',
+ placeholder: "璇疯緭鍏ユ湁鏁堟湡",
},
},
{
- component: 'RadioGroup',
- fieldName: 'status',
- label: '鐘舵��',
+ component: "RadioGroup",
+ fieldName: "status",
+ label: "鐘舵��",
componentProps: {
- options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
- buttonStyle: 'solid',
- optionType: 'button',
+ options: getDictOptions(DICT_TYPE.COMMON_STATUS, "number"),
+ buttonStyle: "solid",
+ optionType: "button",
},
rules: z.number().default(CommonStatusEnum.ENABLE),
},
{
- component: 'Textarea',
- fieldName: 'remark',
- label: '澶囨敞',
- formItemClass: 'col-span-2',
+ component: "Textarea",
+ fieldName: "remark",
+ label: "澶囨敞",
+ formItemClass: "col-span-2",
componentProps: {
- placeholder: '璇疯緭鍏ュ娉�',
+ placeholder: "璇疯緭鍏ュ娉�",
rows: 3,
},
},
@@ -284,143 +295,143 @@
export function useGridFormSchema(): VbenFormSchema[] {
return [
{
- fieldName: 'code',
- label: '鐗╂枡缂栫爜',
- component: 'Input',
+ fieldName: "code",
+ label: "鐗╂枡缂栫爜",
+ component: "Input",
componentProps: {
- placeholder: '璇疯緭鍏ョ墿鏂欑紪鐮�',
+ placeholder: "璇疯緭鍏ョ墿鏂欑紪鐮�",
allowClear: true,
},
},
{
- fieldName: 'name',
- label: '鐗╂枡鍚嶇О',
- component: 'Input',
+ fieldName: "name",
+ label: "鐗╂枡鍚嶇О",
+ component: "Input",
componentProps: {
- placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
+ placeholder: "璇疯緭鍏ョ墿鏂欏悕绉�",
allowClear: true,
},
},
{
- fieldName: 'itemType',
- label: '鐗╂枡绫诲瀷',
- component: 'Select',
+ fieldName: "itemType",
+ label: "鐗╂枡绫诲瀷",
+ component: "Select",
componentProps: {
- placeholder: '璇烽�夋嫨鐗╂枡绫诲瀷',
+ placeholder: "璇烽�夋嫨鐗╂枡绫诲瀷",
allowClear: true,
options: ITEM_TYPE_OPTIONS,
},
},
{
- fieldName: 'status',
- label: '鐘舵��',
- component: 'Select',
+ fieldName: "status",
+ label: "鐘舵��",
+ component: "Select",
componentProps: {
- placeholder: '璇烽�夋嫨鐘舵��',
+ placeholder: "璇烽�夋嫨鐘舵��",
allowClear: true,
- options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+ options: getDictOptions(DICT_TYPE.COMMON_STATUS, "number"),
},
},
];
}
/** 鍒楄〃鐨勫瓧娈� */
-export function useGridColumns(): VxeTableGridOptions['columns'] {
+export function useGridColumns(): VxeTableGridOptions["columns"] {
return [
- { type: 'checkbox', width: 40 },
+ { type: "checkbox", width: 40 },
{
- field: 'code',
- title: '鐗╂枡缂栫爜',
+ field: "code",
+ title: "鐗╂枡缂栫爜",
minWidth: 120,
},
{
- field: 'name',
- title: '鐗╂枡鍚嶇О',
+ field: "name",
+ title: "鐗╂枡鍚嶇О",
minWidth: 180,
},
{
- field: 'specification',
- title: '瑙勬牸鍨嬪彿',
+ field: "specification",
+ title: "瑙勬牸鍨嬪彿",
minWidth: 150,
},
{
- field: 'unitMeasureName',
- title: '鍗曚綅',
+ field: "unitMeasureName",
+ title: "鍗曚綅",
minWidth: 80,
},
{
- field: 'unitMeasureName2',
- title: '杈呭崟浣�1',
+ field: "unitMeasureName2",
+ title: "杈呭崟浣�1",
minWidth: 80,
},
{
- field: 'unitMeasureRate1',
- title: '杈呭崟浣�1鎹㈢畻姣旂巼',
+ field: "unitMeasureRate1",
+ title: "杈呭崟浣�1鎹㈢畻姣旂巼",
minWidth: 130,
},
{
- field: 'unitMeasureName3',
- title: '杈呭崟浣�2',
+ field: "unitMeasureName3",
+ title: "杈呭崟浣�2",
minWidth: 80,
},
{
- field: 'unitMeasureRate2',
- title: '杈呭崟浣�2鎹㈢畻姣旂巼',
+ field: "unitMeasureRate2",
+ title: "杈呭崟浣�2鎹㈢畻姣旂巼",
minWidth: 130,
},
{
- field: 'warehouseName',
- title: '榛樿浠撳簱',
+ field: "warehouseName",
+ title: "榛樿浠撳簱",
minWidth: 100,
},
{
- field: 'itemType',
- title: '鐗╂枡绫诲瀷',
+ field: "itemType",
+ title: "鐗╂枡绫诲瀷",
minWidth: 100,
- slots: { default: 'itemType' },
+ slots: { default: "itemType" },
},
{
- field: 'purchasePrice',
- title: '閲囪喘浠�',
+ field: "purchasePrice",
+ title: "閲囪喘浠�",
minWidth: 100,
formatter: ({ cellValue }) => {
- return cellValue != null ? `楼${Number(cellValue).toFixed(2)}` : '';
+ return cellValue != null ? `楼${Number(cellValue).toFixed(2)}` : "";
},
},
{
- field: 'salesPrice',
- title: '閿�鍞环',
+ field: "salesPrice",
+ title: "閿�鍞环",
minWidth: 100,
formatter: ({ cellValue }) => {
- return cellValue != null ? `楼${Number(cellValue).toFixed(2)}` : '';
+ return cellValue != null ? `楼${Number(cellValue).toFixed(2)}` : "";
},
},
{
- field: 'isBatchManaged',
- title: '鎵规绠＄悊',
+ field: "isBatchManaged",
+ title: "鎵规绠＄悊",
minWidth: 80,
- slots: { default: 'isBatchManaged' },
+ slots: { default: "isBatchManaged" },
},
{
- field: 'status',
- title: '鐘舵��',
+ field: "status",
+ title: "鐘舵��",
minWidth: 80,
cellRender: {
- name: 'CellDict',
+ name: "CellDict",
props: { type: DICT_TYPE.COMMON_STATUS },
},
},
{
- field: 'createTime',
- title: '鍒涘缓鏃堕棿',
+ field: "createTime",
+ title: "鍒涘缓鏃堕棿",
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: "formatDateTime",
},
{
- title: '鎿嶄綔',
+ title: "鎿嶄綔",
width: 180,
- fixed: 'right',
- slots: { default: 'actions' },
+ fixed: "right",
+ slots: { default: "actions" },
},
];
-}
\ No newline at end of file
+}
diff --git a/src/views/basicData/mdm/modules/form.vue b/src/views/basicData/mdm/modules/form.vue
index 8335105..83aa7a6 100644
--- a/src/views/basicData/mdm/modules/form.vue
+++ b/src/views/basicData/mdm/modules/form.vue
@@ -5,9 +5,9 @@
import { computed, ref, watch } from 'vue';
-import { useVbenModal } from '#/packages/effects/common-ui/src';
+ import { useVbenModal } from "#/packages/effects/common-ui/src";
-import { message } from 'ant-design-vue';
+ import { message } from "ant-design-vue";
import { useVbenForm } from '#/adapter/form';
import { createItem, getItem, updateItem } from '#/api/mdm/item';
@@ -17,7 +17,7 @@
import { useFormSchema } from '../data';
import ItemBatchConfig from '../components/batch-config.vue';
-defineOptions({ name: 'ItemForm' });
+ defineOptions({ name: "ItemForm" });
const emit = defineEmits(['success']);
const formData = ref<MdmItemApi.Item>();
diff --git a/src/views/mes/process-design/route/data.ts b/src/views/mes/process-design/route/data.ts
index d59d436..39d5405 100644
--- a/src/views/mes/process-design/route/data.ts
+++ b/src/views/mes/process-design/route/data.ts
@@ -1,94 +1,85 @@
-import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
-import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { MesProRouteApi } from '#/api/mes/pro/route';
-import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
-import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
-import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
+import type { VbenFormApi, VbenFormSchema } from "#/adapter/form";
+import type { VxeTableGridOptions } from "#/adapter/vxe-table";
+import type { MesProRouteApi } from "#/api/mes/pro/route";
+import type { MesProRouteProcessApi } from "#/api/mes/pro/route/process";
+import type { MesProRouteProductApi } from "#/api/mes/pro/route/product";
+import type { MesProRouteProductBomApi } from "#/api/mes/pro/route/productbom";
-import { h, markRaw } from 'vue';
+import { h, markRaw } from "vue";
-import {
- CommonStatusEnum,
- DICT_TYPE,
- MesAutoCodeRuleCode,
-} from '@vben/constants';
-import { getDictOptions } from '@vben/hooks';
+import { CommonStatusEnum, DICT_TYPE, MesAutoCodeRuleCode } from "@vben/constants";
+import { getDictOptions } from "@vben/hooks";
-import { Button } from 'ant-design-vue';
+import { Button } from "ant-design-vue";
-import { z } from '#/adapter/form';
-import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import {
- MdItemSelect,
- MdProductBomSelect,
-} from '#/views/mes/md/item/components';
+import { z } from "#/adapter/form";
+import { generateAutoCode } from "#/api/mes/md/autocode/record";
+import { MdItemSelect, MdProductBomSelect } from "#/views/mes/md/item/components";
-import { RouteColorPicker } from './components';
+import { RouteColorPicker } from "./components";
/** 琛ㄥ崟绫诲瀷 */
-export type FormType = 'create' | 'detail' | 'update';
+export type FormType = "create" | "detail" | "update";
/** 宸ヨ壓璺嚎琛ㄥ崟 */
export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
return [
{
- fieldName: 'id',
- component: 'Input',
- dependencies: { triggerFields: [''], show: () => false },
+ fieldName: "id",
+ component: "Input",
+ dependencies: { triggerFields: [""], show: () => false },
},
{
- fieldName: 'code',
- label: '璺嚎缂栫爜',
- component: 'Input',
+ fieldName: "code",
+ label: "璺嚎缂栫爜",
+ component: "Input",
componentProps: {
maxLength: 64,
- placeholder: '璇疯緭鍏ュ伐鑹鸿矾绾跨紪鐮�',
+ placeholder: "璇疯緭鍏ュ伐鑹鸿矾绾跨紪鐮�",
},
- rules: z.string().min(1, '璺嚎缂栫爜涓嶈兘涓虹┖').max(64),
+ rules: z.string().min(1, "璺嚎缂栫爜涓嶈兘涓虹┖").max(64),
suffix: () =>
h(
Button,
{
- type: 'default',
+ type: "default",
onClick: async () => {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.PRO_ROUTE_CODE,
- );
- await formApi?.setFieldValue('code', code);
+ const code = await generateAutoCode(MesAutoCodeRuleCode.PRO_ROUTE_CODE);
+ await formApi?.setFieldValue("code", code);
},
},
- { default: () => '鐢熸垚' },
+ { default: () => "鐢熸垚" },
),
},
{
- fieldName: 'name',
- label: '璺嚎鍚嶇О',
- component: 'Input',
+ fieldName: "name",
+ label: "璺嚎鍚嶇О",
+ component: "Input",
componentProps: {
maxLength: 100,
- placeholder: '璇疯緭鍏ュ伐鑹鸿矾绾垮悕绉�',
+ placeholder: "璇疯緭鍏ュ伐鑹鸿矾绾垮悕绉�",
},
- rules: z.string().min(1, '璺嚎鍚嶇О涓嶈兘涓虹┖').max(100),
+ rules: z.string().min(1, "璺嚎鍚嶇О涓嶈兘涓虹┖").max(100),
},
{
- fieldName: 'description',
- label: '璺嚎璇存槑',
- component: 'Textarea',
- formItemClass: 'col-span-2',
+ fieldName: "description",
+ label: "璺嚎璇存槑",
+ component: "Textarea",
+ formItemClass: "col-span-2",
componentProps: {
maxLength: 500,
- placeholder: '璇疯緭鍏ュ伐鑹鸿矾绾胯鏄�',
+ placeholder: "璇疯緭鍏ュ伐鑹鸿矾绾胯鏄�",
rows: 3,
},
},
{
- fieldName: 'remark',
- label: '澶囨敞',
- component: 'Textarea',
- formItemClass: 'col-span-2',
+ fieldName: "remark",
+ label: "澶囨敞",
+ component: "Textarea",
+ formItemClass: "col-span-2",
componentProps: {
maxLength: 250,
- placeholder: '璇疯緭鍏ュ娉�',
+ placeholder: "璇疯緭鍏ュ娉�",
rows: 2,
},
},
@@ -99,31 +90,31 @@
export function useGridFormSchema(): VbenFormSchema[] {
return [
{
- fieldName: 'code',
- label: '璺嚎缂栫爜',
- component: 'Input',
+ fieldName: "code",
+ label: "璺嚎缂栫爜",
+ component: "Input",
componentProps: {
allowClear: true,
- placeholder: '璇疯緭鍏ヨ矾绾跨紪鐮�',
+ placeholder: "璇疯緭鍏ヨ矾绾跨紪鐮�",
},
},
{
- fieldName: 'name',
- label: '璺嚎鍚嶇О',
- component: 'Input',
+ fieldName: "name",
+ label: "璺嚎鍚嶇О",
+ component: "Input",
componentProps: {
allowClear: true,
- placeholder: '璇疯緭鍏ヨ矾绾垮悕绉�',
+ placeholder: "璇疯緭鍏ヨ矾绾垮悕绉�",
},
},
{
- fieldName: 'status',
- label: '鐘舵��',
- component: 'Select',
+ fieldName: "status",
+ label: "鐘舵��",
+ component: "Select",
componentProps: {
allowClear: true,
- options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
- placeholder: '璇烽�夋嫨鐘舵��',
+ options: getDictOptions(DICT_TYPE.COMMON_STATUS, "number"),
+ placeholder: "璇烽�夋嫨鐘舵��",
},
},
];
@@ -131,29 +122,26 @@
/** 鍒楄〃瀛楁 */
export function useGridColumns(
- onStatusChange?: (
- newStatus: number,
- row: MesProRouteApi.Route,
- ) => PromiseLike<boolean | undefined>,
+ onStatusChange?: (newStatus: number, row: MesProRouteApi.Route) => PromiseLike<boolean | undefined>,
statusEditable = true,
-): VxeTableGridOptions<MesProRouteApi.Route>['columns'] {
+): VxeTableGridOptions<MesProRouteApi.Route>["columns"] {
return [
{
- field: 'code',
- title: '璺嚎缂栫爜',
+ field: "code",
+ title: "璺嚎缂栫爜",
minWidth: 160,
- slots: { default: 'code' },
+ slots: { default: "code" },
},
- { field: 'name', title: '璺嚎鍚嶇О', minWidth: 180 },
- { field: 'description', title: '璺嚎璇存槑', minWidth: 200 },
+ { field: "name", title: "璺嚎鍚嶇О", minWidth: 180 },
+ { field: "description", title: "璺嚎璇存槑", minWidth: 200 },
{
- field: 'status',
- title: '鐘舵��',
+ field: "status",
+ title: "鐘舵��",
width: 110,
- align: 'center',
+ align: "center",
cellRender: {
attrs: { beforeChange: onStatusChange },
- name: 'CellSwitch',
+ name: "CellSwitch",
props: {
checkedValue: CommonStatusEnum.ENABLE,
disabled: !statusEditable,
@@ -161,126 +149,134 @@
},
},
},
- { field: 'remark', title: '澶囨敞', minWidth: 160 },
+ { field: "remark", title: "澶囨敞", minWidth: 160 },
{
- field: 'createTime',
- title: '鍒涘缓鏃堕棿',
+ field: "createTime",
+ title: "鍒涘缓鏃堕棿",
width: 180,
- formatter: 'formatDateTime',
+ formatter: "formatDateTime",
},
{
- title: '鎿嶄綔',
+ title: "鎿嶄綔",
width: 160,
- fixed: 'right',
- slots: { default: 'actions' },
+ fixed: "right",
+ slots: { default: "actions" },
},
];
}
/** 宸ヨ壓璺嚎宸ュ簭鏄庣粏琛ㄥ崟 */
-export function useRouteProcessFormSchema(
- processOptions: Array<{ label: string; value: number }>,
-): VbenFormSchema[] {
+export function useRouteProcessFormSchema(processOptions: Array<{ label: string; value: number }>): VbenFormSchema[] {
return [
{
- fieldName: 'id',
- component: 'Input',
- dependencies: { triggerFields: [''], show: () => false },
+ fieldName: "id",
+ component: "Input",
+ dependencies: { triggerFields: [""], show: () => false },
},
{
- fieldName: 'routeId',
- component: 'Input',
- dependencies: { triggerFields: [''], show: () => false },
+ fieldName: "routeId",
+ component: "Input",
+ dependencies: { triggerFields: [""], show: () => false },
},
{
- fieldName: 'sort',
- label: '搴忓彿',
- component: 'InputNumber',
+ fieldName: "sort",
+ label: "搴忓彿",
+ component: "InputNumber",
componentProps: {
- class: '!w-full',
+ class: "!w-full",
min: 1,
precision: 0,
},
rules: z.number().default(1),
},
{
- fieldName: 'processId',
- label: '宸ュ簭',
- component: 'Select',
+ fieldName: "processId",
+ label: "宸ュ簭",
+ component: "Select",
componentProps: {
allowClear: true,
options: processOptions,
- placeholder: '璇烽�夋嫨宸ュ簭',
+ placeholder: "璇烽�夋嫨宸ュ簭",
showSearch: true,
},
- rules: 'selectRequired',
+ rules: "selectRequired",
},
{
- fieldName: 'linkType',
- label: '涓庝笅閬撳伐搴忓叧绯�',
- component: 'Select',
+ fieldName: "linkType",
+ label: "涓庝笅閬撳伐搴忓叧绯�",
+ component: "Select",
componentProps: {
allowClear: true,
- options: getDictOptions(DICT_TYPE.MES_PRO_LINK_TYPE, 'number'),
- placeholder: '璇烽�夋嫨',
+ options: getDictOptions(DICT_TYPE.MES_PRO_LINK_TYPE, "number"),
+ placeholder: "璇烽�夋嫨",
},
rules: z.number().default(3),
},
{
- fieldName: 'colorCode',
- label: '鐢樼壒鍥鹃鑹�',
+ fieldName: "colorCode",
+ label: "鐢樼壒鍥鹃鑹�",
component: RouteColorPicker,
},
{
- fieldName: 'keyFlag',
- label: '鏄惁鍏抽敭宸ュ簭',
- component: 'Switch',
+ fieldName: "keyFlag",
+ label: "鏄惁鍏抽敭宸ュ簭",
+ component: "Switch",
componentProps: {
- checkedChildren: '鏄�',
- unCheckedChildren: '鍚�',
+ checkedChildren: "鏄�",
+ unCheckedChildren: "鍚�",
},
rules: z.boolean().default(false),
},
{
- fieldName: 'checkFlag',
- label: '鏄惁璐ㄦ纭',
- component: 'Switch',
+ fieldName: "checkFlag",
+ label: "鏄惁璐ㄦ纭",
+ component: "Switch",
componentProps: {
- checkedChildren: '鏄�',
- unCheckedChildren: '鍚�',
+ checkedChildren: "鏄�",
+ unCheckedChildren: "鍚�",
},
rules: z.boolean().default(false),
},
{
- fieldName: 'prepareTime',
- label: '鍑嗗鏃堕棿(鍒�)',
- component: 'InputNumber',
+ fieldName: "backflushFlag",
+ label: "鏄惁鍊掑啿",
+ component: "Switch",
componentProps: {
- class: '!w-full',
+ checkedChildren: "鏄�",
+ unCheckedChildren: "鍚�",
+ },
+ rules: z.boolean().default(true),
+ },
+ {
+ fieldName: "prepareTime",
+ label: "鍑嗗鏃堕棿(鍒�)",
+ component: "InputNumber",
+ componentProps: {
+ class: "!w-full",
min: 0,
precision: 0,
},
rules: z.number().default(0),
},
{
- fieldName: 'waitTime',
- label: '绛夊緟鏃堕棿(鍒�)',
- component: 'InputNumber',
+ fieldName: "waitTime",
+ label: "绛夊緟鏃堕棿(鍒�)",
+ component: "InputNumber",
componentProps: {
- class: '!w-full',
+ class: "!w-full",
min: 0,
precision: 0,
},
rules: z.number().default(0),
},
{
- fieldName: 'remark',
- label: '澶囨敞',
- component: 'Textarea',
- formItemClass: 'col-span-2',
+ fieldName: "remark",
+ label: "澶囨敞",
+ component: "Textarea",
+ formItemClass: "col-span-2",
componentProps: {
maxLength: 250,
- placeholder: '璇疯緭鍏ュ娉�',
+ placeholder: "璇疯緭鍏ュ娉�",
rows: 2,
},
},
@@ -288,166 +284,173 @@
}
/** 宸ヨ壓璺嚎宸ュ簭鍒楄〃瀛楁 */
-export function useRouteProcessGridColumns(): VxeTableGridOptions<MesProRouteProcessApi.RouteProcess>['columns'] {
+export function useRouteProcessGridColumns(): VxeTableGridOptions<MesProRouteProcessApi.RouteProcess>["columns"] {
return [
- { field: 'sort', title: '搴忓彿', width: 70, align: 'center', fixed: 'left' },
- { field: 'processCode', title: '宸ュ簭缂栫爜', width: 140, fixed: 'left' },
- { field: 'processName', title: '宸ュ簭鍚嶇О', width: 140, fixed: 'left' },
- { field: 'nextProcessName', title: '涓嬩竴閬撳伐搴�', width: 140 },
+ { field: "sort", title: "搴忓彿", width: 70, align: "center", fixed: "left" },
+ { field: "processCode", title: "宸ュ簭缂栫爜", width: 140, fixed: "left" },
+ { field: "processName", title: "宸ュ簭鍚嶇О", width: 140, fixed: "left" },
+ { field: "nextProcessName", title: "涓嬩竴閬撳伐搴�", width: 140 },
{
- field: 'linkType',
- title: '涓庝笅涓�閬撳伐搴忓叧绯�',
+ field: "linkType",
+ title: "涓庝笅涓�閬撳伐搴忓叧绯�",
width: 160,
cellRender: {
- name: 'CellDict',
+ name: "CellDict",
props: { type: DICT_TYPE.MES_PRO_LINK_TYPE },
},
},
{
- field: 'keyFlag',
- title: '鍏抽敭宸ュ簭',
+ field: "keyFlag",
+ title: "鍏抽敭宸ュ簭",
width: 90,
cellRender: {
- name: 'CellDict',
+ name: "CellDict",
props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
},
},
{
- field: 'checkFlag',
- title: '璐ㄦ纭',
+ field: "checkFlag",
+ title: "璐ㄦ纭",
width: 100,
cellRender: {
- name: 'CellDict',
+ name: "CellDict",
props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
},
},
- { field: 'prepareTime', title: '鍑嗗鏃堕棿(鍒�)', width: 110 },
- { field: 'waitTime', title: '绛夊緟鏃堕棿(鍒�)', width: 110 },
{
- field: 'colorCode',
- title: '鐢樼壒鍥鹃鑹�',
- width: 130,
- slots: { default: 'colorCode' },
+ field: "backflushFlag",
+ title: "鏄惁鍊掑啿",
+ width: 100,
+ cellRender: {
+ name: "CellDict",
+ props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+ },
},
- { field: 'remark', title: '澶囨敞', minWidth: 160 },
+ { field: "prepareTime", title: "鍑嗗鏃堕棿(鍒�)", width: 110 },
+ { field: "waitTime", title: "绛夊緟鏃堕棿(鍒�)", width: 110 },
{
- title: '鎿嶄綔',
+ field: "colorCode",
+ title: "鐢樼壒鍥鹃鑹�",
width: 130,
- fixed: 'right',
- slots: { default: 'actions' },
+ slots: { default: "colorCode" },
+ },
+ { field: "remark", title: "澶囨敞", minWidth: 160 },
+ {
+ title: "鎿嶄綔",
+ width: 130,
+ fixed: "right",
+ slots: { default: "actions" },
},
];
}
/** 宸ヨ壓璺嚎浜у搧鍒楄〃瀛楁 */
-export function useRouteProductGridColumns(): VxeTableGridOptions<MesProRouteProductApi.RouteProduct>['columns'] {
+export function useRouteProductGridColumns(): VxeTableGridOptions<MesProRouteProductApi.RouteProduct>["columns"] {
return [
- { field: 'itemCode', title: '浜у搧鐗╂枡缂栫爜', width: 150 },
- { field: 'itemName', title: '浜у搧鐗╂枡鍚嶇О', width: 150 },
- { field: 'specification', title: '瑙勬牸鍨嬪彿', width: 150 },
- { field: 'unitName', title: '鍗曚綅', width: 80 },
- { field: 'quantity', title: '鐢熶骇鏁伴噺', width: 100 },
+ { field: "itemCode", title: "浜у搧鐗╂枡缂栫爜", width: 150 },
+ { field: "itemName", title: "浜у搧鐗╂枡鍚嶇О", width: 150 },
+ { field: "specification", title: "瑙勬牸鍨嬪彿", width: 150 },
+ { field: "unitName", title: "鍗曚綅", width: 80 },
+ { field: "quantity", title: "鐢熶骇鏁伴噺", width: 100 },
{
- field: 'productionTime',
- title: '鐢熶骇鐢ㄦ椂',
+ field: "productionTime",
+ title: "鐢熶骇鐢ㄦ椂",
width: 130,
- slots: { default: 'productionTime' },
+ slots: { default: "productionTime" },
},
- { field: 'remark', title: '澶囨敞', minWidth: 160 },
+ { field: "remark", title: "澶囨敞", minWidth: 160 },
{
- title: '鎿嶄綔',
+ title: "鎿嶄綔",
width: 130,
- fixed: 'right',
- slots: { default: 'actions' },
+ fixed: "right",
+ slots: { default: "actions" },
},
];
}
/** 宸ヨ壓璺嚎浜у搧 BOM 鍒楄〃瀛楁 */
-export function useRouteProductBomGridColumns(): VxeTableGridOptions<MesProRouteProductBomApi.RouteProductBom>['columns'] {
+export function useRouteProductBomGridColumns(): VxeTableGridOptions<MesProRouteProductBomApi.RouteProductBom>["columns"] {
return [
- { field: 'itemCode', title: 'BOM 鐗╂枡缂栫爜', width: 150 },
- { field: 'itemName', title: 'BOM 鐗╂枡鍚嶇О', width: 150 },
- { field: 'specification', title: '瑙勬牸鍨嬪彿', width: 150 },
- { field: 'unitName', title: '鍗曚綅', width: 80 },
- { field: 'quantity', title: '鐢ㄦ枡姣斾緥', width: 100 },
- { field: 'remark', title: '澶囨敞', minWidth: 160 },
+ { field: "itemCode", title: "BOM 鐗╂枡缂栫爜", width: 150 },
+ { field: "itemName", title: "BOM 鐗╂枡鍚嶇О", width: 150 },
+ { field: "specification", title: "瑙勬牸鍨嬪彿", width: 150 },
+ { field: "unitName", title: "鍗曚綅", width: 80 },
+ { field: "quantity", title: "鐢ㄦ枡姣斾緥", width: 100 },
+ { field: "remark", title: "澶囨敞", minWidth: 160 },
{
- title: '鎿嶄綔',
+ title: "鎿嶄綔",
width: 130,
- fixed: 'right',
- slots: { default: 'actions' },
+ fixed: "right",
+ slots: { default: "actions" },
},
];
}
/** 宸ヨ壓璺嚎浜у搧琛ㄥ崟 */
-export function useRouteProductFormSchema(
- onItemChange?: (item: any) => void,
-): VbenFormSchema[] {
+export function useRouteProductFormSchema(onItemChange?: (item: any) => void): VbenFormSchema[] {
return [
{
- fieldName: 'id',
- component: 'Input',
- dependencies: { triggerFields: [''], show: () => false },
+ fieldName: "id",
+ component: "Input",
+ dependencies: { triggerFields: [""], show: () => false },
},
{
- fieldName: 'routeId',
- component: 'Input',
- dependencies: { triggerFields: [''], show: () => false },
+ fieldName: "routeId",
+ component: "Input",
+ dependencies: { triggerFields: [""], show: () => false },
},
// 浜у搧鐗╂枡锛氫娇鐢ㄤ笟鍔¤嚜瀹氫箟閫夋嫨鍣紝change 鍥炲～缂栫爜/鍚嶇О/瑙勬牸/鍗曚綅
{
- fieldName: 'itemId',
- label: '浜у搧',
+ fieldName: "itemId",
+ label: "浜у搧",
component: markRaw(MdItemSelect),
componentProps: {
onChange: onItemChange,
},
- formItemClass: 'col-span-2',
- rules: 'selectRequired',
+ formItemClass: "col-span-2",
+ rules: "selectRequired",
},
{
- fieldName: 'quantity',
- label: '鐢熶骇鏁伴噺',
- component: 'InputNumber',
+ fieldName: "quantity",
+ label: "鐢熶骇鏁伴噺",
+ component: "InputNumber",
componentProps: {
- class: '!w-full',
+ class: "!w-full",
min: 1,
precision: 0,
},
rules: z.number().default(1),
},
{
- fieldName: 'productionTime',
- label: '鐢熶骇鐢ㄦ椂',
- component: 'InputNumber',
+ fieldName: "productionTime",
+ label: "鐢熶骇鐢ㄦ椂",
+ component: "InputNumber",
componentProps: {
- class: '!w-full',
+ class: "!w-full",
min: 0,
precision: 2,
},
rules: z.number().default(1),
},
{
- fieldName: 'timeUnitType',
- label: '鏃堕棿鍗曚綅',
- component: 'Select',
+ fieldName: "timeUnitType",
+ label: "鏃堕棿鍗曚綅",
+ component: "Select",
componentProps: {
allowClear: true,
options: getDictOptions(DICT_TYPE.MES_TIME_UNIT_TYPE),
- placeholder: '璇烽�夋嫨',
+ placeholder: "璇烽�夋嫨",
},
- rules: z.string().default('MINUTE'),
+ rules: z.string().default("MINUTE"),
},
{
- fieldName: 'remark',
- label: '澶囨敞',
- component: 'Textarea',
- formItemClass: 'col-span-2',
+ fieldName: "remark",
+ label: "澶囨敞",
+ component: "Textarea",
+ formItemClass: "col-span-2",
componentProps: {
maxLength: 250,
- placeholder: '璇疯緭鍏ュ娉�',
+ placeholder: "璇疯緭鍏ュ娉�",
rows: 2,
},
},
@@ -455,61 +458,58 @@
}
/** 宸ヨ壓璺嚎浜у搧 BOM 琛ㄥ崟 */
-export function useRouteProductBomFormSchema(
- itemId: () => number,
- onBomChange?: (bom: any) => void,
-): VbenFormSchema[] {
+export function useRouteProductBomFormSchema(itemId: () => number, onBomChange?: (bom: any) => void): VbenFormSchema[] {
return [
{
- fieldName: 'id',
- component: 'Input',
- dependencies: { triggerFields: [''], show: () => false },
+ fieldName: "id",
+ component: "Input",
+ dependencies: { triggerFields: [""], show: () => false },
},
{
- fieldName: 'routeId',
- component: 'Input',
- dependencies: { triggerFields: [''], show: () => false },
+ fieldName: "routeId",
+ component: "Input",
+ dependencies: { triggerFields: [""], show: () => false },
},
{
- fieldName: 'processId',
- component: 'Input',
- dependencies: { triggerFields: [''], show: () => false },
+ fieldName: "processId",
+ component: "Input",
+ dependencies: { triggerFields: [""], show: () => false },
},
{
- fieldName: 'productId',
- component: 'Input',
- dependencies: { triggerFields: [''], show: () => false },
+ fieldName: "productId",
+ component: "Input",
+ dependencies: { triggerFields: [""], show: () => false },
},
// BOM 鐗╂枡锛氫緷璧栦骇鍝佺墿鏂欙紝浣跨敤涓氬姟鑷畾涔夐�夋嫨鍣�
{
- fieldName: 'itemId',
- label: 'BOM 鐗╂枡',
+ fieldName: "itemId",
+ label: "BOM 鐗╂枡",
component: markRaw(MdProductBomSelect),
componentProps: () => ({
itemId: itemId(),
onChange: onBomChange,
- placeholder: '璇烽�夋嫨 BOM 鐗╂枡',
+ placeholder: "璇烽�夋嫨 BOM 鐗╂枡",
}),
- rules: 'selectRequired',
+ rules: "selectRequired",
},
{
- fieldName: 'quantity',
- label: '鐢ㄦ枡姣斾緥',
- component: 'InputNumber',
+ fieldName: "quantity",
+ label: "鐢ㄦ枡姣斾緥",
+ component: "InputNumber",
componentProps: {
- class: '!w-full',
+ class: "!w-full",
min: 0,
precision: 2,
},
rules: z.number().default(1),
},
{
- fieldName: 'remark',
- label: '澶囨敞',
- component: 'Textarea',
+ fieldName: "remark",
+ label: "澶囨敞",
+ component: "Textarea",
componentProps: {
maxLength: 250,
- placeholder: '璇疯緭鍏ュ娉�',
+ placeholder: "璇疯緭鍏ュ娉�",
rows: 2,
},
},
diff --git a/vite.config.ts b/vite.config.ts
index 5e6b6b4..fc2ee92 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -8,39 +8,25 @@
enable: false,
},
optimizeDeps: {
- include: [
- "vue",
- "vue-router",
- "pinia",
- "ant-design-vue",
- "dayjs",
- "@vueuse/core",
- "axios",
- ],
- exclude: [
- "dhtmlx-gantt",
- "tinymce",
- "bpmn-js",
- "bpmn-js-properties-panel",
- "video.js",
- ],
+ include: ["vue", "vue-router", "pinia", "ant-design-vue", "dayjs", "@vueuse/core", "axios"],
+ exclude: ["dhtmlx-gantt", "tinymce", "bpmn-js", "bpmn-js-properties-panel", "video.js"],
},
build: {
rollupOptions: {
output: {
- manualChunks: (id) => {
- if (id.includes('node_modules')) {
- if (['vue', 'vue-router', 'pinia'].some(dep => id.includes(dep))) {
- return 'vendor-vue';
+ manualChunks: id => {
+ if (id.includes("node_modules")) {
+ if (["vue", "vue-router", "pinia"].some(dep => id.includes(dep))) {
+ return "vendor-vue";
}
- if (['ant-design-vue', '@vueuse/core'].some(dep => id.includes(dep))) {
- return 'vendor-ui';
+ if (["ant-design-vue", "@vueuse/core"].some(dep => id.includes(dep))) {
+ return "vendor-ui";
}
- if (['dayjs', 'axios', '@vee-validate/zod', 'zod'].some(dep => id.includes(dep))) {
- return 'vendor-utils';
+ if (["dayjs", "axios", "@vee-validate/zod", "zod"].some(dep => id.includes(dep))) {
+ return "vendor-utils";
}
- if (['tinymce', '@tinymce/tinymce-vue', '@form-create/ant-design-vue'].some(dep => id.includes(dep))) {
- return 'vendor-editor';
+ if (["tinymce", "@tinymce/tinymce-vue", "@form-create/ant-design-vue"].some(dep => id.includes(dep))) {
+ return "vendor-editor";
}
}
},
@@ -50,13 +36,13 @@
server: {
allowedHosts: true,
watch: {
- ignored: ['**/node_modules/**', '**/dist/**', '**/.git/**'],
+ ignored: ["**/node_modules/**", "**/dist/**", "**/.git/**"],
},
proxy: {
"/admin-api": {
changeOrigin: true,
- rewrite: (path) => path.replace(/^\/admin-api/, ""),
- target: "http://192.168.0.226:48080/admin-api",
+ rewrite: path => path.replace(/^\/admin-api/, ""),
+ target: "http://192.168.0.244:48080/admin-api",
ws: true,
},
},
--
Gitblit v1.9.3