From 8b0921f1dcebdf620ce438aa216cfbe4d74f4d0a Mon Sep 17 00:00:00 2001
From: gaoyunqi <gaoyunqi@gdyd.com>
Date: Wed, 6 Mar 2024 18:33:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A8=E5=8D=95=E6=94=AF=E6=8C=81slo?=
 =?UTF-8?q?t=E5=BD=A2=E5=BC=8F=E7=9A=84=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/src/types/form.ts        | 4 ++++
 src/components/SimpleForm/src/SimpleForm.vue | 5 ++++-
 src/hooks/web/usePermission.ts               | 2 +-
 src/views/secondDev/FormInformation.vue      | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/Form/src/types/form.ts b/src/components/Form/src/types/form.ts
index a582f85..692c62e 100644
--- a/src/components/Form/src/types/form.ts
+++ b/src/components/Form/src/types/form.ts
@@ -233,6 +233,10 @@ export interface FormSchema {
   value?: any;
   subTitle?: string;
   isShow?: boolean;
+  //自定义插槽名称 用于自定义组件
+  slotName?: string;
+  //无视权限一直显示 用于自定义组件
+  ignorePermission?: boolean;
 }
 export interface HelpComponentProps {
   maxWidth: string;
diff --git a/src/components/SimpleForm/src/SimpleForm.vue b/src/components/SimpleForm/src/SimpleForm.vue
index 49c0ee1..02ab884 100644
--- a/src/components/SimpleForm/src/SimpleForm.vue
+++ b/src/components/SimpleForm/src/SimpleForm.vue
@@ -4,9 +4,12 @@
             <Row v-bind="getRow">
                 <template v-for="schema in getSchemas" :key="schema.field">
                     <Col v-if="getIfShow(schema, formModel[schema.field])" v-show="getIsShow(schema, formModel[schema.field])" :span="getColWidth(schema)">
-                        <template v-if="showComponent(schema)">
+                        <template v-if="showComponent(schema) && schema.type !== 'slot'">
                             <SimpleFormItem v-model:value="formModel[schema.field]" :form-api="formApi" :isWorkFlow="isWorkFlow" :refreshFieldObj="refreshFieldObj" :schema="schema" />
                         </template>
+                        <template v-if="schema.type === 'slot'">
+                            <slot :name="schema.slotName" :schema="schema" :formModel="formModel"></slot>
+                        </template>
                     </Col>
                 </template>
             </Row>
diff --git a/src/hooks/web/usePermission.ts b/src/hooks/web/usePermission.ts
index a183436..eabb7d8 100644
--- a/src/hooks/web/usePermission.ts
+++ b/src/hooks/web/usePermission.ts
@@ -262,7 +262,7 @@ export function usePermission() {
       }
     } else {
       const field = schema.field || schema.dataIndex || schema.key;
-      return formAuth?.includes(field);
+      return formAuth?.includes(field) || schema.ignorePermission;
     }
   }
 
diff --git a/src/views/secondDev/FormInformation.vue b/src/views/secondDev/FormInformation.vue
index 84567b1..0ae36cf 100644
--- a/src/views/secondDev/FormInformation.vue
+++ b/src/views/secondDev/FormInformation.vue
@@ -5,6 +5,7 @@
             <div :style="{}" class="form-right">
                 <div v-for="(item, index) in forms.configs" :key="index" :tab="item.formName">
                     <div v-show="activeIndex == index">
+                        <!-- 如果是生成文件模式 formType = 0，也就是FormType.SYSTEM，会加载对应项目的Form.vue-->
                         <SystemForm v-if="item.formType == FormType.SYSTEM" :ref="setItemRef" :formModel="item.formModel" :isViewProcess="props.disabled" :systemComponent="item.systemComponent" :workflowConfig="item" class="form-box" />
                         <SimpleForm v-else-if="item.formType == FormType.CUSTOM" :ref="setItemRef" :formModel="item.formModel" :formProps="item.formProps" :isWorkFlow="true" class="form-box" />
                     </div>