From 46d70c9ea3406deae6368afdb30c0bfc5f7d590b Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Thu, 15 Jun 2023 16:53:12 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=AE=8C=E6=88=90=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/extension/form/FormModal.vue     |  1 +
 .../workflow/extension/form/form.data.ts      |  5 +-
 .../common/workflow/extension/form/index.vue  | 86 +++++++++----------
 3 files changed, 47 insertions(+), 45 deletions(-)

diff --git a/src/views/common/workflow/extension/form/FormModal.vue b/src/views/common/workflow/extension/form/FormModal.vue
index bc18c7d..f5b8653 100644
--- a/src/views/common/workflow/extension/form/FormModal.vue
+++ b/src/views/common/workflow/extension/form/FormModal.vue
@@ -2,6 +2,7 @@
   <BasicModal
     v-bind="$attrs"
     width="720px"
+    minHeight="100px"
     @register="registerModal"
     @ok="handleSubmit"
   >
diff --git a/src/views/common/workflow/extension/form/form.data.ts b/src/views/common/workflow/extension/form/form.data.ts
index 8a431b0..96f750a 100644
--- a/src/views/common/workflow/extension/form/form.data.ts
+++ b/src/views/common/workflow/extension/form/form.data.ts
@@ -18,7 +18,9 @@ export const columns: BasicColumn[] = [
     dataIndex: ['formDefinitionJson', 'version'],
     width: 200,
     customRender: ({ record }) => {
-      return h(Tag, {color: 'success'}, () => record.formDefinitionJson?.version);
+      return record.formDefinitionJson?.version ?
+        h(Tag, {color: 'success'}, () => record.formDefinitionJson?.version):
+        h(Tag, {color: 'red'}, () => '暂无版本号');
     }
   },
   {
@@ -104,5 +106,6 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       placeholder: '请输入表单名称',
     },
+    required: true,
   },
 ];
diff --git a/src/views/common/workflow/extension/form/index.vue b/src/views/common/workflow/extension/form/index.vue
index 572f4e5..7e3ed40 100644
--- a/src/views/common/workflow/extension/form/index.vue
+++ b/src/views/common/workflow/extension/form/index.vue
@@ -5,51 +5,49 @@
     fixedHeight
     dense
   >
-    <div class="m-4 mr-0 overflow-hidden bg-white w-1/4 xl:w-1/5">
-      <BasicTree
-        search
-        :clickRowToExpand="false"
-        :treeData="state.treeData"
-        :fieldNames="{ key: 'id', title: 'name' }"
-        @select="handleSelect"
-      >
-        <template #toolbarRight>
-          <a-button
-            type="primary"
-            shape="circle"
-            size="small"
-            @click="handleAdd()"
-          >
-            <PlusOutlined/>
-          </a-button>
-        </template>
-        <template #title="data">
-          <span class="custom-tree-node">
-            <span>{{ data.name }}</span>
-            <span>
-              <a-button type="link"
-                        size="small"
-                        @click="handleAdd(data)"
-              >
-                <PlusOutlined/>
-              </a-button>
-              <a-button type="link"
-                        size="small"
-                        @click="handleAdd(data)"
-              >
-                <FormOutlined/>
-              </a-button>
-              <a-button type="link"
-                        size="small"
-                        @click="handleAdd(data)"
-              >
-                <DeleteOutlined/>
-              </a-button>
-            </span>
+    <BasicTree class="m-4 mr-0 overflow-hidden bg-white w-1/4 xl:w-1/5"
+               search
+               :clickRowToExpand="false"
+               :treeData="state.treeData"
+               :fieldNames="{ key: 'id', title: 'name' }"
+               @select="handleSelect"
+    >
+      <template #toolbarRight>
+        <a-button
+          type="primary"
+          shape="circle"
+          size="small"
+          @click="handleAdd()"
+        >
+          <PlusOutlined/>
+        </a-button>
+      </template>
+      <template #title="data">
+        <span class="custom-tree-node">
+          <span>{{ data.name }}</span>
+          <span>
+            <a-button type="link"
+                      size="small"
+                      @click="handleAdd(data)"
+            >
+              <PlusOutlined/>
+            </a-button>
+            <a-button type="link"
+                      size="small"
+                      @click="handleAdd(data)"
+            >
+              <FormOutlined/>
+            </a-button>
+            <a-button type="link"
+                      size="small"
+                      @click="handleAdd(data)"
+            >
+              <DeleteOutlined/>
+            </a-button>
           </span>
-        </template>
-      </BasicTree>
-    </div>
+        </span>
+      </template>
+    </BasicTree>
     <BasicTable
       class="w-3/4 xl:w-4/5"
       @register="registerTable"