Browse Source

权限修改

xjj 2 năm trước cách đây
mục cha
commit
dfc5253808
2 tập tin đã thay đổi với 69 bổ sung74 xóa
  1. 57 64
      src/components/Flow/node/rect/mapServe.tsx
  2. 12 10
      src/pages/Flow/Flow.js

+ 57 - 64
src/components/Flow/node/rect/mapServe.tsx

@@ -124,7 +124,7 @@ const Component = (props: any) => {
         });
       });
     } catch (error) {
-      message.error("excel文件导入失败!请联系管理员。")
+      message.error('excel文件导入失败!请联系管理员。');
       return false;
     }
   };
@@ -204,7 +204,6 @@ const Component = (props: any) => {
           onChange={value => {
             onNodeConfigChange('is_start_node', value);
           }}
-          disabled={meta?.editMode == 2}
           options={[
             { label: '是', value: 1 },
             { label: '否', value: 0 },
@@ -215,19 +214,16 @@ const Component = (props: any) => {
             <InputFiled
               label="模板名称"
               value={nodeConfig.version_name}
-              disabled={meta?.editMode == 2}
               onChange={value => {
                 onNodeConfigChange('version_name', value);
               }}
             />
 
-            {meta?.editMode == 1 && (
-              <UploadFiled
-                label="模板"
-                onChange={url => onNodeConfigChange('bom_template', url)}
-                beforeUpload={beforeUpload}
-              />
-            )}
+            <UploadFiled
+              label="模板"
+              onChange={url => onNodeConfigChange('bom_template', url)}
+              beforeUpload={beforeUpload}
+            />
 
             {/* <div onClick={handleFileNameClick}>{fileName}</div> */}
             <a href={nodeConfig.bom_template}>{fileName}</a>
@@ -252,68 +248,65 @@ const Component = (props: any) => {
         </div>
       </div>
       {meta?.editMode != 2 && (
-        <>
-          <div className={`${PREFIX}-panel-group`}>
-            <h5>样式</h5>
-            <Position
-              x={nodeConfig.x}
-              y={nodeConfig.y}
-              onChange={(key, value) => {
-                onNodeConfigChange(key, value);
-              }}
-            />
-            <Size
-              width={nodeConfig.width}
-              height={nodeConfig.height}
-              onChange={(key, value) => {
-                onNodeConfigChange(key, value);
-              }}
-            />
-            <ColorPicker
-              label="填充"
-              value={nodeConfig.fill}
-              onChange={(value: string) => {
-                onNodeConfigChange('fill', value);
+        <div className={`${PREFIX}-panel-group`}>
+          <h5>样式</h5>
+          <Position
+            x={nodeConfig.x}
+            y={nodeConfig.y}
+            onChange={(key, value) => {
+              onNodeConfigChange(key, value);
+            }}
+          />
+          <Size
+            width={nodeConfig.width}
+            height={nodeConfig.height}
+            onChange={(key, value) => {
+              onNodeConfigChange(key, value);
+            }}
+          />
+          <ColorPicker
+            label="填充"
+            value={nodeConfig.fill}
+            onChange={(value: string) => {
+              onNodeConfigChange('fill', value);
+            }}
+          />
+          <ColorPicker
+            label="边框"
+            value={nodeConfig.stroke}
+            onChange={(value: string) => {
+              onNodeConfigChange('stroke', value);
+            }}
+          />
+          <InputNumberFiled
+            label="消息数量"
+            value={nodeConfig.count}
+            onChange={value => {
+              onNodeConfigChange('count', value);
+            }}
+          />
+          <div style={{ display: 'flex' }}>
+            <InputNumberFiled
+              label="字号"
+              value={nodeConfig.fontSize}
+              width={68}
+              onChange={value => {
+                onNodeConfigChange('fontSize', value);
               }}
+              style={{ marginRight: 10 }}
             />
             <ColorPicker
-              label="边框"
-              value={nodeConfig.stroke}
+              value={nodeConfig.fontFill}
               onChange={(value: string) => {
-                onNodeConfigChange('stroke', value);
+                onNodeConfigChange('fontFill', value);
               }}
             />
-            <InputNumberFiled
-              label="消息数量"
-              value={nodeConfig.count}
-              onChange={value => {
-                onNodeConfigChange('count', value);
-              }}
-            />
-            <div style={{ display: 'flex' }}>
-              <InputNumberFiled
-                label="字号"
-                value={nodeConfig.fontSize}
-                width={68}
-                onChange={value => {
-                  onNodeConfigChange('fontSize', value);
-                }}
-                style={{ marginRight: 10 }}
-              />
-              <ColorPicker
-                value={nodeConfig.fontFill}
-                onChange={(value: string) => {
-                  onNodeConfigChange('fontFill', value);
-                }}
-              />
-            </div>
           </div>
-
-          <Button type="primary" onClick={onSave}>
-            保存
-          </Button>
-        </>
+        </div>
       )}
+      <Button type="primary" onClick={onSave}>
+        保存
+      </Button>
     </div>
   );
 };

+ 12 - 10
src/pages/Flow/Flow.js

@@ -67,7 +67,7 @@ class FlowPage extends React.PureComponent {
   getEditMode() {
     const { flowDetail, permission } = this.props;
 
-    return 2
+    return 2;
   }
   render() {
     const { flowDetail, permission, currentUser } = this.props;
@@ -76,9 +76,10 @@ class FlowPage extends React.PureComponent {
     if (
       // 判断是否有权限
       permission['func-01-point-bom-flow'] ||
-      // 判断是否为创建者
-      flowDetail.Creator == currentUser.ID) {
-      editMode = 1
+      // 判断是否为管理员
+      currentUser.IsSuper
+    ) {
+      editMode = 1;
     }
 
     return (
@@ -87,12 +88,13 @@ class FlowPage extends React.PureComponent {
         <Button style={{ marginBottom: 20 }} onClick={() => router.go(-1)}>
           返回
         </Button>
-        {currentUser.ID && <Flow
-          meta={{ type: 'edit', editMode, flowId: 1 }}
-          flowDetail={flowDetail}
-        // onUpdate={node => this.onUpdate(node)}
-        />}
-
+        {currentUser.ID && (
+          <Flow
+            meta={{ type: 'edit', editMode, flowId: 1 }}
+            flowDetail={flowDetail}
+            // onUpdate={node => this.onUpdate(node)}
+          />
+        )}
       </div>
     );
   }