Merge branch 'feat-imageText-mly' of github.com:ShuyunFF2E/cloud-react into v1-develop

Author: liyuan-meng

src/components/c-cascader/demos/basic.md

@@ -5,21 +5,19 @@ desc: 默认样式
 ---
 
 ```jsx
-
-import React, { useState, useEffect } from 'react';
-import { CCascader, Tooltip, Icon } from 'cloud-react';
-const addressOptions =  [
+import React, { useState, useEffect } from "react";
+import { CCascader, Tooltip, Icon } from "cloud-react";
+const addressOptions = [
   {
-    value: 'zhejiang',
-    label: 'Zhejiang',
-    info: '说明',
-
+    value: "zhejiang",
+    label: "Zhejiang",
+    info: "说明",
 
     children: [
       {
-        value: 'hangzhou',
-        label: 'Hangzhou',
-        info: '说明',
+        value: "hangzhou",
+        label: "Hangzhou",
+        info: "说明",
         children: [
           {
             value: "xihu",
@@ -124,42 +122,48 @@ export default function Demo() {
     );
   };
 
-	return (
-			<div>
-				<div style={{ marginBottom: 24 }}>仅叶子选项支持选择</div>
-				<CCascader
-					options={addressOptions}
-					onChange={onChange}
-					placeholder="Please select"
-          style={{ width: 328 }}
-          optionRender={option => {
-            return (
-              <label title={option.title} style={{ display: 'flex', gap: 4 }}>
-                {option.label}
-                {option.info && (
-                  <Tooltip content={option.info} theme="light" placement="right" overlayStyle={{ zIndex: 10000 }}>
-                    <Icon type="question-circle" />
-                  </Tooltip>
-                )}
-              </label>
-            );
-          }}
-          />
-				<div style={{ marginBottom: 24, marginTop: 40 }}>任意选项支持选择</div>
-				<CCascader
-					options={addressOptions}
-					onChange={onChange}
-					placeholder="Please select"
-					showSearch={{ filter: filter }}
-          style={{ width: 328 }}
-					changeOnSelect/>
-        <div style={{ marginBottom: 24, marginTop: 40 }}>用级联组件展示地址</div>
-        {
-          !loading && <CCascader
-					options={data}
-					onChange={onChange}
-          fieldNames={{ label: 'name', value: 'id', children: 'children' }}
-					placeholder="Please select"
+  return (
+    <div>
+      <div style={{ marginBottom: 24 }}>仅叶子选项支持选择</div>
+      <CCascader
+        options={addressOptions}
+        onChange={onChange}
+        placeholder="Please select"
+        style={{ width: 328 }}
+        optionRender={(option) => {
+          return (
+            <label title={option.title} style={{ display: "flex", gap: 4 }}>
+              {option.label}
+              {option.info && (
+                <Tooltip
+                  content={option.info}
+                  theme="light"
+                  placement="right"
+                  overlayStyle={{ zIndex: 10000 }}
+                >
+                  <Icon type="question-circle" />
+                </Tooltip>
+              )}
+            </label>
+          );
+        }}
+      />
+      <div style={{ marginBottom: 24, marginTop: 40 }}>任意选项支持选择</div>
+      <CCascader
+        options={addressOptions}
+        onChange={onChange}
+        placeholder="Please select"
+        showSearch={{ filter: filter }}
+        style={{ width: 328 }}
+        changeOnSelect
+      />
+      <div style={{ marginBottom: 24, marginTop: 40 }}>用级联组件展示地址</div>
+      {!loading && (
+        <CCascader
+          options={data}
+          onChange={onChange}
+          fieldNames={{ label: "name", value: "id", children: "children" }}
+          placeholder="Please select"
           style={{ width: 328 }}
           changeOnSelect
         />

src/components/c-picker/demos/date-picker.md

@@ -12,10 +12,6 @@ desc: 基本用法，日期选择器。
 import React from "react";
 import moment from "moment";
 import { CPicker as DatePicker, Form, Field, Toggle } from "cloud-react";
-import React from "react";
-import moment from "moment";
-import { CPicker as DatePicker, Form, Field, Toggle } from "cloud-react";
-
 const { TimePicker } = DatePicker;
 
 const presets = [
@@ -36,31 +32,8 @@ const presets = [
     value: () =>
       moment().clone().subtract(1, "years").format("yyyy/MM/DD HH:mm:ss"),
   },
-  {
-    label: "三天前",
-    value: () => moment().clone().subtract(2, "days"),
-  },
-  {
-    label: "一周前",
-    value: () => moment().clone().subtract(6, "days"),
-  },
-  {
-    label: "一月前",
-    value: () => moment().clone().subtract(1, "months").toDate(),
-  },
-  {
-    label: "一年前",
-    value: () =>
-      moment().clone().subtract(1, "years").format("yyyy/MM/DD HH:mm:ss"),
-  },
 ];
 
-const timePresets = [
-  {
-    label: "中午",
-    value: () => moment().clone().startOf("day").add(12, "hours"),
-  },
-];
 const timePresets = [
   {
     label: "中午",
@@ -81,10 +54,6 @@ class DatePickerDemo extends React.Component {
     this.setState({ value });
   };
 
-  onTimeChange = (time) => {
-    console.log("time:", time);
-    this.setState({ time });
-  };
   onTimeChange = (time) => {
     console.log("time:", time);
     this.setState({ time });