0610

Utils/OpenTimeUtil.js

@@ -57,7 +57,7 @@ export default class OpenTimeUtil {
 
   getWeek() {
     return this.week.split(",").filter(item => {
-      return this.valueKey.includes(item);
+      return this.valueKey ? this.valueKey.includes(item) : false;
     });
   }
 

components/FormInput.js

@@ -268,20 +268,8 @@ const FormInput = React.memo(props => {
     if (type === "openTime") {
       return (
         <OpenTime
-          open={open}
-          submit={(start, end, week) => {
-            ChangeOpen(false);
-            props.onChange(
-              week.join(","),
-              moment(start, "HH:mm").format("HH:mm:ss"),
-              moment(end, "HH:mm").format("HH:mm:ss")
-            );
-          }}
-          cancelEvent={() => {
-            ChangeOpen(false);
-          }}
-          openModal={() => {
-            ChangeOpen(true);
+          submit={(week, startTime, endTime) => {
+            props.onChange(week, startTime, endTime);
           }}
           week={props.week}
           startTime={props.startTime}

components/OpenTime.js

@@ -14,10 +14,11 @@ import {
   Icon,
   SelectItem,
 } from "@ui-kitten/components";
-import { Scrollpicker } from "beeshell";
+import { useEventEmitter, useMount } from "@umijs/hooks";
 import { useModel } from "flooks";
 import moment from "moment";
 import OpenTimeUtil from "../Utils/OpenTimeUtil";
+import OpenTimeCom from "./OpenTimeCom";
 
 if (Platform.OS === "android") {
   if (UIManager.setLayoutAnimationEnabledExperimental) {
@@ -66,176 +67,18 @@ const titleText = (props, title, value) => (
   </Text>
 );
 
-export default function OpenTime({
-  open,
-  submit,
-  cancelEvent,
-  openModal,
-  week,
-  startTime,
-  endTime,
-}) {
-  const {
-    MONDAY,
-    TUESDAY,
-    WEDNESDAY,
-    THURSDAY,
-    FRIDAY,
-    SATURDAY,
-    SUNDAY,
-    every,
-    confirm,
-    cancel,
-    start,
-    end,
-    hour,
-    min,
-    weekName,
-    weekWords,
-  } = useModel("wordsModel");
-  const weeks = [
-    {
-      key: "MONDAY",
-      label: MONDAY,
-    },
-    {
-      key: "TUESDAY",
-      label: TUESDAY,
-    },
-    {
-      key: "WEDNESDAY",
-      label: WEDNESDAY,
-    },
-    {
-      key: "THURSDAY",
-      label: THURSDAY,
-    },
-    {
-      key: "FRIDAY",
-      label: FRIDAY,
-    },
-    {
-      key: "SATURDAY",
-      label: SATURDAY,
-    },
-    {
-      key: "SUNDAY",
-      label: SUNDAY,
-    },
-  ];
-  const [checkList, changeChecked] = React.useState([]);
-  const listItems = weeks.map((item, index) => (
-    <CheckBox
-      style={styles.checkBoxItem}
-      key={index}
-      checked={checkList.includes(item.key)}
-      onChange={checked => {
-        const _checkList = [...checkList];
-        if (checked) {
-          _checkList.push(item.key);
-        } else {
-          _checkList.splice(_checkList.indexOf(item.key), 1);
-        }
-        changeChecked(_checkList);
-      }}
-    >
-      {item.label}
-    </CheckBox>
-  ));
-  const list = React.useMemo(() => {
-    const hourSum = 24;
-    const minuteSum = 60;
-    const hours = range(hourSum / 1).map(item => {
-      item = convert2Digit(item * 1);
-      return {
-        label: `${item} ${hour}`,
-        value: item,
-      };
-    });
-    const minutes = range(minuteSum / 10).map(item => {
-      item = convert2Digit(item * 10);
-      return {
-        label: `${item} ${min}`,
-        value: item,
-      };
-    });
-    return [hours, minutes];
-  }, [open]);
-
-  const [time1, setTime1] = React.useState([8, 0]);
-  const [time2, setTime2] = React.useState([20, 0]);
-
-  const [showTime1, changeShowTime1] = React.useState(true);
-  const [showTime2, changeShowTime2] = React.useState(false);
-  const [showWeek, changeShowWeek] = React.useState(false);
-
-  const allChecked = React.useMemo(() => {
-    if (weeks.length === checkList.length) {
-      return true;
-    }
-    return false;
-  }, [weeks, checkList]);
-
-  const indeterminate = React.useMemo(() => {
-    if (!allChecked && checkList.length > 0) {
-      return true;
-    }
-    return false;
-  }, [allChecked, checkList]);
-
-  const canSubmit = React.useMemo(() => {
-    if (time1.length === 2 && time2.length === 2 && checkList.length > 0) {
-      return true;
-    }
-    return false;
-  }, [time1, time2, checkList]);
-
-  const time1Str = React.useMemo(() => {
-    if (time1.length === 2) {
-      const str = `${time1[0]}:${time1[1] * 10}`;
-      return moment(str, "H:m").format("HH:mm");
-    }
-    return "";
-  }, [time1]);
+export default function OpenTime({ submit, week, startTime, endTime }) {
+  const { weekWords } = useModel("wordsModel");
 
-  const time2Str = React.useMemo(() => {
-    if (time2.length === 2) {
-      const str = `${time2[0]}:${time2[1] * 10}`;
-      return moment(str, "H:m").format("HH:mm");
+  const node$ = useEventEmitter();
+  const openTime = React.useMemo(() => {
+    console.log(week);
+    if (startTime && endTime && week) {
+      // eslint-disable-next-line no-underscore-dangle
+      return new OpenTimeUtil(startTime, endTime, week, weekWords());
     }
-    return "";
-  }, [time2]);
-
-  const weekStr = React.useMemo(() => {
-    if (allChecked) {
-      return every;
-    }
-    const _weeks = weeks.filter(item => {
-      return checkList.includes(item.key);
-    });
-    return _weeks
-      .map(item => {
-        return item.label;
-      })
-      .join(",");
-  }, []);
-
-  const [showName, setShowName] = React.useState([" ", ""]);
-
-  React.useEffect(() => {
-    if (week && endTime && startTime) {
-      let _openTimeUtil = new OpenTimeUtil(startTime, endTime, week, weekWords);
-      setShowName([_openTimeUtil.getTimeStr(), _openTimeUtil.getWeekStr()]);
-    }
-  }, [week, endTime, startTime]);
-
-  function hideElseShow(key) {
-    changeShowTime1(key === 1);
-    changeShowTime2(key === 2);
-    changeShowWeek(key === 3);
-
-    LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut);
-  }
+    return new OpenTimeUtil();
+  }, [startTime, endTime, week, weekWords]);
 
   return (
     <>
@@ -243,126 +86,24 @@ export default function OpenTime({
         appearance="form"
         style={{ flex: 1, height: 32 }}
         accessoryRight={ForwardIcon}
-        title={props => titleText(props, showName[0], showName[1])}
-        onPress={openModal}
+        title={props =>
+          titleText(props, openTime.getTimeStr(), openTime.getWeekStr())
+        }
+        onPress={() => {
+          node$.emit();
+        }}
+      />
+      <OpenTimeCom
+        submit={_openTimeUtil => {
+          submit(
+            _openTimeUtil.week,
+            _openTimeUtil.startTime,
+            _openTimeUtil.endTime
+          );
+        }}
+        openTime={openTime}
+        node$={node$}
       />
-      <Modal
-        visible={open && list.length > 0}
-        backdropStyle={styles.backdrop}
-        onBackdropPress={cancelEvent}
-      >
-        <Card disabled appearance="modalCrad" style={{ width: 242 }}>
-          <Layout>
-            <MenuItem
-              appearance="cardContent"
-              title={props => titleText(props, start, time1Str)}
-              accessoryRight={ForwardIcon}
-              onPress={() => {
-                hideElseShow(1);
-              }}
-            />
-          </Layout>
-          <Card
-            disabled
-            appearance="modalCrad"
-            style={[{ width: 222 }, showTime1 ? {} : styles.hideHeight]}
-          >
-            <Scrollpicker
-              key="time1"
-              list={list}
-              proportion={[1, 1]}
-              offsetCount={1}
-              value={time1}
-              onChange={(index, value) => {
-                const _time1 = [...time1];
-                _time1[index] = value;
-                setTime1(_time1);
-              }}
-            />
-          </Card>
-          <Layout>
-            <MenuItem
-              appearance="cardContent"
-              title={props => titleText(props, end, time2Str)}
-              accessoryRight={ForwardIcon}
-              onPress={() => {
-                hideElseShow(2);
-              }}
-            />
-          </Layout>
-          <Card
-            disabled
-            appearance="modalCrad"
-            style={[{ width: 222 }, showTime2 ? {} : styles.hideHeight]}
-          >
-            <Scrollpicker
-              key="time2"
-              list={list}
-              proportion={[1, 1]}
-              offsetCount={1}
-              value={time2}
-              onChange={(index, value) => {
-                const _time2 = [...time2];
-                _time2[index] = value;
-                setTime2(_time2);
-              }}
-            />
-          </Card>
-          <Layout>
-            <MenuItem
-              appearance="cardContent"
-              title={props => titleText(props, weekName, weekStr)}
-              accessoryRight={ForwardIcon}
-              onPress={() => {
-                hideElseShow(3);
-              }}
-            />
-          </Layout>
-          <Card
-            appearance="modalCrad"
-            style={[showWeek ? {} : styles.hideHeight]}
-          >
-            <CheckBox
-              style={styles.checkBoxAll}
-              checked={allChecked}
-              indeterminate={indeterminate}
-              onChange={checked => {
-                changeChecked(
-                  checked
-                    ? weeks.map(item => {
-                        return item.key;
-                      })
-                    : []
-                );
-              }}
-            >
-              {every}
-            </CheckBox>
-
-            {listItems}
-          </Card>
-          <Layout style={styles.btnList}>
-            <Button
-              style={styles.btn}
-              appearance="outline"
-              status="info"
-              onPress={cancelEvent}
-            >
-              {cancel}
-            </Button>
-            <Button
-              style={[styles.btn, { marginLeft: 10 }]}
-              disabled={!canSubmit}
-              onPress={() => {
-                submit(time1Str, time2Str, checkList);
-                setShowName([`${time1Str}~${time2Str}`, weekStr]);
-              }}
-            >
-              {confirm}
-            </Button>
-          </Layout>
-        </Card>
-      </Modal>
     </>
   );
 }

screens/Guide1Screen.js

@@ -311,7 +311,9 @@ export default function Guide1Screen({ navigation }) {
             <FormInput
               label={guide1_form_5}
               type="openTime"
-              defaultValue={defaultValue}
+              week={week}
+              startTime={startTime}
+              endTime={endTime}
               onChange={(week, startTime, endTime) => {
                 changeWeek(week);
                 changeStartTime(startTime);
@@ -348,7 +350,7 @@ export default function Guide1Screen({ navigation }) {
                   httpPost(
                     "/goods/save",
                     {
-                      id,
+                      id: id === "NEW" ? "" : id,
                       name,
                       amount,
                       discountAmount,

screens/RegisterSeScreen.js

@@ -236,10 +236,9 @@ export default function RegisterScreen() {
               label={guideHome_form_4}
               selectTitle={guideHome_form_4}
               type="openTime"
-              value={timeValue}
               week={week}
               startTime={startTime}
-              endTime={startTime}
+              endTime={endTime}
               onChange={(week, startTime, endTime) => {
                 changeWeek(week);
                 changeStartTime(startTime);
@@ -275,7 +274,7 @@ export default function RegisterScreen() {
               label="法人信息"
               type="url"
               value={
-               ( realName && idNo && idNoImg && handheldIdNo) ? "已上传" : " "
+                realName && idNo && idNoImg && handheldIdNo ? "已上传" : " "
               }
               textAlign="right"
               style={{ paddingVertical: 5 }}