jrs-react 1.1.13 → 1.1.15

package/package.json

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

package/src/components/JRFrame/JRFrame.jsx

@@ -2,21 +2,22 @@ import React from "react";
 import JRSubmit from "../JRSubmit";
 import { StyledJRFrame } from "./StyledJRFrame";
 
-const FreeType=({tag:Tag,config,me,className})=>{
-    if(typeof config==='function'){
-        let style
-        const setStyle=function(_style){
-            style=_style
-        }
-        const content=config.bind(me)({setStyle})
-        return <Tag className={className} style={style}>{content}</Tag>
-    }
-}
+// const FreeType=({tag:Tag,config,me,className})=>{
+//     if(typeof config==='function'){
+//         let style
+//         const setStyle=function(_style){
+//             style=_style
+//         }
+//         const content=config.bind(me)({setStyle})
+//         return <Tag className={className} style={style}>{content}</Tag>
+//     }
+// }
 
 export default class JRFrame extends JRSubmit {
     renderer(){
         return <StyledJRFrame style={this.props.style} className={`${this.props.className} jr-frame`} >
-            <FreeType tag='div' config={this.props.start} me={this} className={'start'}/>
+            {this.renderMe()}
+            {/* <FreeType tag='div' config={this.props.start} me={this} className={'start'}/>
             <main>
                 <FreeType tag='header' config={this.props.top} me={this}/>
                 <main>
@@ -26,7 +27,7 @@ export default class JRFrame extends JRSubmit {
                 </main>
                 <FreeType tag='footer' config={this.props.bottom} me={this}/>
             </main>
-            <FreeType tag='div' config={this.props.end} me={this} className={'end'}/>
+            <FreeType tag='div' config={this.props.end} me={this} className={'end'}/> */}
         </StyledJRFrame>
     }
 

package/src/components/JRTable/JRTable.jsx

@@ -1,9 +1,10 @@
-import React from "react";
+import { po } from "../JRUtils";
 import { TFoot, THead } from "./THead";
 import { TBodies } from "./TBodies";
 import { StyledJRTable } from "./StyledJRTable";
-import JRSubmit from "../JRSubmit";
-// import JRFrame from "../JRFrame/JRFrame";
+import JRFrame from "../JRFrame/JRFrame";
+import { Button, Checkbox } from "antd";
+import React from "react";
 
 
 const getMapObject=(map,names)=>{
@@ -26,7 +27,7 @@ const setMapObject=(map,names,value)=>{
     }
 }
 
-export default class JRTable extends JRSubmit {
+export default class JRTable extends JRFrame {
     constructor(props) {
         super(props)
         this.colGroupRef = React.createRef()
@@ -43,7 +44,7 @@ export default class JRTable extends JRSubmit {
     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'
@@ -68,12 +69,12 @@ export default class JRTable extends JRSubmit {
     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)
@@ -87,7 +88,7 @@ export default class JRTable extends JRSubmit {
                             ,...props
                         })
                     }}
-                >刪除</button>
+                >刪除</Button>
             }
             ,...props
         }

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