jrs-react 1.1.11 → 1.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "jrs-react",
-	"version": "1.1.11",
+	"version": "1.1.13",
 	"description": "",
 	"main": "build/index.js",
 	"module": "build/index.es.js",

package/src/components/JRTable/JRTable.jsx

@@ -1,10 +1,9 @@
-import { po } from "../JRUtils";
+import React from "react";
 import { TFoot, THead } from "./THead";
 import { TBodies } from "./TBodies";
 import { StyledJRTable } from "./StyledJRTable";
-import JRFrame from "../JRFrame/JRFrame";
-import { Button, Checkbox } from "antd";
-import React from "react";
+import JRSubmit from "../JRSubmit";
+// import JRFrame from "../JRFrame/JRFrame";
 
 
 const getMapObject=(map,names)=>{
@@ -27,7 +26,7 @@ const setMapObject=(map,names,value)=>{
     }
 }
 
-export default class JRTable extends JRFrame {
+export default class JRTable extends JRSubmit {
     constructor(props) {
         super(props)
         this.colGroupRef = React.createRef()
@@ -44,7 +43,7 @@ export default class JRTable extends JRFrame {
     checkableColumn(props){
         return {//方法1
             render({value,onChange}){
-                return <Checkbox checked={value} onChange={(e)=>{onChange(e.target.checked)}}/>
+                return <checkbox checked={value} onChange={(e)=>{onChange(e.target.checked)}}/>
             }
             ,align:'center'
             ,name:'checked'
@@ -69,12 +68,12 @@ export default class JRTable extends JRFrame {
     deletableColumn({name='deletable',sendValue,sendName,valueName,...props}){
         return {
             render({value,onChange}){
-                return <Checkbox checked={value} onChange={(e)=>{onChange(e.target.checked)}}/>
+                return <checkbox checked={value} onChange={(e)=>{onChange(e.target.checked)}}/>
             }
             ,align:'center'
             ,name
             ,label(){
-                return <Button
+                return <button
                     onClick={()=>{
                         const value=this.props.delete.value 
                             ?? this.getDataSource()?.filter(record=>record[name]).map(record=>sendValue?record[sendValue]:record)
@@ -88,7 +87,7 @@ export default class JRTable extends JRFrame {
                             ,...props
                         })
                     }}
-                >刪除</Button>
+                >刪除</button>
             }
             ,...props
         }

package/src/index.js

@@ -1,9 +1,8 @@
 import JRSubmit from './components/JRSubmit'
 import JRFrame from './components/JRFrame/JRFrame'
-// import JRTable from './components/JRTable/JRTable'
+import JRTable from './components/JRTable/JRTable'
 import JRTest,{JRTestReact} from './components/JRTest'
 export {
     JRTest,JRTestReact
-    ,JRSubmit,JRFrame//,JRTable
-    
+    ,JRSubmit,JRFrame,JRTable
 }

package/src/components/Message.jsx

@@ -1,89 +0,0 @@
-import { message } from "antd";
-import { CloseOutlined } from "@ant-design/icons";
-
-message.config({ duration: 3 });
-
-const info = (props) => {
-    const key = Date.now();
-    message.info({
-        content: (
-            <>
-                <div className="message">{props.message}</div>
-                <CloseOutlined
-                    onClick={() => {
-                        message.destroy(key);
-                    }}
-                />
-            </>
-        ),
-        className: "info",
-        key,
-        ...props
-    });
-};
-
-const success = (props) => {
-    const key = Date.now();
-    message.success({
-        content: (
-            <>
-                <div className="message">{props.message}</div>
-                <CloseOutlined
-                    onClick={() => {
-                        message.destroy(key);
-                    }}
-                />
-            </>
-        ),
-        className: "success",
-        key,
-        ...props
-    });
-};
-
-const warning = (props) => {
-    const key = Date.now();
-    message.warning({
-        content: (
-            <>
-                <div className="message">{props.message}</div>
-                <CloseOutlined
-                    onClick={() => {
-                        message.destroy(key);
-                    }}
-                />
-            </>
-        ),
-        className: "warning",
-        key,
-        ...props
-    });
-};
-
-const error = (props) => {
-    const key = Date.now();
-    message.error({
-        content: (
-            <>
-                <div className="message">{props.message}</div>
-                <CloseOutlined
-                    onClick={() => {
-                        message.destroy(key);
-                    }}
-                />
-            </>
-        ),
-        className: "error",
-        key,
-        ...props
-    });
-};
-
-const msg = {
-    info,
-    success,
-    warning,
-    error
-};
-
-export default msg;