Merge pull request #636 from idurar/dev

🐛 Fix Update bugs
idurar · Nov 1, 2023 · c7f1429 · c7f1429
2 parents 2636ba2 + c99aef6
commit c7f1429
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/frontend/src/components/AutoCompleteAsync/index.jsx b/frontend/src/components/AutoCompleteAsync/index.jsx
@@ -2,7 +2,7 @@ import { useState, useEffect, useRef } from 'react';
 import { request } from '@/request';
 import useOnFetch from '@/hooks/useOnFetch';
 import { useDebounce } from 'react-use';
-import { Select } from 'antd';
+import { Select, Empty } from 'antd';
 
 export default function AutoCompleteAsync({
   entity,
@@ -96,16 +96,19 @@ export default function AutoCompleteAsync({
       allowClear
       placeholder={'Search Here'}
       defaultActiveFirstOption={false}
-      showArrow={false}
       filterOption={false}
-      notFoundContent={searching ? '... Searching' : 'Not Found'}
+      notFoundContent={searching ? '... Searching' : <Empty />}
       value={currentValue}
       onSearch={onSearch}
       onChange={(newValue) => {
         if (onChange) {
-          onChange(newValue[outputValue] || newValue);
+          if (newValue) onChange(newValue[outputValue] || newValue);
         }
       }}
+      onClear={() => {
+        setOptions([]);
+        setCurrentValue(undefined);
+      }}
     >
       {selectOptions.map((optionField) => (
         <Select.Option

diff --git a/frontend/src/components/Loading/index.jsx b/frontend/src/components/Loading/index.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Spin } from 'antd';
 import { LoadingOutlined } from '@ant-design/icons';
 

diff --git a/frontend/src/components/SearchItem/index.jsx b/frontend/src/components/SearchItem/index.jsx
@@ -96,7 +96,6 @@ function SearchItemComponent({ config, onRerender }) {
       allowClear
       placeholder={<SearchOutlined style={{ float: 'right', padding: '8px 0' }} />}
       defaultActiveFirstOption={false}
-      showArrow={false}
       filterOption={false}
       notFoundContent={searching ? '... Searching' : <Empty />}
       value={currentValue}

diff --git a/frontend/src/modules/ErpPanelModule/CreateItem.jsx b/frontend/src/modules/ErpPanelModule/CreateItem.jsx
@@ -104,9 +104,9 @@ export default function CreateItem({ config, CreateForm }) {
         onBack={() => {
           navigate(`/${entity.toLowerCase()}`);
         }}
-        title={CREATE_ENTITY}
+        title={translate('New')}
         ghost={false}
-        tags={<Tag color="volcano">Draft</Tag>}
+        tags={<Tag color="gray">Draft</Tag>}
         // subTitle="This is create page"
         extra={[
           <Button

diff --git a/frontend/src/modules/ErpPanelModule/UpdateItem.jsx b/frontend/src/modules/ErpPanelModule/UpdateItem.jsx
@@ -15,7 +15,7 @@ import Loading from '@/components/Loading';
 
 import { CloseCircleOutlined, PlusOutlined } from '@ant-design/icons';
 import { useNavigate, useParams } from 'react-router-dom';
-import { StatusTag } from '@/components/Tag';
+// import { StatusTag } from '@/components/Tag';
 
 function SaveForm({ form, config }) {
   let { UPDATE_ENTITY } = config;
@@ -111,7 +111,7 @@ export default function UpdateItem({ config, UpdateForm }) {
         }}
         title={UPDATE_ENTITY}
         ghost={false}
-        tags={StatusTag(form.getFieldValue().status)}
+        // tags={StatusTag(form.getFieldValue().status)}
         extra={[
           <Button
             key={`${uniqueId()}`}