瀏覽代碼

feat: 优化通知管理按钮权限

xieyonghong 3 年之前
父節點
當前提交
f4273c553b

+ 4 - 4
src/components/FRuleEditor/Advance/index.tsx

@@ -15,7 +15,7 @@ interface Props {
 
 const Advance = (props: Props) => {
   const { onChange, virtualRule } = props;
-  const [success, setSuccess] = useState(false);
+  const [, setSuccess] = useState(false);
   const [editorValue, setEditorValue] = useState(virtualRule.script);
   const cacheRef = useRef(virtualRule.script);
   return (
@@ -29,9 +29,9 @@ const Advance = (props: Props) => {
         Store.set('rule-editor-value', cacheRef.current);
         onChange('simple');
       }}
-      okButtonProps={{
-        disabled: !success,
-      }}
+      // okButtonProps={{
+      //   disabled: !success,
+      // }}
     >
       <div className={styles.box}>
         <div className={styles.left}>

+ 5 - 15
src/components/Metadata/JsonParam/index.tsx

@@ -5,7 +5,6 @@ import { DataTypeList, DateTypeList, FileTypeList } from '@/pages/device/data';
 import { Store } from 'jetlinks-store';
 import { useAsyncDataSource } from '@/utils/util';
 import { service } from '@/pages/device/components/Metadata';
-import MetadataModel from '@/pages/device/components/Metadata/Base/model';
 import BooleanEnum from '@/components/Metadata/BooleanParam';
 import EnumParam from '@/components/Metadata/EnumParam';
 import ArrayParam from '@/components/Metadata/ArrayParam';
@@ -158,20 +157,11 @@ const JsonParam = observer((props: Props) => {
                       required: true,
                       'x-decorator': 'FormItem',
                       'x-component': 'Select',
-                      enum:
-                        MetadataModel.type === 'functions'
-                          ? DataTypeList.filter((item) => item.value !== 'file')
-                          : DataTypeList.filter((item) =>
-                              [
-                                'int',
-                                'long',
-                                'float',
-                                'double',
-                                'string',
-                                'boolean',
-                                'date',
-                              ].includes(item.value),
-                            ),
+                      enum: DataTypeList.filter((item) =>
+                        ['int', 'long', 'float', 'double', 'string', 'boolean', 'date'].includes(
+                          item.value,
+                        ),
+                      ),
                     },
                     booleanConfig: {
                       title: '布尔值',

+ 1 - 1
src/pages/device/components/Metadata/index.tsx

@@ -87,7 +87,7 @@ const Metadata = observer((props: Props) => {
                 defaultMessage: '快速导入',
               })}
             </PermissionButton>
-            <PermissionButton isPermission={permission.update} onClick={() => setCat(true)}>
+            <PermissionButton isPermission={true} onClick={() => setCat(true)}>
               {intl.formatMessage({
                 id: 'pages.device.productDetail.metadata',
                 defaultMessage: '物模型',

+ 2 - 0
src/pages/media/Device/Save/SaveProduct.tsx

@@ -29,6 +29,8 @@ export default (props: SaveProps) => {
         terms: [{ column: 'provider', value: props.type }],
         pageSize: 100,
       });
+    } else {
+      setExtendFormItem([]);
     }
   }, [visible]);
 

+ 1 - 1
src/pages/notice/Config/index.tsx

@@ -49,7 +49,7 @@ const Config = observer(() => {
   const actionRef = useRef<ActionType>();
   // const location = useLocation<{ id: string }>();
 
-  const { permission: configPermission } = usePermissions('notice/Template');
+  const { permission: configPermission } = usePermissions('notice/Config');
   // const id = (location as any).query?.id;
 
   const columns: ProColumns<ConfigItem>[] = [

+ 1 - 1
src/pages/notice/Template/index.tsx

@@ -49,7 +49,7 @@ const Template = observer(() => {
   // const id = (location as any).query?.id;
   const actionRef = useRef<ActionType>();
 
-  const { permission: templatePermission } = usePermissions('notice/Config');
+  const { permission: templatePermission } = usePermissions('notice/Template');
 
   const columns: ProColumns<TemplateItem>[] = [
     {

+ 2 - 72
src/pages/system/Menu/Setting/baseMenu.ts

@@ -76,10 +76,6 @@ export default [
                     actions: ['query'],
                   },
                   {
-                    permission: 'template',
-                    actions: ['query'],
-                  },
-                  {
                     permission: 'user-third-party-manager',
                     actions: ['query', 'save'],
                   },
@@ -97,10 +93,6 @@ export default [
                     permission: 'notifier',
                     actions: ['query'],
                   },
-                  {
-                    permission: 'template',
-                    actions: ['query'],
-                  },
                 ],
               },
               {
@@ -143,10 +135,6 @@ export default [
                     permission: 'notifier',
                     actions: ['query'],
                   },
-                  {
-                    permission: 'template',
-                    actions: ['query'],
-                  },
                 ],
               },
               {
@@ -157,10 +145,6 @@ export default [
                     permission: 'notifier',
                     actions: ['query', 'save'],
                   },
-                  {
-                    permission: 'template',
-                    actions: ['query', 'save'],
-                  },
                 ],
               },
               {
@@ -171,10 +155,6 @@ export default [
                     permission: 'notifier',
                     actions: ['query', 'delete'],
                   },
-                  {
-                    permission: 'template',
-                    actions: ['query', 'delete'],
-                  },
                 ],
               },
               {
@@ -185,10 +165,6 @@ export default [
                     permission: 'notifier',
                     actions: ['query', 'save'],
                   },
-                  {
-                    permission: 'template',
-                    actions: ['query', 'save'],
-                  },
                 ],
               },
               {
@@ -199,10 +175,6 @@ export default [
                     permission: 'notifier',
                     actions: ['query', 'save'],
                   },
-                  {
-                    permission: 'template',
-                    actions: ['query', 'save'],
-                  },
                 ],
               },
             ],
@@ -219,37 +191,11 @@ export default [
             showPage: ['template'],
             permissions: [],
             buttons: [
-              // {
-              //   id: 'bind',
-              //   name: '同步用户',
-              //   permissions: [
-              //     {
-              //       permission: 'notifier',
-              //       actions: ['query'],
-              //     },
-              //     {
-              //       permission: 'template',
-              //       actions: ['query'],
-              //     },
-              //     {
-              //       permission: 'user-third-party-manager',
-              //       actions: ['query', 'save'],
-              //     },
-              //     {
-              //       permission: 'user',
-              //       actions: ['query'],
-              //     },
-              //   ],
-              // },
               {
                 id: 'view',
                 name: '查看',
                 permissions: [
                   {
-                    permission: 'notifier',
-                    actions: ['query'],
-                  },
-                  {
                     permission: 'template',
                     actions: ['query'],
                   },
@@ -260,10 +206,6 @@ export default [
                 name: '通知记录',
                 permissions: [
                   {
-                    permission: 'notifier',
-                    actions: ['query'],
-                  },
-                  {
                     permission: 'template',
                     actions: ['query'],
                   },
@@ -292,10 +234,6 @@ export default [
                 name: '导出',
                 permissions: [
                   {
-                    permission: 'notifier',
-                    actions: ['query'],
-                  },
-                  {
                     permission: 'template',
                     actions: ['query'],
                   },
@@ -306,10 +244,6 @@ export default [
                 name: '导入',
                 permissions: [
                   {
-                    permission: 'notifier',
-                    actions: ['query', 'save'],
-                  },
-                  {
                     permission: 'template',
                     actions: ['query', 'save'],
                   },
@@ -320,10 +254,6 @@ export default [
                 name: '删除',
                 permissions: [
                   {
-                    permission: 'notifier',
-                    actions: ['query', 'delete'],
-                  },
-                  {
                     permission: 'template',
                     actions: ['query', 'delete'],
                   },
@@ -335,7 +265,7 @@ export default [
                 permissions: [
                   {
                     permission: 'notifier',
-                    actions: ['query', 'save'],
+                    actions: ['query'],
                   },
                   {
                     permission: 'template',
@@ -349,7 +279,7 @@ export default [
                 permissions: [
                   {
                     permission: 'notifier',
-                    actions: ['query', 'save'],
+                    actions: ['query'],
                   },
                   {
                     permission: 'template',