[Params adjustment]

src/components/QrItem.js

@@ -11,13 +11,6 @@ class QrItem extends React.Component {
     constructor(props) {
         super(props);
         this.handleClick = this.handleClick.bind(this);
-        this.state = {
-            params: new Array(16)
-        };
-    }
-
-    componentDidMount() {
-        this.forceUpdate();
     }
 
     handleClick(e) {

src/components/QrRendererBase.js

@@ -7,11 +7,17 @@ function listPoint(props) {
     const qrcode = props.qrcode;
     const nCount = qrcode.getModuleCount();
     const pointList = new Array(nCount);
+    const params = props.getParamValue();
+
     let id = 0;
     for (let row = 0; row < nCount; row++) {
         for (let col = 0; col < nCount; col++) {
-            if (qrcode.isDark(row, col))
+            if (qrcode.isDark(row, col)) {
-                pointList.push(<use key={id++} fill="black" x={row} y={col} href="#simpleRect"/>)
+                if (params[1] == 0)
+                    pointList.push(<rect width={params[0]} height={params[0]} key={id++} fill="black" x={row} y={col}/>)
+                else if (params[1] == 1)
+                    pointList.push(<circle r={params[0]} key={id++} fill="black" cx={row} cy={col}/>)
+            }
         }
     }
     return pointList;
@@ -25,11 +31,29 @@ function calViewBox(props) {
 }
 
 class QrRendererBase extends React.Component {
+    constructor(props) {
+        super(props);
+        this.props.setParamInfo([
+                {
+                    key: '大小',
+                    default: 1
+                },
+                {
+                    key: '定位点样式',
+                    default: 0,
+                    choices: [
+                        "矩形",
+                        "圆形"
+                    ]
+                }
+            ]
+        );
+    }
+
     render() {
         return (
             <svg className="Qr-item-svg" width="100%" height="100%" viewBox={calViewBox(this.props)} fill="white"
                  xmlns="http://www.w3.org/2000/svg" xmlnsXlink="http://www.w3.org/1999/xlink">
-                <rect fill="black" width={1} height={1} id="simpleRect"/>
                 {listPoint(this.props)}
             </svg>
         );

src/components/QrRendererRound.js

@@ -48,6 +48,29 @@ function calViewBox(props) {
 }
 
 class QrRendererRound extends React.Component {
+    constructor(props) {
+        super(props);
+        this.props.setParamInfo([
+                {
+                    key: '没有choices的文本框1',
+                    default: 1
+                },
+                {
+                    key: '没有choices的文本框2',
+                    default: 100
+                },
+                {
+                    key: '有choices的选择框',
+                    default: 0,
+                    choices: [
+                        "option1",
+                        "option2"
+                    ]
+                }
+            ]
+        );
+    }
+
     render() {
         return (
             <svg className="Qr-item-svg" width="100%" height="100%" viewBox={calViewBox(this.props)} enableBackground={calViewBox(this.props)} fill="white"

src/components/Qrcode.js

@@ -4,36 +4,18 @@ import React from "react";
 import ReactDOMServer from 'react-dom/server'
 import {getQrcodeData} from "../utils/qrcodeHandler";
 import {saveImg, saveSvg} from "../utils/downloader";
+import {isWeiXin} from "../utils/util";
 import './Qrcode.css';
 
+import QrItem from "./QrItem";
 import QrRendererBase from "./QrRendererBase";
 import QrRendererRound from "./QrRendererRound";
 import QrRendererBlank from "./QrRendererBlank";
-import QrItem from "./QrItem";
 import QrRendererRandRect from "./QrRendererRandRect";
 
 const date = new Date();
 const currentYear = date.getFullYear();
 
-window.onload = function(){
-    if(isWeiXin()){
-        const outer = document.getElementById("wx-message");
-        const inner = document.createElement("div");
-        inner.className = "note-font";
-        inner.id = "wx-message-inner";
-        inner.innerHTML = "当前客户端不支持下载，请在浏览器中打开。";
-        outer.appendChild(inner);
-    }
-}
-function isWeiXin(){
-    const ua = window.navigator.userAgent.toLowerCase();
-    if(ua.match(/MicroMessenger/i) == 'micromessenger'){
-        return true;
-    }else{
-        return false;
-    }
-}
-
 const styleList = [
     {value: "A1", renderer: QrRendererBase},
     {value: "A2", renderer: QrRendererRound},
@@ -46,31 +28,57 @@ const styleList = [
 ];
 
 class Qrcode extends React.Component {
+    paramInfoBuffer;
+    paramValueBuffer;
     constructor(props) {
         super(props);
-        this.handleChange = this.handleChange.bind(this)
         this.handleCreate = this.handleCreate.bind(this)
-        this.handleSelected = this.handleSelected.bind(this)
         this.downloadSvg = this.downloadSvg.bind(this)
         this.downloadImg = this.downloadImg.bind(this)
+        this.setParamValue = this.setParamValue.bind(this)
+        this.getParamValue = this.getParamValue.bind(this)
+        this.setParamInfo = this.setParamInfo.bind(this)
+        this.renderAdjustment = this.renderAdjustment.bind(this)
+        this.renderParamEditor = this.renderParamEditor.bind(this)
         this.state = {
             text: '',
             selectedIndex: 0,
             options: {text: ''},
-            qrcode: null
+            qrcode: null,
+            paramInfo: [],
+            paramValue: []
         };
+        this.paramInfoBuffer = new Array(10).fill(new Array(10));
+        this.paramValueBuffer = new Array(10).fill(new Array(10));
     }
 
     componentDidMount() {
-        this.handleCreate()
+        this.setState({paramInfo: this.paramInfoBuffer, paramValue: this.paramValueBuffer}, () => {
+            this.handleCreate();
+        })
     }
 
-    handleSelected(index) {
+    setParamInfo(index) {
-        this.setState({selectedIndex: index});
+        const _this = this;
+        return function (params) {
+            _this.paramInfoBuffer[index] = params;
+            _this.paramValueBuffer[index] = params.map(p => {
+                return p.default
+            });
+        }
     }
 
-    handleChange(e) {
+    setParamValue(valueIndex, value) {
-        this.setState({text: e.target.value})
+        const newValue = this.state.paramValue.slice();
+        newValue[this.state.selectedIndex][valueIndex] = value;
+        this.setState({paramValue: newValue});
+    }
+
+    getParamValue(index) {
+        const _this = this;
+        return function () {
+            return _this.state.paramValue[index];
+        }
     }
 
     handleCreate(e) {
@@ -97,6 +105,52 @@ class Qrcode extends React.Component {
         saveImg(style.value, ReactDOMServer.renderToString(el), 1500, 1500)
     }
 
+    renderParamEditor(info, index) {
+        if (info.choices) {
+            return (
+                <select
+                    className="Qr-select"
+                    value={this.state.paramValue[this.state.selectedIndex][index]}
+                    onChange={(e) => this.setParamValue(index, e.target.value)}>
+                    {
+                        info.choices.map((choice, index) => {
+                            return (
+                                <option key={"option_" + this.state.selectedIndex + "_" + index}
+                                        value={index}>
+                                    {choice}
+                                </option>
+                            );
+                        })
+                    }
+                </select>
+            );
+        }
+        else {
+            return (
+                <input
+                    type="number"
+                    className="Qr-input small-input"
+                    placeholder="10"
+                    value={this.state.paramValue[this.state.selectedIndex][index]}
+                    onChange={(e) => this.setParamValue(index, e.target.value)}/>
+            );
+        }
+    }
+
+    renderAdjustment() {
+        const target = this.state.paramInfo[this.state.selectedIndex];
+        if (target instanceof Array) {
+            return target.map((info, index) => {
+                return (
+                    <tr key={"tr_" + index}>
+                        <td key={"title_" + index}>{info.key}</td>
+                        <td key={"editor_" + index}>{this.renderParamEditor(info, index)}</td>
+                    </tr>
+                )
+            })
+        }
+    }
+
     render() {
         return (
             <div>
@@ -106,7 +160,7 @@ class Qrcode extends React.Component {
                     <input
                         className="Qr-input big-input"
                         placeholder="Input your URL here"
-                        onChange={this.handleChange}
+                        onChange={(e) => this.setState({text: e.target.value})}
                         onBlur={this.handleCreate}
                         onKeyPress={(e) => {if(e.key === 'Enter') this.handleCreate(e)}}
                     />
@@ -127,10 +181,12 @@ class Qrcode extends React.Component {
                                         qrcode={this.state.qrcode}
                                         renderer={React.createElement(style.renderer, {
                                             qrcode: this.state.qrcode,
+                                            getParamValue: this.getParamValue(index),
+                                            setParamInfo: this.setParamInfo(index)
                                         })}
                                         text={this.state.text}
                                         selected={index == this.state.selectedIndex}
-                                        onSelected={this.handleSelected}
+                                        onSelected={() => this.setState({selectedIndex: index})}
                                     />
                                 })
                             }
@@ -146,18 +202,8 @@ class Qrcode extends React.Component {
                         <div className="Qr-div-table">
                             <table className="Qr-table">
                                 <tbody>
-                                    <tr>
+                                    {this.renderAdjustment()}
-                                        <td>圆点大小</td>
-                                        <td><input className="Qr-input small-input"
-                                                   placeholder="10" /></td>
-                                    </tr>
-                                    <tr>
-                                        <td>随机种</td>
-                                        <td><input className="Qr-input small-input"
-                                                   placeholder="10" /></td>
-                                    </tr>
                                 </tbody>
-
                             </table>
                         </div>
                     </div>
@@ -200,3 +246,14 @@ class Qrcode extends React.Component {
 }
 
 export default Qrcode;
+
+window.onload = function(){
+    if(isWeiXin()){
+        const outer = document.getElementById("wx-message");
+        const inner = document.createElement("div");
+        inner.className = "note-font";
+        inner.id = "wx-message-inner";
+        inner.innerHTML = "当前客户端不支持下载，请在浏览器中打开。";
+        outer.appendChild(inner);
+    }
+}

src/utils/util.js

@@ -20,3 +20,12 @@ export function randRGB() {
     )
     return rgb;
 }
+
+export function isWeiXin(){
+    const ua = window.navigator.userAgent.toLowerCase();
+    if(ua.match(/MicroMessenger/i) == 'micromessenger'){
+        return true;
+    }else{
+        return false;
+    }
+}