From 653737c4811ebcb13b816f2f087eb2c2b53eae45 Mon Sep 17 00:00:00 2001 From: R524809 Date: Tue, 7 Apr 2026 17:23:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=87=8D=E6=9E=84=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=92=8Cicon=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- miniprogram/assets/fonts/demo.css | 487 +++++++------- miniprogram/assets/fonts/demo_index.html | 602 +++++++++++++++++- miniprogram/assets/fonts/iconfont.css | 91 --- miniprogram/assets/fonts/iconfont.js | 2 +- miniprogram/assets/fonts/iconfont.json | 182 ++++++ miniprogram/assets/fonts/iconfont.less | 112 +++- miniprogram/assets/fonts/iconfont.ttf | Bin 6416 -> 11700 bytes miniprogram/assets/fonts/iconfont.woff | Bin 4268 -> 7536 bytes miniprogram/assets/fonts/iconfontV5.less | 91 +++ .../components/color-picker/color-picker.json | 2 +- .../introduction-popup.json | 4 +- .../introduction-popup.wxml | 2 +- .../math-bottom-buttons.json | 2 +- .../math-type-selector.json | 2 +- .../components/shape-card/shape-card.json | 2 +- .../components/shape-card/shape-card.wxml | 2 +- .../components/shape-picker/shape-picker.json | 2 +- .../components/word-card/word-card.json | 2 +- .../components/word-card/word-card.wxml | 2 +- .../components/word-input/word-input.json | 4 +- .../components/word-input/word-input.wxml | 2 +- .../components/word-picker/word-picker.json | 2 +- .../components3.0/nav-bar/nav-bar.json | 4 +- .../components3.0/nav-bar/nav-bar.less | 20 +- miniprogram/components3.0/nav-bar/nav-bar.ts | 12 + .../components3.0/nav-bar/nav-bar.wxml | 6 + .../preview-footer-actions.json | 8 + .../preview-footer-actions.less | 44 ++ .../preview-footer-actions.ts | 40 ++ .../preview-footer-actions.wxml | 23 + .../letterTracing/letterTracing.json | 5 +- .../letterTracing/letterTracing.less | 102 +-- .../letterTracing/letterTracing.wxml | 37 +- .../focusPages/codeConnect/codeConnect.json | 2 +- .../focusPages/colorPattern/colorPattern.json | 2 +- .../colorShapeMatch/colorShapeMatch.json | 2 +- .../focusPages/dotConnect/dotConnect.json | 2 +- .../lineRecognition/lineRecognition.json | 2 +- .../focusPages/matchConnect/matchConnect.json | 2 +- .../positionColoring/positionColoring.json | 2 +- miniprogram/focusPages/shape/shape.json | 2 +- .../focusPages/shapeSymbol/shapeSymbol.json | 2 +- miniprogram/mathPages/breakTen/breakTen.json | 2 +- .../calculationPractice.json | 2 +- miniprogram/mathPages/compare/compare.json | 2 +- .../countingSelect/countingSelect.json | 2 +- miniprogram/mathPages/flatTen/flatTen.json | 2 +- miniprogram/mathPages/makeTen/makeTen.json | 2 +- .../multiplicationTable.json | 2 +- .../mathPages/numberFind/numberFind.json | 2 +- .../numberObjectMatch/numberObjectMatch.json | 2 +- .../mathPages/numberSort/numberSort.json | 2 +- .../oneDigitAddition/oneDigitAddition.json | 2 +- miniprogram/pages/age/age.less | 2 +- miniprogram/pages/copyBook/copyBook.json | 3 +- miniprogram/pages/copyBook/copyBook.wxml | 2 +- miniprogram/pages/favorites/favorites.less | 2 +- miniprogram/pages/home/home.less | 2 +- miniprogram/pages/index/index.json | 2 +- miniprogram/pages/profile/profile.less | 2 +- miniprogram/style/theme.less | 93 ++- miniprogram/style/theme2.less | 40 ++ miniprogram/style/theme3.less | 79 --- miniprogram/supportPages/debug/debug.json | 2 +- miniprogram/{ui => toy}/README.md | 0 .../{ui/button => toy/button-v2}/README.md | 16 +- miniprogram/toy/button-v2/button.json | 8 + miniprogram/toy/button-v2/button.less | 194 ++++++ miniprogram/toy/button-v2/button.ts | 260 ++++++++ .../{ui/button => toy/button-v2}/button.wxml | 31 +- miniprogram/toy/button/button.json | 8 + miniprogram/toy/button/button.less | 317 +++++++++ miniprogram/toy/button/button.ts | 284 +++++++++ miniprogram/toy/button/button.wxml | 40 ++ miniprogram/toy/icon/icon.json | 6 + miniprogram/toy/icon/icon.less | 33 + miniprogram/toy/icon/icon.ts | 95 +++ miniprogram/toy/icon/icon.wxml | 10 + miniprogram/{ui => toy}/wxs/base.wxs | 0 miniprogram/ui/button/button.json | 7 - miniprogram/ui/button/button.less | 184 ------ miniprogram/ui/button/button.ts | 108 ---- miniprogram/ui/button/button.wxs | 33 - miniprogram/ui/icon/icon.json | 4 - miniprogram/ui/icon/icon.less | 21 - miniprogram/ui/icon/icon.ts | 35 - miniprogram/ui/icon/icon.wxml | 4 - miniprogram/utils/navMetrics.ts | 2 +- project.config.json | 132 ++-- project.private.config.json | 237 +------ stitch-ui/buttonUi/DESIGN.md | 54 ++ stitch-ui/buttonUi/code.html | 306 +++++++++ stitch-ui/buttonUi/screen.png | Bin 0 -> 109211 bytes stitch-ui/letterTracing/code.html | 7 +- stitch-ui/letterTracing/screen.png | Bin 126186 -> 127467 bytes 95 files changed, 3261 insertions(+), 1342 deletions(-) delete mode 100644 miniprogram/assets/fonts/iconfont.css create mode 100644 miniprogram/assets/fonts/iconfontV5.less create mode 100644 miniprogram/components3.0/preview-footer-actions/preview-footer-actions.json create mode 100644 miniprogram/components3.0/preview-footer-actions/preview-footer-actions.less create mode 100644 miniprogram/components3.0/preview-footer-actions/preview-footer-actions.ts create mode 100644 miniprogram/components3.0/preview-footer-actions/preview-footer-actions.wxml create mode 100644 miniprogram/style/theme2.less delete mode 100644 miniprogram/style/theme3.less rename miniprogram/{ui => toy}/README.md (100%) rename miniprogram/{ui/button => toy/button-v2}/README.md (87%) create mode 100644 miniprogram/toy/button-v2/button.json create mode 100644 miniprogram/toy/button-v2/button.less create mode 100644 miniprogram/toy/button-v2/button.ts rename miniprogram/{ui/button => toy/button-v2}/button.wxml (51%) create mode 100644 miniprogram/toy/button/button.json create mode 100644 miniprogram/toy/button/button.less create mode 100644 miniprogram/toy/button/button.ts create mode 100644 miniprogram/toy/button/button.wxml create mode 100644 miniprogram/toy/icon/icon.json create mode 100644 miniprogram/toy/icon/icon.less create mode 100644 miniprogram/toy/icon/icon.ts create mode 100644 miniprogram/toy/icon/icon.wxml rename miniprogram/{ui => toy}/wxs/base.wxs (100%) delete mode 100644 miniprogram/ui/button/button.json delete mode 100644 miniprogram/ui/button/button.less delete mode 100644 miniprogram/ui/button/button.ts delete mode 100644 miniprogram/ui/button/button.wxs delete mode 100644 miniprogram/ui/icon/icon.json delete mode 100644 miniprogram/ui/icon/icon.less delete mode 100644 miniprogram/ui/icon/icon.ts delete mode 100644 miniprogram/ui/icon/icon.wxml create mode 100644 stitch-ui/buttonUi/DESIGN.md create mode 100644 stitch-ui/buttonUi/code.html create mode 100644 stitch-ui/buttonUi/screen.png diff --git a/miniprogram/assets/fonts/demo.css b/miniprogram/assets/fonts/demo.css index b79e6d0..a67054a 100644 --- a/miniprogram/assets/fonts/demo.css +++ b/miniprogram/assets/fonts/demo.css @@ -1,176 +1,171 @@ /* Logo 字体 */ @font-face { - font-family: 'iconfont logo'; - /* src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834'); + font-family: "iconfont logo"; + src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834'); src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'), url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'), url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'), - url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg'); */ + url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg'); } .logo { - font-family: 'iconfont logo'; - font-size: 160px; - font-style: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; + font-family: "iconfont logo"; + font-size: 160px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } /* tabs */ .nav-tabs { - position: relative; + position: relative; } .nav-tabs .nav-more { - position: absolute; - right: 0; - bottom: 0; - height: 42px; - line-height: 42px; - color: #666; + position: absolute; + right: 0; + bottom: 0; + height: 42px; + line-height: 42px; + color: #666; } #tabs { - border-bottom: 1px solid #eee; + border-bottom: 1px solid #eee; } #tabs li { - cursor: pointer; - width: 100px; - height: 40px; - line-height: 40px; - text-align: center; - font-size: 16px; - border-bottom: 2px solid transparent; - position: relative; - z-index: 1; - margin-bottom: -1px; - color: #666; + cursor: pointer; + width: 100px; + height: 40px; + line-height: 40px; + text-align: center; + font-size: 16px; + border-bottom: 2px solid transparent; + position: relative; + z-index: 1; + margin-bottom: -1px; + color: #666; } + #tabs .active { - border-bottom-color: #f00; - color: #222; + border-bottom-color: #f00; + color: #222; } .tab-container .content { - display: none; + display: none; } /* 页面布局 */ .main { - padding: 30px 100px; - width: 960px; - margin: 0 auto; + padding: 30px 100px; + width: 960px; + margin: 0 auto; } .main .logo { - color: #333; - text-align: left; - margin-bottom: 30px; - line-height: 1; - height: 110px; - margin-top: -50px; - overflow: hidden; - *zoom: 1; + color: #333; + text-align: left; + margin-bottom: 30px; + line-height: 1; + height: 110px; + margin-top: -50px; + overflow: hidden; + *zoom: 1; } .main .logo a { - font-size: 160px; - color: #333; + font-size: 160px; + color: #333; } .helps { - margin-top: 40px; + margin-top: 40px; } .helps pre { - padding: 20px; - margin: 10px 0; - border: solid 1px #e7e1cd; - background-color: #fffdef; - overflow: auto; + padding: 20px; + margin: 10px 0; + border: solid 1px #e7e1cd; + background-color: #fffdef; + overflow: auto; } .icon_lists { - width: 100% !important; - overflow: hidden; - *zoom: 1; + width: 100% !important; + overflow: hidden; + *zoom: 1; } .icon_lists li { - width: 100px; - margin-bottom: 10px; - margin-right: 20px; - text-align: center; - list-style: none !important; - cursor: default; + width: 100px; + margin-bottom: 10px; + margin-right: 20px; + text-align: center; + list-style: none !important; + cursor: default; } .icon_lists li .code-name { - line-height: 1.2; + line-height: 1.2; } .icon_lists .icon { - display: block; - height: 100px; - line-height: 100px; - font-size: 42px; - margin: 10px auto; - color: #333; - -webkit-transition: - font-size 0.25s linear, - width 0.25s linear; - -moz-transition: - font-size 0.25s linear, - width 0.25s linear; - transition: - font-size 0.25s linear, - width 0.25s linear; + display: block; + height: 100px; + line-height: 100px; + font-size: 42px; + margin: 10px auto; + color: #333; + -webkit-transition: font-size 0.25s linear, width 0.25s linear; + -moz-transition: font-size 0.25s linear, width 0.25s linear; + transition: font-size 0.25s linear, width 0.25s linear; } .icon_lists .icon:hover { - font-size: 100px; + font-size: 100px; } .icon_lists .svg-icon { - /* 通过设置 font-size 来改变图标大小 */ - width: 1em; - /* 图标和文字相邻时，垂直对齐 */ - vertical-align: -0.15em; - /* 通过设置 color 来改变 SVG 的颜色/fill */ - fill: currentColor; - /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示 + /* 通过设置 font-size 来改变图标大小 */ + width: 1em; + /* 图标和文字相邻时，垂直对齐 */ + vertical-align: -0.15em; + /* 通过设置 color 来改变 SVG 的颜色/fill */ + fill: currentColor; + /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示 normalize.css 中也包含这行 */ - overflow: hidden; + overflow: hidden; } .icon_lists li .name, .icon_lists li .code-name { - color: #666; + color: #666; } /* markdown 样式 */ .markdown { - color: #666; - font-size: 14px; - line-height: 1.8; + color: #666; + font-size: 14px; + line-height: 1.8; } .highlight { - line-height: 1.5; + line-height: 1.5; } .markdown img { - vertical-align: middle; - max-width: 100%; + vertical-align: middle; + max-width: 100%; } .markdown h1 { - color: #404040; - font-weight: 500; - line-height: 40px; - margin-bottom: 24px; + color: #404040; + font-weight: 500; + line-height: 40px; + margin-bottom: 24px; } .markdown h2, @@ -178,139 +173,139 @@ .markdown h4, .markdown h5, .markdown h6 { - color: #404040; - margin: 1.6em 0 0.6em 0; - font-weight: 500; - clear: both; + color: #404040; + margin: 1.6em 0 0.6em 0; + font-weight: 500; + clear: both; } .markdown h1 { - font-size: 28px; + font-size: 28px; } .markdown h2 { - font-size: 22px; + font-size: 22px; } .markdown h3 { - font-size: 16px; + font-size: 16px; } .markdown h4 { - font-size: 14px; + font-size: 14px; } .markdown h5 { - font-size: 12px; + font-size: 12px; } .markdown h6 { - font-size: 12px; + font-size: 12px; } .markdown hr { - height: 1px; - border: 0; - background: #e9e9e9; - margin: 16px 0; - clear: both; + height: 1px; + border: 0; + background: #e9e9e9; + margin: 16px 0; + clear: both; } .markdown p { - margin: 1em 0; + margin: 1em 0; } -.markdown > p, -.markdown > blockquote, -.markdown > .highlight, -.markdown > ol, -.markdown > ul { - width: 80%; +.markdown>p, +.markdown>blockquote, +.markdown>.highlight, +.markdown>ol, +.markdown>ul { + width: 80%; } -.markdown ul > li { - list-style: circle; +.markdown ul>li { + list-style: circle; } -.markdown > ul li, -.markdown blockquote ul > li { - margin-left: 20px; - padding-left: 4px; +.markdown>ul li, +.markdown blockquote ul>li { + margin-left: 20px; + padding-left: 4px; } -.markdown > ul li p, -.markdown > ol li p { - margin: 0.6em 0; +.markdown>ul li p, +.markdown>ol li p { + margin: 0.6em 0; } -.markdown ol > li { - list-style: decimal; +.markdown ol>li { + list-style: decimal; } -.markdown > ol li, -.markdown blockquote ol > li { - margin-left: 20px; - padding-left: 4px; +.markdown>ol li, +.markdown blockquote ol>li { + margin-left: 20px; + padding-left: 4px; } .markdown code { - margin: 0 3px; - padding: 0 5px; - background: #eee; - border-radius: 3px; + margin: 0 3px; + padding: 0 5px; + background: #eee; + border-radius: 3px; } .markdown strong, .markdown b { - font-weight: 600; + font-weight: 600; } -.markdown > table { - border-collapse: collapse; - border-spacing: 0px; - empty-cells: show; - border: 1px solid #e9e9e9; - width: 95%; - margin-bottom: 24px; +.markdown>table { + border-collapse: collapse; + border-spacing: 0px; + empty-cells: show; + border: 1px solid #e9e9e9; + width: 95%; + margin-bottom: 24px; } -.markdown > table th { - white-space: nowrap; - color: #333; - font-weight: 600; +.markdown>table th { + white-space: nowrap; + color: #333; + font-weight: 600; } -.markdown > table th, -.markdown > table td { - border: 1px solid #e9e9e9; - padding: 8px 16px; - text-align: left; +.markdown>table th, +.markdown>table td { + border: 1px solid #e9e9e9; + padding: 8px 16px; + text-align: left; } -.markdown > table th { - background: #f7f7f7; +.markdown>table th { + background: #F7F7F7; } .markdown blockquote { - font-size: 90%; - color: #999; - border-left: 4px solid #e9e9e9; - padding-left: 0.8em; - margin: 1em 0; + font-size: 90%; + color: #999; + border-left: 4px solid #e9e9e9; + padding-left: 0.8em; + margin: 1em 0; } .markdown blockquote p { - margin: 0; + margin: 0; } .markdown .anchor { - opacity: 0; - transition: opacity 0.3s ease; - margin-left: 8px; + opacity: 0; + transition: opacity 0.3s ease; + margin-left: 8px; } .markdown .waiting { - color: #ccc; + color: #ccc; } .markdown h1:hover .anchor, @@ -319,26 +314,27 @@ .markdown h4:hover .anchor, .markdown h5:hover .anchor, .markdown h6:hover .anchor { - opacity: 1; - display: inline-block; + opacity: 1; + display: inline-block; } -.markdown > br, -.markdown > p > br { - clear: both; +.markdown>br, +.markdown>p>br { + clear: both; } + .hljs { - display: block; - background: white; - padding: 0.5em; - color: #333333; - overflow-x: auto; + display: block; + background: white; + padding: 0.5em; + color: #333333; + overflow-x: auto; } .hljs-comment, .hljs-meta { - color: #969896; + color: #969896; } .hljs-string, @@ -347,29 +343,29 @@ .hljs-strong, .hljs-emphasis, .hljs-quote { - color: #df5000; + color: #df5000; } .hljs-keyword, .hljs-selector-tag, .hljs-type { - color: #a71d5d; + color: #a71d5d; } .hljs-literal, .hljs-symbol, .hljs-bullet, .hljs-attribute { - color: #0086b3; + color: #0086b3; } .hljs-section, .hljs-name { - color: #63a35c; + color: #63a35c; } .hljs-tag { - color: #333333; + color: #333333; } .hljs-title, @@ -378,21 +374,21 @@ .hljs-selector-class, .hljs-selector-attr, .hljs-selector-pseudo { - color: #795da3; + color: #795da3; } .hljs-addition { - color: #55a532; - background-color: #eaffea; + color: #55a532; + background-color: #eaffea; } .hljs-deletion { - color: #bd2c00; - background-color: #ffecec; + color: #bd2c00; + background-color: #ffecec; } .hljs-link { - text-decoration: underline; + text-decoration: underline; } /* 代码高亮 */ @@ -403,84 +399,85 @@ https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javasc * Based on dabblet (http://dabblet.com) * @author Lea Verou */ -code[class*='language-'], -pre[class*='language-'] { - color: black; - background: none; - text-shadow: 0 1px white; - font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; - text-align: left; - white-space: pre; - word-spacing: normal; - word-break: normal; - word-wrap: normal; - line-height: 1.5; +code[class*="language-"], +pre[class*="language-"] { + color: black; + background: none; + text-shadow: 0 1px white; + font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; + text-align: left; + white-space: pre; + word-spacing: normal; + word-break: normal; + word-wrap: normal; + line-height: 1.5; - -moz-tab-size: 4; - -o-tab-size: 4; - tab-size: 4; + -moz-tab-size: 4; + -o-tab-size: 4; + tab-size: 4; - -webkit-hyphens: none; - -moz-hyphens: none; - -ms-hyphens: none; - hyphens: none; + -webkit-hyphens: none; + -moz-hyphens: none; + -ms-hyphens: none; + hyphens: none; } -pre[class*='language-']::-moz-selection, -pre[class*='language-'] ::-moz-selection, -code[class*='language-']::-moz-selection, -code[class*='language-'] ::-moz-selection { - text-shadow: none; - background: #b3d4fc; +pre[class*="language-"]::-moz-selection, +pre[class*="language-"] ::-moz-selection, +code[class*="language-"]::-moz-selection, +code[class*="language-"] ::-moz-selection { + text-shadow: none; + background: #b3d4fc; } -pre[class*='language-']::selection, -pre[class*='language-'] ::selection, -code[class*='language-']::selection, -code[class*='language-'] ::selection { - text-shadow: none; - background: #b3d4fc; +pre[class*="language-"]::selection, +pre[class*="language-"] ::selection, +code[class*="language-"]::selection, +code[class*="language-"] ::selection { + text-shadow: none; + background: #b3d4fc; } @media print { - code[class*='language-'], - pre[class*='language-'] { - text-shadow: none; - } + + code[class*="language-"], + pre[class*="language-"] { + text-shadow: none; + } } /* Code blocks */ -pre[class*='language-'] { - padding: 1em; - margin: 0.5em 0; - overflow: auto; +pre[class*="language-"] { + padding: 1em; + margin: .5em 0; + overflow: auto; } -:not(pre) > code[class*='language-'], -pre[class*='language-'] { - background: #f5f2f0; +:not(pre)>code[class*="language-"], +pre[class*="language-"] { + background: #f5f2f0; } /* Inline code */ -:not(pre) > code[class*='language-'] { - padding: 0.1em; - border-radius: 0.3em; - white-space: normal; +:not(pre)>code[class*="language-"] { + padding: .1em; + border-radius: .3em; + white-space: normal; } .token.comment, .token.prolog, .token.doctype, .token.cdata { - color: slategray; + color: slategray; } .token.punctuation { - color: #999; + color: #999; } .namespace { - opacity: 0.7; + opacity: .7; } .token.property, @@ -490,7 +487,7 @@ pre[class*='language-'] { .token.constant, .token.symbol, .token.deleted { - color: #905; + color: #905; } .token.selector, @@ -499,7 +496,7 @@ pre[class*='language-'] { .token.char, .token.builtin, .token.inserted { - color: #690; + color: #690; } .token.operator, @@ -507,36 +504,36 @@ pre[class*='language-'] { .token.url, .language-css .token.string, .style .token.string { - color: #9a6e3a; - background: hsla(0, 0%, 100%, 0.5); + color: #9a6e3a; + background: hsla(0, 0%, 100%, .5); } .token.atrule, .token.attr-value, .token.keyword { - color: #07a; + color: #07a; } .token.function, .token.class-name { - color: #dd4a68; + color: #DD4A68; } .token.regex, .token.important, .token.variable { - color: #e90; + color: #e90; } .token.important, .token.bold { - font-weight: bold; + font-weight: bold; } .token.italic { - font-style: italic; + font-style: italic; } .token.entity { - cursor: help; + cursor: help; } diff --git a/miniprogram/assets/fonts/demo_index.html b/miniprogram/assets/fonts/demo_index.html index 5f67239..8a97d7f 100644 --- a/miniprogram/assets/fonts/demo_index.html +++ b/miniprogram/assets/fonts/demo_index.html @@ -54,6 +54,162 @@