保存

fengjutian · Jun 13, 2023 · 11b7de9 · 11b7de9
1 parent 95a3292
commit 11b7de9
Show file tree

Hide file tree

Showing 26 changed files with 151 additions and 6 deletions.
diff --git a/components.json b/components.json
@@ -89,5 +89,6 @@
  "descriptions": "./packages/descriptions/index.js",
  "descriptions-item": "./packages/descriptions-item/index.js",
  "result": "./packages/result/index.js",
- "button-my2": "./packages/button-my2/index.js"
+ "button-my2": "./packages/button-my2/index.js",
+ "button-my3": "./packages/button-my3/index.js"
 }
diff --git a/examples/docs/en-US/button-my3.md b/examples/docs/en-US/button-my3.md
@@ -0,0 +1 @@
+## ButtonMy3
diff --git a/examples/docs/es/button-my3.md b/examples/docs/es/button-my3.md
@@ -0,0 +1 @@
+## ButtonMy3
diff --git a/examples/docs/fr-FR/button-my3.md b/examples/docs/fr-FR/button-my3.md
@@ -0,0 +1 @@
+## ButtonMy3
diff --git a/examples/docs/zh-CN/button-my3.md b/examples/docs/zh-CN/button-my3.md
@@ -0,0 +1 @@
+## ButtonMy3 button-my3
diff --git a/examples/i-element-ui/CNAME b/examples/i-element-ui/CNAME
@@ -1,3 +1,4 @@
 element.eleme.io
 element.eleme.io
 element.eleme.io
+element.eleme.io
diff --git a/examples/i-element-ui/docs.8b2bd64.js b/examples/i-element-ui/docs.8b2bd64.js
diff --git a/examples/i-element-ui/en-US.8b2bd64.js b/examples/i-element-ui/en-US.8b2bd64.js
diff --git a/examples/i-element-ui/en-US~es~fr-FR~zh-CN.8b2bd64.js b/examples/i-element-ui/en-US~es~fr-FR~zh-CN.8b2bd64.js
diff --git a/examples/i-element-ui/es.8b2bd64.js b/examples/i-element-ui/es.8b2bd64.js
diff --git a/examples/i-element-ui/fr-FR.8b2bd64.js b/examples/i-element-ui/fr-FR.8b2bd64.js
diff --git a/examples/i-element-ui/i-element-ui.7cb9506.css b/examples/i-element-ui/i-element-ui.7cb9506.css
diff --git a/examples/i-element-ui/i-element-ui.8b2bd64.js b/examples/i-element-ui/i-element-ui.8b2bd64.js
diff --git a/examples/i-element-ui/index.html b/examples/i-element-ui/index.html
@@ -8,7 +8,7 @@
  <link rel="stylesheet" href="//shadow.elemecdn.com/npm/[email protected]/styles/color-brewer.css">
  <title>Element - The world's most popular Vue UI framework</title>
  <meta name="description" content="Element，一套为开发者、设计师和产品经理准备的基于 Vue 2.0 的桌面端组件库" />
- <link rel="shortcut icon" href="favicon.ico"><link href="i-element-ui.004c440.css" rel="stylesheet"><link href="docs.3501531.css" rel="stylesheet"></head>
+ <link rel="shortcut icon" href="favicon.ico"><link href="i-element-ui.7cb9506.css" rel="stylesheet"><link href="docs.3501531.css" rel="stylesheet"></head>
  <body>
  <script>
  if (!window.Promise) {
@@ -21,7 +21,7 @@
  <script src="//shadow.elemecdn.com/npm/[email protected]/dist/vue-router.min.js"></script>
  <script src="//shadow.elemecdn.com/app/element/highlight.pack.b1f71b31-3c07-11e9-ba1a-55bba1877129.js"></script>
 
- <script type="text/javascript" src="i-element-ui.0bc6df6.js"></script><script type="text/javascript" src="docs.0bc6df6.js"></script></body>
+ <script type="text/javascript" src="i-element-ui.8b2bd64.js"></script><script type="text/javascript" src="docs.8b2bd64.js"></script></body>
  <script>
  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

diff --git a/examples/i-element-ui/versions.json b/examples/i-element-ui/versions.json
@@ -1 +1 @@
-{"1.4.13":"1.4","2.0.11":"2.0","2.1.0":"2.1","2.2.2":"2.2","2.3.9":"2.3","2.4.11":"2.4","2.5.4":"2.5","2.6.3":"2.6","2.7.2":"2.7","2.8.2":"2.8","2.9.2":"2.9","2.10.1":"2.10","2.11.1":"2.11","2.12.0":"2.12","2.13.2":"2.13","2.14.1":"2.14","1.0.5":"2.15"}
+{"1.4.13":"1.4","2.0.11":"2.0","2.1.0":"2.1","2.2.2":"2.2","2.3.9":"2.3","2.4.11":"2.4","2.5.4":"2.5","2.6.3":"2.6","2.7.2":"2.7","2.8.2":"2.8","2.9.2":"2.9","2.10.1":"2.10","2.11.1":"2.11","2.12.0":"2.12","2.13.2":"2.13","2.14.1":"2.14","1.0.6":"2.15"}
diff --git a/examples/i-element-ui/zh-CN.8b2bd64.js b/examples/i-element-ui/zh-CN.8b2bd64.js
diff --git a/examples/nav.config.json b/examples/nav.config.json
@@ -319,6 +319,10 @@
  {
  "path": "/button-my2",
  "title": "ButtonMy2"
+ },
+ {
+ "path": "/button-my3",
+ "title": "ButtonMy3"
  }
  ]
  }
@@ -641,6 +645,10 @@
  {
  "path": "/button-my2",
  "title": "ButtonMy2"
+ },
+ {
+ "path": "/button-my3",
+ "title": "ButtonMy3"
  }
  ]
  }
@@ -963,6 +971,10 @@
  {
  "path": "/button-my2",
  "title": "ButtonMy2"
+ },
+ {
+ "path": "/button-my3",
+ "title": "ButtonMy3"
  }
  ]
  }
@@ -1285,6 +1297,10 @@
  {
  "path": "/button-my2",
  "title": "ButtonMy2"
+ },
+ {
+ "path": "/button-my3",
+ "title": "ButtonMy3"
  }
  ]
  }

diff --git a/examples/play/index.vue b/examples/play/index.vue
@@ -3,6 +3,8 @@
  <el-input v-model="input" placeholder="请输入内容"></el-input>
  <el-button-my type="primary">主要按钮</el-button-my>
  <el-button-my2 >主要按钮</el-button-my2>
+
+ <el-button-my3 >主要按钮</el-button-my3>
  </div>
 </template>
 

diff --git a/packages/button-my3/index.js b/packages/button-my3/index.js
@@ -0,0 +1,8 @@
+import ButtonMy3 from './src/main';
+
+/* istanbul ignore next */
+ButtonMy3.install = function(Vue) {
+ Vue.component(ButtonMy3.name, ButtonMy3);
+};
+
+export default ButtonMy3;
diff --git a/packages/button-my3/src/main.vue b/packages/button-my3/src/main.vue
@@ -0,0 +1,17 @@
+<template>
+ <div class="el-button-my3">
+ Hello button-my3
+ <el-button>默认按钮</el-button>
+ <el-button type="primary">主要按钮</el-button>
+ <el-button type="success">成功按钮</el-button>
+ <el-button type="info">信息按钮</el-button>
+ <el-button type="warning">警告按钮</el-button>
+ <el-button type="danger">危险按钮</el-button>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'ElButtonMy3'
+};
+</script>
diff --git a/packages/theme-chalk/src/button-my3.scss b/packages/theme-chalk/src/button-my3.scss
@@ -0,0 +1,5 @@
+@import "mixins/mixins";
+@import "common/var";
+
+@include b(button-my3) {
+}
diff --git a/packages/theme-chalk/src/index.scss b/packages/theme-chalk/src/index.scss
@@ -87,3 +87,4 @@
 @import "./descriptions-item.scss";
 @import "./result.scss";
 @import "./button-my2.scss";
+@import "./button-my3.scss";
diff --git a/src/index.js b/src/index.js
@@ -91,6 +91,7 @@ import Descriptions from '../packages/descriptions/index.js';
 import DescriptionsItem from '../packages/descriptions-item/index.js';
 import Result from '../packages/result/index.js';
 import ButtonMy2 from '../packages/button-my2/index.js';
+import ButtonMy3 from '../packages/button-my3/index.js';
 import locale from 'i-element-ui/src/locale';
 import CollapseTransition from 'i-element-ui/src/transitions/collapse-transition';
 
@@ -181,6 +182,7 @@ const components = [
  DescriptionsItem,
  Result,
  ButtonMy2,
+ ButtonMy3,
  CollapseTransition
 ];
 
@@ -311,5 +313,6 @@ export default {
  Descriptions,
  DescriptionsItem,
  Result,
- ButtonMy2
+ ButtonMy2,
+ ButtonMy3
 };
diff --git a/test/unit/specs/button-my3.spec.js b/test/unit/specs/button-my3.spec.js
@@ -0,0 +1,15 @@
+import { createTest, destroyVM } from '../util';
+import ButtonMy3 from 'packages/button-my3';
+
+describe('ButtonMy3', () => {
+ let vm;
+ afterEach(() => {
+ destroyVM(vm);
+ });
+
+ it('create', () => {
+ vm = createTest(ButtonMy3, true);
+ expect(vm.$el).to.exist;
+ });
+});
+
diff --git a/types/button-my3.d.ts b/types/button-my3.d.ts
@@ -0,0 +1,5 @@
+import { ElementUIComponent } from './component'
+
+/** ButtonMy3 Component */
+export declare class ElButtonMy3 extends ElementUIComponent {
+}
diff --git a/types/element-ui.d.ts b/types/element-ui.d.ts
@@ -91,7 +91,8 @@ import { ElResult } from './result'
 import { ElStatistic } from './statistic'
 
 import { ElButtonMy2 } from './button-my2'
-
+import { ElButtonMy3 } from './button-my3'
+
 export interface InstallationOptions {
  locale: any,
  i18n: any,
@@ -386,3 +387,6 @@ export class Statistic extends ElStatistic {}
 export class ButtonMy2 extends ElButtonMy2 {}
 
 
+
+/** ButtonMy3 Component */
+export class ButtonMy3 extends ElButtonMy3 {}