From f22508be87c04bd78eaaf783525b5f104fee6474 Mon Sep 17 00:00:00 2001
From: lynklody <liuai_1995@live.cn>
Date: Thu, 13 Aug 2020 22:53:18 +0800
Subject: [PATCH] *: string input function modification

---
 .../InputAreaByDataTypes/StringInput.js       | 43 ++++++++-----------
 src/Store/Actions/ActionTypes.js              | 11 ++---
 src/Store/Actions/StringActions.js            | 43 +++++++++++++------
 src/Store/Actions/index.js                    |  7 ++-
 4 files changed, 60 insertions(+), 44 deletions(-)

diff --git a/src/Components/InputAreaByDataTypes/StringInput.js b/src/Components/InputAreaByDataTypes/StringInput.js
index 48ec1c4..bf8f8bc 100644
--- a/src/Components/InputAreaByDataTypes/StringInput.js
+++ b/src/Components/InputAreaByDataTypes/StringInput.js
@@ -181,31 +181,24 @@ const StringInput = () => {
                         label="允许字符重复"
                     />
                 </Grid>
-                
-                    { allowDuplicate
-                        ? 
-                        <Grid container>
-                            <Grid item className={classes.line}>
-                                <CardContent>每测试用例字符数量：</CardContent>
-                            </Grid>
-                            <Grid item className={classes.line}>
-                                <TextField 
-                                    className={classes.text}
-                                    label='Required'
-                                    fullWidth
-                                    name='delimiter'
-                                    // onChange={(e)=>updateNumChars(e.target.value)}
-                                    onChange={(e) => dispatch({
-                                        type: UPDATE_NUM_CHARS,
-                                        payload: e.target.value
-                                    })}
-                                    variant='outlined'
-                                />
-                            </Grid>
-                        </Grid>
-                        :
-                        <Box />
-                    }
+                <Grid container>
+                    <Grid item className={classes.line}>
+                        <CardContent>每测试用例字符数量：</CardContent>
+                    </Grid>
+                    <Grid item className={classes.line}>
+                        <TextField 
+                            className={classes.text}
+                            label='Required'
+                            fullWidth
+                            name='delimiter'
+                            onChange={(e) => dispatch({
+                                type: UPDATE_NUM_CHARS,
+                                payload: e.target.value
+                            })}
+                            variant='outlined'
+                        />
+                    </Grid>
+                </Grid>
                 <Grid container
                     direction='column'
                     spacing={2}
diff --git a/src/Store/Actions/ActionTypes.js b/src/Store/Actions/ActionTypes.js
index 1baf427..0dab1c0 100644
--- a/src/Store/Actions/ActionTypes.js
+++ b/src/Store/Actions/ActionTypes.js
@@ -1,13 +1,14 @@
-// inputs
-export const TOGGLE_DRAWER = 'TOGGLE_DRAWER'
+// General actions
 export const OPEN_DRAWER = "OPEN_DRAWER"
 export const CLOSE_DRAWER = "CLOSE_DRAWER"
+export const SET_DATATYPE = 'SET_DATATYPE'
+export const SET_OUTPUT = 'SET_OUTPUT'
+export const ALTER_ALL = 'ALTER_ALL'
+
+// String
 export const UPDATE_CHARSET = 'UPDATE_CHARSET'
 export const UPDATE_DELIMITER = 'UPDATE_DELIMITER'
 export const UPDATE_NUM_CHARS = 'UPDATE_NUM_CHARS'
-export const SET_DATATYPE = 'SET_DATATYPE'
 export const UPDATE_NUM_CASES = 'UPDATE_NUM_CASES'
 export const UPDATE_ALLOW_DUPLICATE = 'UPDATE_ALLOW_DUPLICATE'
 
-// outputs
-export const SET_OUTPUT = 'SET_OUTPUT'
\ No newline at end of file
diff --git a/src/Store/Actions/StringActions.js b/src/Store/Actions/StringActions.js
index 027ad09..73bb0c4 100644
--- a/src/Store/Actions/StringActions.js
+++ b/src/Store/Actions/StringActions.js
@@ -1,6 +1,7 @@
+import { SET_OUTPUT } from './ActionTypes'
 
-export const startStringGen = (state) => {
-    console.log("SRING GEN ACTIONS")
+export const startStringGen = (state, dispatch) => {
+    console.log("STRING GEN ACTIONS")
     const { chars, numChars, delimiter, numCases, allowDuplicate, output } = state
     if (output !== '') {
         console.log('ERROR: output not empty, submit clicked more than once')
@@ -8,11 +9,14 @@ export const startStringGen = (state) => {
     let result = ''
     let arr = chars.split('')
     if (allowDuplicate) {
-        console.log('ALLOW dup')
+        console.log('dup ALLOWED')
         if (delimiter === '') {
             console.log('WITHOUT delimiter')
             for (let i = 0; i < numCases; ++i) {
-                result += arr[Math.floor(Math.random() * arr.length)]
+                for (let j = 0; j < numChars; ++j) {
+                    result += arr[Math.floor(Math.random() * arr.length)]
+                }
+                result += '\n'
             }
         }
         else {
@@ -29,25 +33,38 @@ export const startStringGen = (state) => {
     }
     else {
         console.log('dup NOT ALLOWED')
-        let count = Math.min(arr.length, numCases)
+        let count = Math.min(arr.length, numCases*numChars)
         if (delimiter === '') {
             console.log('WITHOUT delimiter')
             while (count > 0 && arr.length > 0) {
-                let idx = Math.floor(Math.random() * count--)
-                result += arr[idx]
-                arr.splice(idx, 1)
+                for (let i = 0; i < numChars; ++i) {
+                    if (count <= 0)
+                        break
+                    let idx = Math.floor(Math.random() * count--)
+                    result += arr[idx]
+                    arr.splice(idx, 1)
+                }
+                result += '\n'
             }
         }
         else {
             console.log('WITH delimiter')
             while (count > 0 && arr.length > 0) {
-                let idx = Math.floor(Math.random() * count--)
-                result += arr[idx]
-                arr.splice(idx, 1)
-                if (count !== 0)
+                for (let i = 0; i < numChars; ++i) {
+                    if (count <= 0)
+                        break
+                    let idx = Math.floor(Math.random() * count--)
+                    result += arr[idx]
+                    arr.splice(idx, 1)
+                }
+                if (count > 0)
                     result += delimiter
             }
         }
     }
-    console.log(result)
+    console.log('RESULT=',result)
+    dispatch({
+        type: SET_OUTPUT,
+        payload: result
+    })
 }
\ No newline at end of file
diff --git a/src/Store/Actions/index.js b/src/Store/Actions/index.js
index 0a62973..96c9d9c 100644
--- a/src/Store/Actions/index.js
+++ b/src/Store/Actions/index.js
@@ -1,2 +1,7 @@
+import { ALTER_ALL } from './ActionTypes'
 export * from './StringActions'
-export * from './VectorActions'
\ No newline at end of file
+export * from './VectorActions'
+
+export const clearAll = () => ({
+        type: ALTER_ALL 
+})