From 5d2c1d6e2bfa0e770bfde3eab3e459e0601014a5 Mon Sep 17 00:00:00 2001
From: xujiang <xujiang156@qq.com>
Date: Sun, 18 Oct 2020 14:37:20 +0800
Subject: [PATCH] =?UTF-8?q?:new:=20=E6=B7=BB=E5=8A=A0GPL-3.0=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE,=20=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=99=BD=E6=A0=87=E9=A2=98=E5=AD=97=E9=87=8D?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  4 +--
 .../BasicShop/BasicComponents/Form/index.tsx  | 21 +++++++++--
 .../BasicShop/BasicComponents/Form/schema.ts  | 36 ++++++++++++++++++-
 yarn.lock                                     |  8 ++---
 4 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 3980335..533bd74 100644
--- a/package.json
+++ b/package.json
@@ -83,11 +83,11 @@
     "umi": "^3.2.19",
     "video-react": "^0.14.1",
     "xlsx": "^0.16.7",
-    "yh-react-popover": "^0.2.0",
+    "yh-react-popover": "^0.3.0",
     "yorkie": "^2.0.0",
     "zarm": "^2.5.1"
   },
-  "license": "MIT",
+  "license": "GPL-3.0",
   "devDependencies": {
     "@types/classnames": "^2.2.10",
     "@types/codemirror": "^0.0.98",
diff --git a/src/components/BasicShop/BasicComponents/Form/index.tsx b/src/components/BasicShop/BasicComponents/Form/index.tsx
index a0a6662..d91ee3a 100644
--- a/src/components/BasicShop/BasicComponents/Form/index.tsx
+++ b/src/components/BasicShop/BasicComponents/Form/index.tsx
@@ -5,7 +5,17 @@ import styles from './index.less';
 import { IFormConfig } from './schema';
 import logo from '@/assets/03-表单.png';
 const FormComponent = (props: IFormConfig & { isTpl: boolean }) => {
-  const { title, bgColor, fontSize, titColor, btnColor, btnTextColor, api, formControls } = props;
+  const {
+    title,
+    bgColor,
+    fontSize,
+    titColor,
+    btnColor,
+    titWeight,
+    btnTextColor,
+    api,
+    formControls,
+  } = props;
   const formData: Record<string, any> = {};
   const handleChange = useCallback(
     (item, v) => {
@@ -43,14 +53,19 @@ const FormComponent = (props: IFormConfig & { isTpl: boolean }) => {
           }}
         >
           {title && (
-            <div className={styles.title} style={{ fontSize, color: titColor }}>
+            <div
+              className={styles.title}
+              style={{ fontSize, fontWeight: +titWeight, color: titColor }}
+            >
               {title}
             </div>
           )}
           <div className={styles.formContent}>
             {formControls.map(item => {
               const FormItem = BaseForm[item.type];
-              return <FormItem onChange={handleChange.bind(this, item)} {...item} key={item.id} />;
+              return (
+                <FormItem onChange={(v: string) => handleChange(item, v)} {...item} key={item.id} />
+              );
             })}
             <div style={{ textAlign: 'center', padding: '16px 0' }}>
               <Button
diff --git a/src/components/BasicShop/BasicComponents/Form/schema.ts b/src/components/BasicShop/BasicComponents/Form/schema.ts
index 89185a9..2327cf3 100644
--- a/src/components/BasicShop/BasicComponents/Form/schema.ts
+++ b/src/components/BasicShop/BasicComponents/Form/schema.ts
@@ -6,16 +6,26 @@ import {
   TColorDefaultType,
   TFormItemsDefaultType,
   TNumberDefaultType,
+  TSelectDefaultType,
+  ISelectConfigType,
   TTextDefaultType,
 } from '@/components/PanelComponents/FormEditor/types';
 
+export type TTextWeightSelectKeyType = '300' | '400' | '500' | '600';
+
 export type TFormEditData = Array<
-  ITextConfigType | INumberConfigType | IColorConfigType | ITextConfigType | IFormItemsConfigType
+  | ITextConfigType
+  | INumberConfigType
+  | IColorConfigType
+  | ITextConfigType
+  | IFormItemsConfigType
+  | ISelectConfigType<TTextWeightSelectKeyType>
 >;
 export interface IFormConfig {
   title: TTextDefaultType;
   fontSize: TNumberDefaultType;
   titColor: TColorDefaultType;
+  titWeight: TSelectDefaultType<TTextWeightSelectKeyType>;
   bgColor: TColorDefaultType;
   btnColor: TColorDefaultType;
   btnTextColor: TColorDefaultType;
@@ -45,6 +55,29 @@ const Form: IFormSchema = {
       name: '标题颜色',
       type: 'Color',
     },
+    {
+      key: 'titWeight',
+      name: '标题粗细',
+      type: 'Select',
+      range: [
+        {
+          key: '300',
+          text: '300 x 300',
+        },
+        {
+          key: '400',
+          text: '400 x 400',
+        },
+        {
+          key: '500',
+          text: '500 x 500',
+        },
+        {
+          key: '600',
+          text: '600 x 600',
+        },
+      ],
+    },
     {
       key: 'bgColor',
       name: '背景色',
@@ -75,6 +108,7 @@ const Form: IFormSchema = {
     title: '表单定制组件',
     fontSize: 18,
     titColor: 'rgba(60,60,60,1)',
+    titWeight: '400',
     bgColor: 'rgba(255,255,255,1)',
     btnColor: 'rgba(129,173,173,1)',
     btnTextColor: 'rgba(255,255,255,1)',
diff --git a/yarn.lock b/yarn.lock
index c6419c4..012802d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14691,10 +14691,10 @@ yeast@0.1.2:
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
   integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
 
-yh-react-popover@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/yh-react-popover/-/yh-react-popover-0.2.0.tgz#a5e3bdaa50b5e7e119bf0ce38a24bea57068cfc4"
-  integrity sha512-cTH2huOrUvsbyhvH0iTE+S/Lu7dOpxuF8upyNP4GCsCN8IzQXLvlbxZl8395wOwa6Xm5+kT7QvZw+wI3vA8q8Q==
+yh-react-popover@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/yh-react-popover/-/yh-react-popover-0.3.0.tgz#016c6d48a63e0d8538bd2827b513dfe6519629ff"
+  integrity sha512-YCE3ESEkFw3FMY7pL7DkPPFW394dmbaGXxhhzsOllDxAhHqjc7f3CYmAbBbnNwTNQSA4v51gHUjt+8ccIQDohg==
 
 ylru@^1.2.0:
   version "1.2.1"