jrs-react 1.2.1 → 1.2.2

package/package.json

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

package/src/components/JRSubmit.jsx

@@ -2,7 +2,7 @@ import React from 'react'
 import axios from 'axios'
 import { colonValueString, flexType, po } from './JRUtils'
 import { displaySpinner } from './LoadingBar'
-import msg from './Message'
+// import msg from './Message'
 import styled from 'styled-components'
 
 
@@ -272,17 +272,26 @@ export default class JRSubmit extends React.Component {
         const isSuccess = response.status >= 200 && response.status <= 299
         
         this.setRes(isSuccess,response,config)
-        if (isSuccess) {
-            if (config.successMessage) {
-                msg.success({ message:config.successMessage })
-            }
-        } else {
-            if (config.failedMessage) {
-                msg.error({ message:config.failedMessage })
-            }
-        }    
+        this.showMessage(isSuccess,isSuccess?config.successMessage:config.failedMessage)
+
+        // if (isSuccess) {
+        //     if (config.successMessage) {
+        //         // msg.success({ message:config.successMessage })
+        //         // alert(config.successMessage)
+        //     }
+        // } else {
+        //     if (config.failedMessage) {
+        //         // msg.error({ message:config.failedMessage })
+        //         // alert(config.failedMessage)
+        //     }
+        // }    
         config.callback?.bind(this)(isSuccess,response,payload)
     }
+
+    showMessage(success,message){
+        po('success',success)
+        po('message',message)
+    }
     
     renderer(){
         return

package/src/components/JRTable/JRTable.jsx

@@ -3,7 +3,6 @@ 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";
 
 
@@ -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/components/JRTable/TBodies.jsx

@@ -108,7 +108,7 @@ const Td=({column:_column,record,tbodyIndex,trIndex,tdIndex,table})=>{
     const setStyle=(_style)=>{
         style=_style
     }
-    setStyle.bind(this)
+    setStyle.bind(table)
     render?.bind(table)
     if(type){
         const typeStyle=flexType(_typeStyle,table,{record},{})
@@ -116,14 +116,14 @@ const Td=({column:_column,record,tbodyIndex,trIndex,tdIndex,table})=>{
         content=React.createElement(type,{
             onChange:_onChange
                 ?(e)=>{
-                    _onChange?.bind(this)(e,{value,onChange,me:content})
+                    _onChange?.bind(table)(e,{value,onChange,me:content})
                 }
                 :onChange
             ,value
             ,style:typeStyle
             ,render
             ,...column
-            ,...funcProps?.bind(this)({value})
+            ,...funcProps?.bind(table)({value})
 
         })
     }else if(render){

package/src/index.js

@@ -1,8 +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 JRTestReact from './components/JRTest'
 export {
     JRTestReact
-    ,JRSubmit,JRFrame//,JRTable
+    ,JRSubmit,JRFrame,JRTable
 }