Change some jsx code format

juneszh · Sep 19, 2022 · 124cca2 · 124cca2
1 parent d2ad858
commit 124cca2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 24 deletions.
diff --git a/npm/src/components/Console.js b/npm/src/components/Console.js
@@ -132,9 +132,7 @@ const Console = props => {
             for (const [chartKey, chartValue] of Object.entries(global.config.chart)) {
                 return (
                     <Col {...chartValue.grid}>
-                        <Card>
-                            {chartComponent(chartKey, chartValue.component, chartValue.config)}
-                        </Card>
+                        <Card children={chartComponent(chartKey, chartValue.component, chartValue.config)} />
                     </Col>
                 );
             }

diff --git a/npm/src/components/Error.js b/npm/src/components/Error.js
@@ -19,9 +19,11 @@ const Error = props => {
             }
         }, 1000);
         return (
-            <Button type='primary' onClick={() => { redirect(global.path + '/login'); }} >
-                {localeValue(':login') + ' (' + countDown + ')'}
-            </Button>
+            <Button
+                type='primary'
+                onClick={() => { redirect(global.path + '/login'); }}
+                children={localeValue(':login') + ' (' + countDown + ')'}
+            />
         );
     };
 

diff --git a/npm/src/components/Home.js b/npm/src/components/Home.js
@@ -72,9 +72,8 @@ const Home = props => {
                                 href={subValue.url + (subValue.url.indexOf('?') !== -1 ? '&' : '?') + '_title=' + (itemKey === '1' ? localeValue(subValue.title) : subValue.title)}
                                 rel='noopener noreferrer'
                                 onClick={e => menuAction(e, subValue)}
-                            >
-                                {itemKey === '1' ? localeValue(subValue.title) : subValue.title}
-                            </a>
+                                children={itemKey === '1' ? localeValue(subValue.title) : subValue.title}
+                            />
                         );
                     }
                     item.children.push(children);
@@ -87,9 +86,8 @@ const Home = props => {
                             href={itemValue.url + (itemValue.url.indexOf('?') !== -1 ? '&' : '?') + '_title=' + itemValue.title}
                             rel='noopener noreferrer'
                             onClick={e => menuAction(e, itemValue)}
-                        >
-                            {itemValue.title}
-                        </a>
+                            children={itemValue.title}
+                        />
                     );
                 }
             }

diff --git a/npm/src/components/Login.js b/npm/src/components/Login.js
@@ -39,9 +39,7 @@ const Login = props => {
             style={{ minHeight: '100vh', height: 'auto', backgroundColor: '#f0f2f5' }}
         >
             <Col style={{ width: '320px' }}>
-                <h1 style={{ textAlign: 'center', fontWeight: 'bold', marginBottom: '40px' }} >
-                    {global.title}
-                </h1>
+                <h1 style={{ textAlign: 'center', fontWeight: 'bold', marginBottom: '40px' }} children={global.title} />
                 <Form
                     form={form}
                     initialValues={{
@@ -111,18 +109,15 @@ const Login = props => {
                             type='primary'
                             htmlType='submit'
                             block
-                        >
-                            {localeValue(':login')}
-                        </Button>
+                            children={localeValue(':login')}
+                        />
                     </Form.Item>
                     <Form.Item
                         name='remember'
                         valuePropName='checked'
                         style={{ textAlign: 'right' }}
                     >
-                        <Checkbox>
-                            {localeValue(':remember')}
-                        </Checkbox>
+                        <Checkbox children={localeValue(':remember')} />
                     </Form.Item>
                 </Form>
             </Col>

diff --git a/npm/src/global.js b/npm/src/global.js
@@ -98,7 +98,7 @@ const ModelKit = forwardRef((props, ref) => {
         setIsModalDestroy(false);
         setIsModalOpen(true);
     };
-    
+
     const modalMessage = useCallback(event => {
         if (event.origin === window.location.origin) {
             if (event.data.error === 0) {
@@ -123,7 +123,7 @@ const ModelKit = forwardRef((props, ref) => {
         <Modal title={modalConfig.title}
             centered
             open={modalOpen}
-            destroyOnClose = {modalDestroy}
+            destroyOnClose={modalDestroy}
             footer={false}
             onCancel={modalHide}
             bodyStyle={{ display: 'flex', padding: 0, maxHeight: 'calc(90vh - 55px)', height: modalHeight, transition: 'height .2s ease-out' }}
@@ -133,7 +133,7 @@ const ModelKit = forwardRef((props, ref) => {
                 title='modalFrame'
                 src={modalConfig.url}
                 style={{ border: 'none', flex: '1 1 auto' }}
-            ></iframe>
+            />
         </Modal>
     );
 });