From 714686327e4468a37ba083e28359d78bf2d05b86 Mon Sep 17 00:00:00 2001
From: gwbvipvip <gwbvipvip@163.com>
Date: Thu, 22 Feb 2024 10:32:11 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/database/bom/index.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/database/bom/index.jsx b/src/pages/database/bom/index.jsx
index 22647fd..3bd25f8 100644
--- a/src/pages/database/bom/index.jsx
+++ b/src/pages/database/bom/index.jsx
@@ -215,6 +215,7 @@ const GoodsBomsManage = (props) => {
         columns={columns}
         actionRef={actionRef}
         rowKey="id"
+        pagination={{ defaultPageSize: 10 }}
         toolBarRender={() => [
           <Button
             type="primary"

From ca6ffe7a4c5da3ae484e2ff6635c51404a551442 Mon Sep 17 00:00:00 2001
From: zhaoy <137053305@qq.com>
Date: Thu, 22 Feb 2024 16:16:20 +0800
Subject: [PATCH 2/6] z

---
 src/pages/device/productmanage/components/CreateForm.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/device/productmanage/components/CreateForm.jsx b/src/pages/device/productmanage/components/CreateForm.jsx
index 7bc1228..c802699 100644
--- a/src/pages/device/productmanage/components/CreateForm.jsx
+++ b/src/pages/device/productmanage/components/CreateForm.jsx
@@ -43,6 +43,7 @@ const CreateForm = (props) => {
         if(props?.values?.type==1){
           setdisplay("none")
           setdisanumbled('none')
+          setdisplaytxtjson('none')
         }else if(props?.values?.type==0){
           setdisplay("block")
         }

From e23dd18d45011aa245ca1d0a7c9d95250b93b38f Mon Sep 17 00:00:00 2001
From: zhaoy <137053305@qq.com>
Date: Thu, 22 Feb 2024 16:21:49 +0800
Subject: [PATCH 3/6] z

---
 src/pages/device/productmanage/components/CreateForm.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/device/productmanage/components/CreateForm.jsx b/src/pages/device/productmanage/components/CreateForm.jsx
index c802699..e054b03 100644
--- a/src/pages/device/productmanage/components/CreateForm.jsx
+++ b/src/pages/device/productmanage/components/CreateForm.jsx
@@ -298,11 +298,11 @@ const onChangeboolLabel1=(e)=>{
           <Input placeholder="10240" defaultValue="10240" addonAfter="字节" />
        
         </Form.Item>
-        <Form.Item style={{display:displaytxtjson}}  name="dataJson" label="数组字符串" rules={[{ required: false }]}>
+        {/* <Form.Item style={{display:displaytxtjson}}  name="dataJson" label="数组字符串" rules={[{ required: false }]}>
           <TextArea
             placeholder="数据格式：[data1:{value1:'1'},{value2:'2'},data2:{value1:'1'},{value2:'2'}]"
             autoSize={{minRows: 10,maxRows: 100}}/>
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item style={{display:display}}  name="readWrite" label="读写类型" rules={[{ required: false }]}>
           <Radio.Group onChange={onChangewrite} name="radiogroup" defaultValue={0} value={ReadWrite}>
             <Radio value={0}>读写</Radio>

From f75dbea7f94fa54633a25870b9f9090463c6db63 Mon Sep 17 00:00:00 2001
From: zhaoy <137053305@qq.com>
Date: Thu, 22 Feb 2024 16:24:04 +0800
Subject: [PATCH 4/6] z

---
 src/pages/device/productmanage/components/CreateForm.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/device/productmanage/components/CreateForm.jsx b/src/pages/device/productmanage/components/CreateForm.jsx
index e054b03..c802699 100644
--- a/src/pages/device/productmanage/components/CreateForm.jsx
+++ b/src/pages/device/productmanage/components/CreateForm.jsx
@@ -298,11 +298,11 @@ const onChangeboolLabel1=(e)=>{
           <Input placeholder="10240" defaultValue="10240" addonAfter="字节" />
        
         </Form.Item>
-        {/* <Form.Item style={{display:displaytxtjson}}  name="dataJson" label="数组字符串" rules={[{ required: false }]}>
+        <Form.Item style={{display:displaytxtjson}}  name="dataJson" label="数组字符串" rules={[{ required: false }]}>
           <TextArea
             placeholder="数据格式：[data1:{value1:'1'},{value2:'2'},data2:{value1:'1'},{value2:'2'}]"
             autoSize={{minRows: 10,maxRows: 100}}/>
-        </Form.Item> */}
+        </Form.Item>
         <Form.Item style={{display:display}}  name="readWrite" label="读写类型" rules={[{ required: false }]}>
           <Radio.Group onChange={onChangewrite} name="radiogroup" defaultValue={0} value={ReadWrite}>
             <Radio value={0}>读写</Radio>

From 13c8e2d753488685f2962cd2a328cf5c700c3078 Mon Sep 17 00:00:00 2001
From: zhaoy <137053305@qq.com>
Date: Thu, 22 Feb 2024 16:33:01 +0800
Subject: [PATCH 5/6] z

---
 src/pages/device/productmanage/index.jsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pages/device/productmanage/index.jsx b/src/pages/device/productmanage/index.jsx
index b46fdfd..f127be2 100644
--- a/src/pages/device/productmanage/index.jsx
+++ b/src/pages/device/productmanage/index.jsx
@@ -211,6 +211,12 @@ const bomtechnology = (props) => {
     //   search: true,
     //   valueEnum:DeviceVesionEnum
     // },
+    {
+      title: '描述',
+      dataIndex: 'description',
+      valueType: 'textarea',
+      hideInSearch: true,
+    },
     {
       title: '创建时间',
       dataIndex: 'createAt',

From fdcc0398aca6b0f290ec5a2e45c7b450204cc261 Mon Sep 17 00:00:00 2001
From: zhaoy <137053305@qq.com>
Date: Thu, 22 Feb 2024 16:40:29 +0800
Subject: [PATCH 6/6] z

---
 .../device/productmanage/components/CreateForm.jsx    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/pages/device/productmanage/components/CreateForm.jsx b/src/pages/device/productmanage/components/CreateForm.jsx
index c802699..275bc44 100644
--- a/src/pages/device/productmanage/components/CreateForm.jsx
+++ b/src/pages/device/productmanage/components/CreateForm.jsx
@@ -13,6 +13,7 @@ const CreateForm = (props) => {
   const [displaybool,setdisplaybool]=useState('none');
   const [displaylength,setdisplaylength]=useState('none');
   const [displaytxtjson,setdisplaytxtjson]=useState('none');
+  const [disabledname,setdisabledname]=useState('false');
   const [minnumber, setminnumber] = useState(0);
   const [maxnumber, setmaxnumber] = useState(1);
   const [ReadWrite, setReadWrite] = useState(0);
@@ -83,9 +84,13 @@ const CreateForm = (props) => {
           setminnumber(0);
           setmaxnumber(1);
         }
-       
+        if(props?.values?.isDefault){
+          setdisabledname(true)
+        }else{
+          setdisabledname(false)
+        }
       }else{
-        
+        setdisabledname(false)
         console.log("xinjian")
         setDisabled(false);
         setdisplay("block")
@@ -234,7 +239,7 @@ const onChangeboolLabel1=(e)=>{
         </Form.Item>
         
         <Form.Item name="name" label="功能名称" rules={[{ required: true, max: 64, whitespace: true }]}>
-          <Input placeholder="请输入功能名称" />
+          <Input placeholder="请输入功能名称" disabled={disabledname} />
         </Form.Item>
         <Form.Item style={{display:display}} label={'数据类型'}  name="dataType" rules={[{ required: false }]}>
           <Select onChange={onChangedataType} defaultValue="digit">