From 28bbbe7b599febe62aadd6508425be6fea2cb5bd Mon Sep 17 00:00:00 2001
From: Tyh2001 <1469442737@qq.com>
Date: Mon, 8 May 2023 21:39:12 +0800
Subject: [PATCH] =?UTF-8?q?revert:=20=E5=8F=91=E5=B8=83=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=200.36.1=20(2023-05-08)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  5 ++
 .../form-item/src/form-item.vue               |  4 +-
 packages/fighting-design/form/src/form.vue    |  3 +
 packages/fighting-design/package.json         |  2 +-
 packages/fighting-theme/src/dialog.scss       |  1 -
 start/src/App.vue                             | 59 ++++++++++++++++++-
 6 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a398a0f7e..a45b086c37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 中文 | [英文](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md)
 
+## 0.36.1 (2023-05-08)
+
+- 修复 `f-dialog` 样式问题
+- `f-form` 新增 `submit` 和 `validate` 方法
+
 ## 0.36.0 (2023-05-08)
 
 **优化**
diff --git a/packages/fighting-design/form-item/src/form-item.vue b/packages/fighting-design/form-item/src/form-item.vue
index bf5289dad1..6debaa9d8f 100644
--- a/packages/fighting-design/form-item/src/form-item.vue
+++ b/packages/fighting-design/form-item/src/form-item.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="FFormItem">
   import { Props } from './props'
   import { inject, computed } from 'vue'
-  import { isString } from '../../_utils'
+  import { isString, sizeChange } from '../../_utils'
   import { FORM_PROVIDE_KEY } from '../../form/src/props'
   import type { CSSProperties } from 'vue'
   import type { FormInject } from '../../form'
@@ -30,7 +30,7 @@
   /** 样式列表 */
   const styleList = computed((): CSSProperties => {
     return {
-      '--form-item-label-width': parentInject && parentInject.labelWidth
+      '--form-item-label-width': parentInject && sizeChange(parentInject.labelWidth)
     } as CSSProperties
   })
 
diff --git a/packages/fighting-design/form/src/form.vue b/packages/fighting-design/form/src/form.vue
index 40c7a2bff5..4150c353f4 100644
--- a/packages/fighting-design/form/src/form.vue
+++ b/packages/fighting-design/form/src/form.vue
@@ -149,6 +149,9 @@
       childrenCheckResult
     })
   )
+
+  /** 向外界导出一些方法 */
+  defineExpose({ submit: handelSubmit, validate })
 </script>
 
 <template>
diff --git a/packages/fighting-design/package.json b/packages/fighting-design/package.json
index 9dbb184dce..6adc86a04e 100644
--- a/packages/fighting-design/package.json
+++ b/packages/fighting-design/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fighting-design",
-  "version": "0.36.0",
+  "version": "0.36.1",
   "description": "Fighting design can quickly build interactive interfaces in vue3 applications, which looks good.",
   "keywords": [
     "fighting",
diff --git a/packages/fighting-theme/src/dialog.scss b/packages/fighting-theme/src/dialog.scss
index 441a7d2ecb..0416874e92 100644
--- a/packages/fighting-theme/src/dialog.scss
+++ b/packages/fighting-theme/src/dialog.scss
@@ -2,7 +2,6 @@
   border-radius: 4px;
   min-width: var(--dialog-width, 400px);
   max-width: inherit;
-  background: #fff;
 
   // 头部
   &__header {
diff --git a/start/src/App.vue b/start/src/App.vue
index 1c772edac4..c9ef749ce7 100644
--- a/start/src/App.vue
+++ b/start/src/App.vue
@@ -1,3 +1,58 @@
-<script lang="ts" setup></script>
+<script lang="ts" setup>
+  import { reactive, ref } from 'vue'
+  import { FMessage } from 'fighting-design'
+  import type { FormParam } from 'fighting-design'
 
-<template></template>
+  const ruleForm2 = reactive({
+    account: '',
+    password: ''
+  })
+
+  const handelSubmit2 = ({ ok, res, evt }: FormParam): void => {
+    console.log(123)
+    if (!ok) return
+    FMessage.primary(`ok: ${ok} res: ${res} evt: ${evt} 开始提交表单`)
+  }
+
+  const formInstance = ref()
+
+  const text = (evt): void => {
+    formInstance.value.handelSubmit(evt)
+    console.log(formInstance.value.validate())
+  }
+</script>
+
+<template>
+  {{ ruleForm2 }}
+  <f-form
+    ref="formInstance"
+    :model="ruleForm2"
+    :on-submit="handelSubmit2"
+  >
+    <f-form-item
+      name="account"
+      :rules="[
+        { required: true, message: '请输入用户名' },
+        { min: 4, max: 12, message: '请输入 4~12 用户名' },
+        { regExp: /123456/, message: '必须包含 123456' }
+      ]"
+    >
+      <f-input v-model="ruleForm2.account" type="text" placeholder="请输入账号" />
+    </f-form-item>
+
+    <f-form-item
+      label="密码"
+      name="password"
+      :rules="[
+        { required: true, message: '请输入密码' },
+        { min: 6, message: '至少输入六位数密码' }
+      ]"
+    >
+      <f-input v-model="ruleForm2.password" type="password" placeholder="请输入密码" />
+    </f-form-item>
+
+    <f-button type="primary" native-type="submit" block>提交表单</f-button>
+  </f-form>
+
+  <f-button type="primary" block :on-click="text">提交表单2</f-button>
+</template>