From 8327e0d70ead00fd5f0dc54c5c3605f640e1375c Mon Sep 17 00:00:00 2001
From: zhaoy <137053305@qq.com>
Date: Wed, 31 Jan 2024 15:30:02 +0800
Subject: [PATCH 1/2] z

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

diff --git a/src/pages/sys/menus/components/CreateForm.jsx b/src/pages/sys/menus/components/CreateForm.jsx
index a5951e9..48e3ffe 100644
--- a/src/pages/sys/menus/components/CreateForm.jsx
+++ b/src/pages/sys/menus/components/CreateForm.jsx
@@ -31,12 +31,12 @@ const CreateForm = (props) => {
         </Form.Item>
         <Row>
           <Col span={12}>
-            <Form.Item name="code" label="菜单编码" rules={[{ required: true, max: 255 }]}>
+            <Form.Item name="code" label="菜单编码" rules={[{ required: true }]}>
               <Input placeholder="请输入菜单编码" />
             </Form.Item>
           </Col>
           <Col span={12}>
-            <Form.Item name="name" label="菜单名称" rules={[{ required: true, max: 255 }]}>
+            <Form.Item name="name" label="菜单名称" rules={[{ required: true}]}>
               <Input placeholder="请输入菜单名称" />
             </Form.Item>
           </Col>

From 4c41a155bdf0ba38e7c0373c8bf65a5ebef7b184 Mon Sep 17 00:00:00 2001
From: zhaoy <137053305@qq.com>
Date: Wed, 31 Jan 2024 15:40:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/database/goods/goodsInfo/components/CreateBom.jsx     | 1 +
 src/pages/database/goods/goodsInfo/components/GoodsbomFrom.jsx  | 1 +
 src/pages/database/goods/goodsInfo/components/UpdateBom.jsx     | 1 +
 .../goods/goodstypemanage/components/CreateAttributeValue.jsx   | 1 +
 .../database/goods/goodstypemanage/components/CreateForm.jsx    | 1 +
 src/pages/device/deviceInfo/components/CreateForm.jsx           | 1 +
 src/pages/device/deviceVesion/components/CreateForm.jsx         | 1 +
 src/pages/device/product/components/CreateForm.jsx              | 1 +
 src/pages/org/orgamange/components/CreateForm.jsx               | 1 +
 src/pages/org/roles/components/CreateForm.jsx                   | 1 +
 src/pages/org/roles/index.jsx                                   | 2 ++
 src/pages/org/users/components/CreateForm.jsx                   | 1 +
 src/pages/org/users/components/PwdForm.jsx                      | 1 +
 13 files changed, 14 insertions(+)

diff --git a/src/pages/database/goods/goodsInfo/components/CreateBom.jsx b/src/pages/database/goods/goodsInfo/components/CreateBom.jsx
index b6865b2..6600c04 100644
--- a/src/pages/database/goods/goodsInfo/components/CreateBom.jsx
+++ b/src/pages/database/goods/goodsInfo/components/CreateBom.jsx
@@ -164,6 +164,7 @@ const GoodsbomFrom = (props) => {
       onCancel={() => {
         props.onCancel();
       }}
+      maskClosable={false}
       destroyOnClose
     >
       <Form layout="horizontal" preserve={false}  form={form}
diff --git a/src/pages/database/goods/goodsInfo/components/GoodsbomFrom.jsx b/src/pages/database/goods/goodsInfo/components/GoodsbomFrom.jsx
index 3e98419..511e5e8 100644
--- a/src/pages/database/goods/goodsInfo/components/GoodsbomFrom.jsx
+++ b/src/pages/database/goods/goodsInfo/components/GoodsbomFrom.jsx
@@ -15,6 +15,7 @@ const GoodsbomFrom = (props) => {
       onCancel={() => {
         props.onCancel();
       }}
+      maskClosable={false}
       destroyOnClose
     >
       <Form labelCol={{ span: 4 }} layout="horizontal" preserve={false} onFinish={props.onFinish}>
diff --git a/src/pages/database/goods/goodsInfo/components/UpdateBom.jsx b/src/pages/database/goods/goodsInfo/components/UpdateBom.jsx
index d51ea4c..e76b293 100644
--- a/src/pages/database/goods/goodsInfo/components/UpdateBom.jsx
+++ b/src/pages/database/goods/goodsInfo/components/UpdateBom.jsx
@@ -57,6 +57,7 @@ const UpdateBom = (props) => {
       onCancel={() => {
         props.onUpdateBomCancel();
       }}
+      maskClosable={false}
       destroyOnClose
     >
       <Form labelCol={{ span: 4 }} layout="horizontal" form={form} preserve={false}>
diff --git a/src/pages/database/goods/goodstypemanage/components/CreateAttributeValue.jsx b/src/pages/database/goods/goodstypemanage/components/CreateAttributeValue.jsx
index fd49a9e..fa79545 100644
--- a/src/pages/database/goods/goodstypemanage/components/CreateAttributeValue.jsx
+++ b/src/pages/database/goods/goodstypemanage/components/CreateAttributeValue.jsx
@@ -99,6 +99,7 @@ const headleOk=()=>{
       onCancel={() => {
         props.onCancel();
       }}
+      maskClosable={false}
       destroyOnClose
     >
       <Form
diff --git a/src/pages/database/goods/goodstypemanage/components/CreateForm.jsx b/src/pages/database/goods/goodstypemanage/components/CreateForm.jsx
index cd83016..23b6d38 100644
--- a/src/pages/database/goods/goodstypemanage/components/CreateForm.jsx
+++ b/src/pages/database/goods/goodstypemanage/components/CreateForm.jsx
@@ -13,6 +13,7 @@ const CreateForm = (props) => {
       onCancel={() => {
         props.onCancel();
       }}
+      maskClosable={false}
       destroyOnClose
     >
       <Form
diff --git a/src/pages/device/deviceInfo/components/CreateForm.jsx b/src/pages/device/deviceInfo/components/CreateForm.jsx
index 7c6afee..98c61ac 100644
--- a/src/pages/device/deviceInfo/components/CreateForm.jsx
+++ b/src/pages/device/deviceInfo/components/CreateForm.jsx
@@ -52,6 +52,7 @@ const CreateForm = (props) => {
       title={props.values.id ? '编辑' : '新建'}
       width={640}
       visible={props.createModalVisible}
+      maskClosable={false}
       bodyStyle={{ padding: '32px 40px 48px' }}
       footer={null}
       onCancel={() => {
diff --git a/src/pages/device/deviceVesion/components/CreateForm.jsx b/src/pages/device/deviceVesion/components/CreateForm.jsx
index e11a02d..130c31d 100644
--- a/src/pages/device/deviceVesion/components/CreateForm.jsx
+++ b/src/pages/device/deviceVesion/components/CreateForm.jsx
@@ -79,6 +79,7 @@ const CreateForm = (props) => {
       onCancel={() => {
         props.onCancel();
       }}
+      maskClosable={false}
       destroyOnClose
     >
       <Form
diff --git a/src/pages/device/product/components/CreateForm.jsx b/src/pages/device/product/components/CreateForm.jsx
index 485bb8a..15acca9 100644
--- a/src/pages/device/product/components/CreateForm.jsx
+++ b/src/pages/device/product/components/CreateForm.jsx
@@ -13,6 +13,7 @@ const CreateForm = (props) => {
       onCancel={() => {
         props.onCancel();
       }}
+      maskClosable={false}
       destroyOnClose
     >
       <Form
diff --git a/src/pages/org/orgamange/components/CreateForm.jsx b/src/pages/org/orgamange/components/CreateForm.jsx
index ca34399..95dfdba 100644
--- a/src/pages/org/orgamange/components/CreateForm.jsx
+++ b/src/pages/org/orgamange/components/CreateForm.jsx
@@ -20,6 +20,7 @@ const CreateForm = (props) => {
       title={props.values.id ? '编辑机构' : '新建机构'}
       width={640}
       visible={props.modalVisible}
+      maskClosable={false}
       bodyStyle={{ padding: '32px 40px 1px 48px' }}
       footer={null}
       onCancel={() => {
diff --git a/src/pages/org/roles/components/CreateForm.jsx b/src/pages/org/roles/components/CreateForm.jsx
index 0ad789d..708c3af 100644
--- a/src/pages/org/roles/components/CreateForm.jsx
+++ b/src/pages/org/roles/components/CreateForm.jsx
@@ -7,6 +7,7 @@ const CreateForm = (props) => {
       title={props.values.id ? '编辑角色' : '新建角色'}
       width={1000}
       visible={props.modalVisible}
+      maskClosable={false}
       bodyStyle={{ padding: '32px 40px 1px 48px' }}
       footer={null}
       onCancel={() => {
diff --git a/src/pages/org/roles/index.jsx b/src/pages/org/roles/index.jsx
index 3be7248..d33914e 100644
--- a/src/pages/org/roles/index.jsx
+++ b/src/pages/org/roles/index.jsx
@@ -205,11 +205,13 @@ const roleManager = () => {
     {
       title: '角色名称',
       dataIndex: 'name',
+      ellipsis: true,
     },
     {
       title: '备注',
       dataIndex: 'remark',
       hideInSearch: true,
+      ellipsis: true,
     },
     {
       title: '创建时间',
diff --git a/src/pages/org/users/components/CreateForm.jsx b/src/pages/org/users/components/CreateForm.jsx
index 6332779..e379f01 100644
--- a/src/pages/org/users/components/CreateForm.jsx
+++ b/src/pages/org/users/components/CreateForm.jsx
@@ -20,6 +20,7 @@ const CreateForm = (props) => {
             title={props.values.id ? '编辑用户' : '新建用户'}
             width={640}
             visible={props.modalVisible}
+            maskClosable={false}
             bodyStyle={{ padding: '32px 40px 1px 48px' }}
             footer={null}
             onCancel={() => {
diff --git a/src/pages/org/users/components/PwdForm.jsx b/src/pages/org/users/components/PwdForm.jsx
index 8f2d7c5..f08c1ee 100644
--- a/src/pages/org/users/components/PwdForm.jsx
+++ b/src/pages/org/users/components/PwdForm.jsx
@@ -12,6 +12,7 @@ const PwdForm = (props) => {
             visible={props.pwdVisible}
             bodyStyle={{ padding: '32px 40px 1px 48px' }}
             footer={null}
+            maskClosable={false}
             onCancel={() => {
                 props.onCancel();
             }}