Merge branch 'master' into kitchenmanage

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}

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}>

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}>

src/pages/database/goods/goodstypemanage/components/CreateAttributeValue.jsx

@@ -99,6 +99,7 @@ const headleOk=()=>{
       onCancel={() => {
         props.onCancel();
       }}
+      maskClosable={false}
       destroyOnClose
     >
       <Form

src/pages/database/goods/goodstypemanage/components/CreateForm.jsx

@@ -13,6 +13,7 @@ const CreateForm = (props) => {
       onCancel={() => {
         props.onCancel();
       }}
+      maskClosable={false}
       destroyOnClose
     >
       <Form

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={() => {

src/pages/device/deviceVesion/components/CreateForm.jsx

@@ -79,6 +79,7 @@ const CreateForm = (props) => {
       onCancel={() => {
         props.onCancel();
       }}
+      maskClosable={false}
       destroyOnClose
     >
       <Form

src/pages/device/product/components/CreateForm.jsx

@@ -13,6 +13,7 @@ const CreateForm = (props) => {
       onCancel={() => {
         props.onCancel();
       }}
+      maskClosable={false}
       destroyOnClose
     >
       <Form

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={() => {

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={() => {

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: '创建时间',

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={() => {

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();
             }}