@fe-free/core 3.0.5 → 3.0.7

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @fe-free/core
 
+## 3.0.7
+
+### Patch Changes
+
+- fix: crud
+  - @fe-free/tool@3.0.7
+
+## 3.0.6
+
+### Patch Changes
+
+- fix: pro component
+  - @fe-free/tool@3.0.6
+
 ## 3.0.5
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -41,7 +41,7 @@
     "safe-stable-stringify": "^2.5.0",
     "vanilla-jsoneditor": "^0.23.1",
     "zustand": "^4.5.4",
-    "@fe-free/tool": "3.0.5"
+    "@fe-free/tool": "3.0.7"
   },
   "peerDependencies": {
     "@ant-design/pro-components": "2.8.9",

package/src/crud_of_pure/crud_of_pure.stories.tsx

@@ -228,6 +228,7 @@ export const SpecialToolbar: Story = {
 
     return (
       <CRUDOfPure
+        specialToolbar
         actions={['create', 'delete']}
         tableProps={{
           columns,
@@ -250,7 +251,63 @@ export const SpecialToolbar: Story = {
           </>
         )}
         requestCreateByValues={fakeCreate}
+      />
+    );
+  },
+};
+
+export const SpecialToolbar2: Story = {
+  render: () => {
+    const columns = [
+      {
+        title: 'id',
+        dataIndex: 'id',
+        search: true,
+      },
+      {
+        title: '名字(省略)',
+        dataIndex: 'name',
+        search: true,
+        ellipsis: true,
+      },
+      {
+        title: 'city',
+        dataIndex: 'city',
+      },
+      {
+        title: 'area',
+        dataIndex: 'area',
+      },
+    ];
+
+    return (
+      <CRUDOfPure
         specialToolbar
+        actions={['delete']}
+        tableProps={{
+          columns,
+          request: fakeRequest,
+          pagination: false,
+          toolBarRender: () => {
+            return [<Button key="custom1">自定义1</Button>];
+          },
+        }}
+        requestDeleteByRecord={fakeDeleteByRecord}
+        deleteProps={{
+          nameIndex: 'id',
+        }}
+        detailForm={() => (
+          <>
+            <ProFormText
+              name="name"
+              label="名字"
+              required
+              rules={[{ required: true }]}
+              extra="extra extra extra extra"
+            />
+          </>
+        )}
+        requestCreateByValues={fakeCreate}
       />
     );
   },

package/src/crud_of_pure/index.tsx

@@ -9,7 +9,7 @@ interface CRUDOfPureProps<
   DataSource extends Record<string, any> = any,
   Key extends string | number = string,
 > extends CRUDProps<DataSource, Key> {
-  /** 特殊位置的 toolbar */
+  /** 特殊位置的 toolbar，向上 margin，是的 search 和 toolbar 一起。仅适用于 search 很少的情况。 */
   specialToolbar?: boolean;
 }
 
@@ -42,8 +42,6 @@ function CRUDOfPureComponent(props: CRUDOfPureProps, ref: React.ForwardedRef<CRU
     <div
       className={classNames('fec-crud-of-pure', {
         'fec-crud-of-pure-no-search': noSearch,
-        // 先这样实现
-        'fec-crud-of-pure-no-toolbar': !props.actions.includes('create'),
         'fec-crud-of-pure-special-toolbar': props.specialToolbar,
       })}
     >
@@ -54,6 +52,14 @@ function CRUDOfPureComponent(props: CRUDOfPureProps, ref: React.ForwardedRef<CRU
           cardBordered: false,
           ...props.tableProps,
           columns: newColumns,
+          toolBarRender: (...args) => {
+            let originRender: React.ReactNode[] = [];
+
+            if (typeof props.tableProps.toolBarRender === 'function') {
+              originRender = props.tableProps.toolBarRender(...args);
+            }
+            return [...originRender, <div key="fake" style={{ height: '32px' }} />];
+          },
         }}
       />
     </div>

package/src/crud_of_pure/style.scss

@@ -49,11 +49,11 @@
     }
   }
 
-  &.fec-crud-of-pure-no-toolbar {
-    .ant-pro-table-list-toolbar-container {
-      padding-block: 0;
-    }
-  }
+  // &.fec-crud-of-pure-no-toolbar {
+  //   .ant-pro-table-list-toolbar-container {
+  //     padding-block: 0;
+  //   }
+  // }
 
   &.fec-crud-of-pure-special-toolbar {
     .ant-pro-table-list-toolbar {

package/src/style.scss

@@ -12,3 +12,9 @@
 
 /* stylelint-disable-next-line at-rule-no-unknown */
 @tailwind utilities;
+
+// fix
+// ant-pro-card-border 有个 transition 导致颜色会变化，所以就写死个。
+.ant-pro-card-border {
+  border: 1px solid #e2e7f0;
+}