!313 Merge remote-tracking branch 'yudao/dev' into dev

Merge pull request !313 from Jason/dev

apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/condition-node-config.vue

@@ -158,7 +158,7 @@ function changeNodeName() {
 defineExpose({ open }); // 提供 open 方法，用于打开弹窗
 </script>
 <template>
-  <Drawer class="w-1/3">
+  <Drawer class="w-2/5">
     <template #title>
       <div class="flex items-center">
         <Input

apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/trigger-node-config.vue

@@ -383,7 +383,7 @@ onMounted(() => {
 });
 </script>
 <template>
-  <Drawer class="w-1/3">
+  <Drawer class="w-2/5">
     <template #title>
       <div class="config-header">
         <Input

apps/web-antd/src/views/bpm/model/form/index.vue

@@ -497,7 +497,7 @@ onBeforeUnmount(() => {
           />
 
           <!-- 第四步：更多设置 -->
-          <div v-if="currentStep === 3" class="mx-auto w-4/6">
+          <div v-show="currentStep === 3" class="mx-auto w-4/6">
             <ExtraSetting v-model="formData" ref="extraSettingRef" />
           </div>
         </div>

apps/web-antd/src/views/bpm/model/form/modules/extra-setting.vue

@@ -29,10 +29,8 @@ import {
 import dayjs from 'dayjs';
 
 import { getForm } from '#/api/bpm/form';
-import {
-  HttpRequestSetting,
-  parseFormFields,
-} from '#/views/bpm/components/simple-process-design';
+import { parseFormFields } from '#/components/form-create';
+import { HttpRequestSetting } from '#/views/bpm/components/simple-process-design';
 
 import PrintTemplate from './custom-print-template.vue';