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

apps/web-antd/src/components/form-create/rules/use-upload-file-rule.ts

@@ -37,7 +37,7 @@ export function useUploadFileRule() {
             { label: 'pdf', value: 'pdf' },
           ],
           props: {
-            multiple: true,
+            mode: 'multiple',
           },
         },
         {

apps/web-antd/src/components/form-create/rules/use-upload-image-rule.ts

@@ -47,7 +47,7 @@ export function useUploadImageRule() {
             { label: 'image/x-icon', value: 'image/x-icon' },
           ],
           props: {
-            multiple: false,
+            mode: 'multiple',
           },
         },
         {

apps/web-antd/src/components/form-create/rules/use-upload-images-rule.ts

@@ -47,7 +47,7 @@ export function useUploadImagesRule() {
             { label: 'image/x-icon', value: 'image/x-icon' },
           ],
           props: {
-            multiple: true,
+            mode: 'multiple',
             maxNumber: 5,
           },
         },

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

@@ -351,11 +351,6 @@ defineExpose({ initData, validate });
         <Checkbox v-model:checked="modelData.allowCancelRunningProcess">
           允许撤销审批中的申请
         </Checkbox>
-        <div class="ml-6">
-          <TypographyText type="warning">
-            第一个审批节点通过后，提交人仍可撤销申请
-          </TypographyText>
-        </div>
       </div>
     </FormItem>
     <FormItem class="mb-5" label="审批人权限">

apps/web-ele/src/components/form-create/rules/use-upload-image-rule.ts

@@ -47,7 +47,7 @@ export function useUploadImageRule() {
             { label: 'image/x-icon', value: 'image/x-icon' },
           ],
           props: {
-            multiple: false,
+            multiple: true,
           },
         },
         {