From c9c6a52fc71cbaacd14f0bc113b3a31d944327aa Mon Sep 17 00:00:00 2001
From: tengchong <26172583@qq.com>
Date: Sun, 25 Apr 2021 21:22:26 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/data-display/Ellipsis.vue      | 24 +++++
 .../components/data-display/NumberInfo.vue    | 43 +++++++++
 .../sample/components/data-display/Trend.vue  | 33 +++++++
 .../sample/components/data-entry/Cron.vue     | 43 +++++++++
 .../sample/components/data-entry/Dict.vue     | 68 ++++++++++++++
 .../components/data-entry/IconSelector.vue    | 52 +++++++++++
 .../components/data-entry/LimitTextArea.vue   | 27 ++++++
 .../data-entry/UserSearchSelect.vue           | 59 ++++++++++++
 .../sample/components/general/Button.vue      | 92 +++++++++++++++++++
 .../sample/components/general/Loading.vue     | 31 +++++++
 10 files changed, 472 insertions(+)
 create mode 100644 src/views/sample/components/data-display/Ellipsis.vue
 create mode 100644 src/views/sample/components/data-display/NumberInfo.vue
 create mode 100644 src/views/sample/components/data-display/Trend.vue
 create mode 100644 src/views/sample/components/data-entry/Cron.vue
 create mode 100644 src/views/sample/components/data-entry/Dict.vue
 create mode 100644 src/views/sample/components/data-entry/IconSelector.vue
 create mode 100644 src/views/sample/components/data-entry/LimitTextArea.vue
 create mode 100644 src/views/sample/components/data-entry/UserSearchSelect.vue
 create mode 100644 src/views/sample/components/general/Button.vue
 create mode 100644 src/views/sample/components/general/Loading.vue

diff --git a/src/views/sample/components/data-display/Ellipsis.vue b/src/views/sample/components/data-display/Ellipsis.vue
new file mode 100644
index 0000000..88b0cbc
--- /dev/null
+++ b/src/views/sample/components/data-display/Ellipsis.vue
@@ -0,0 +1,24 @@
+<template>
+  <a-card title="Ellipsis - 文字截取" :bordered="false">
+    <a slot="extra" target="_blank" href="http://rest-doc.easy-frame.top/front-end/components/general.html">文档地址</a>
+    <p>
+      文本过长自动处理省略号，支持按照文本长度截取。
+    </p>
+    <ellipsis :length="100">
+      There were injuries alleged in three cases in 2015, and a
+      fourth incident in September, according to the safety recall report. After meeting with US regulators in October, the firm decided to issue a voluntary recall.
+    </ellipsis>
+  </a-card>
+</template>
+
+<script>
+import Ellipsis from '@/components/Ellipsis/Ellipsis'
+export default {
+  name: 'SampleComponentsDataDisplayEllipsis',
+  components: { Ellipsis }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/sample/components/data-display/NumberInfo.vue b/src/views/sample/components/data-display/NumberInfo.vue
new file mode 100644
index 0000000..a322b4d
--- /dev/null
+++ b/src/views/sample/components/data-display/NumberInfo.vue
@@ -0,0 +1,43 @@
+<template>
+  <a-card title="NumberInfo - 数据文本" :bordered="false">
+    <a slot="extra" target="_blank" href="http://rest-doc.easy-frame.top/front-end/components/general.html">文档地址</a>
+    <p>
+      常用在数据卡片中，用于突出展示某个业务数据。
+    </p>
+
+    <a-row>
+      <a-col :lg="12">
+        <number-info
+          :sub-title="() => { return '周访问量' }"
+          :total="12"
+          status="up"
+          :sub-total="`2%`"></number-info>
+      </a-col>
+      <a-col :lg="12">
+        <number-info
+          :sub-title="() => { return '月访问量' }"
+          :total="12421"
+          status="down"
+          :sub-total="`5%`"></number-info>
+      </a-col>
+    </a-row>
+  </a-card>
+</template>
+
+<script>
+import NumberInfo from '@/components/NumberInfo/NumberInfo'
+export default {
+  name: 'SampleComponentsDataDisplayNumberInfo',
+  components: { NumberInfo },
+  data () {
+    return {
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/sample/components/data-display/Trend.vue b/src/views/sample/components/data-display/Trend.vue
new file mode 100644
index 0000000..c5dc332
--- /dev/null
+++ b/src/views/sample/components/data-display/Trend.vue
@@ -0,0 +1,33 @@
+<template>
+  <a-card title="Trend - 趋势标记" :bordered="false">
+    <a slot="extra" target="_blank" href="http://rest-doc.easy-frame.top/front-end/components/general.html">文档地址</a>
+    <p>
+      趋势符号，标记上升和下降趋势。通常用绿色代表“好”，红色代表“不好”，股票涨跌场景除外。
+    </p>
+
+    <trend flag="up">5%</trend>
+    <trend flag="down">5%</trend>
+    <a-divider>颜色反转</a-divider>
+    <trend flag="up" :reverse-color="true">5%</trend>
+    <trend flag="down" :reverse-color="true">5%</trend>
+  </a-card>
+</template>
+
+<script>
+import NumberInfo from '@/components/NumberInfo/NumberInfo'
+import Trend from '@/components/Trend/Trend'
+export default {
+  name: 'SampleComponentsDataDisplayTrend',
+  components: { Trend, NumberInfo },
+  data () {
+    return {
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/sample/components/data-entry/Cron.vue b/src/views/sample/components/data-entry/Cron.vue
new file mode 100644
index 0000000..a3dc1f2
--- /dev/null
+++ b/src/views/sample/components/data-entry/Cron.vue
@@ -0,0 +1,43 @@
+<template>
+  <div class="sample-components-general">
+    <a-card title="Cron - Cron选择器" :bordered="false">
+      <p>可视化生成Cron表达式</p>
+      <a-form-model
+        ref="form"
+        :label-col="FORM_LAYOUT.labelCol"
+        :wrapper-col="FORM_LAYOUT.wrapperCol">
+        <a-row class="form-row" :gutter="16">
+          <a-col :lg="12" :sm="24">
+            <a-form-model-item label="Cron">
+              <e-cron v-model="value"/>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import { FORM_LAYOUT, FULL_FORM_LAYOUT } from '@/utils/const/form'
+import ECron from '@/components/Easy/data-entry/corn/Cron'
+
+export default {
+  name: 'SampleComponentsDataEntryCron',
+  components: { ECron },
+  data () {
+    return {
+      FULL_FORM_LAYOUT: FULL_FORM_LAYOUT,
+      FORM_LAYOUT: FORM_LAYOUT,
+      value: '0 0 0 1/1 * ? *'
+    }
+  },
+  mounted () {
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/sample/components/data-entry/Dict.vue b/src/views/sample/components/data-entry/Dict.vue
new file mode 100644
index 0000000..b7c608e
--- /dev/null
+++ b/src/views/sample/components/data-entry/Dict.vue
@@ -0,0 +1,68 @@
+<template>
+  <div class="sample-components-general">
+    <a-card title="字典" :bordered="false">
+      <p>根据后端设置的字典数据封装了字典相关的Select、Radio、Checkbox和Tag组件</p>
+      <a-form-model
+        ref="form"
+        :label-col="FORM_LAYOUT.labelCol"
+        :wrapper-col="FORM_LAYOUT.wrapperCol">
+        <a-row class="form-row" :gutter="16">
+          <a-col :lg="12" :sm="24">
+            <a-form-model-item label="Select">
+              <e-dict-select v-model="sex" type="sex"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :lg="12" :sm="24">
+            <a-form-model-item label="Select 多选">
+              <e-dict-select v-model="sexArray" mode="multiple" type="sex"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :lg="12" :sm="24">
+            <a-form-model-item label="Radio">
+              <e-dict-radio v-model="sex" type="sex"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :lg="12" :sm="24">
+            <a-form-model-item label="Checkbox">
+              <e-dict-checkbox v-model="sexArray" type="sex"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :lg="12" :sm="24">
+            <a-form-model-item label="Tags">
+              <e-dict-tag type="sex" code="1"/>
+              <e-dict-tag type="sex" code="2"/>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import { FORM_LAYOUT, FULL_FORM_LAYOUT } from '@/utils/const/form'
+import EDictSelect from '@/components/Easy/data-entry/DictSelect'
+import EDictRadio from '@/components/Easy/data-entry/DictRadio'
+import EDictCheckbox from '@/components/Easy/data-entry/DictCheckbox'
+import EDictTag from '@/components/Easy/data-display/DictTag'
+
+export default {
+  name: 'SampleComponentsDataEntryDict',
+  components: { EDictTag, EDictCheckbox, EDictRadio, EDictSelect },
+  data () {
+    return {
+      FULL_FORM_LAYOUT: FULL_FORM_LAYOUT,
+      FORM_LAYOUT: FORM_LAYOUT,
+      sex: '1',
+      sexArray: ['1', '2']
+    }
+  },
+  mounted () {
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/sample/components/data-entry/IconSelector.vue b/src/views/sample/components/data-entry/IconSelector.vue
new file mode 100644
index 0000000..da3c56b
--- /dev/null
+++ b/src/views/sample/components/data-entry/IconSelector.vue
@@ -0,0 +1,52 @@
+<template>
+  <a-card title="IconSelector - 图标选择器" :bordered="false">
+    <a slot="extra" target="_blank" href="http://rest-doc.easy-frame.top/front-end/components/general.html">文档地址</a>
+    <p>
+      图标选择器
+    </p>
+
+    <a-divider>直接在页面中显示</a-divider>
+    <icon-select/>
+    <a-divider>选择一个图标</a-divider>
+    <a-input v-model="icon" @click="handleIconInputClick" style="width: 200px">
+      <a-icon slot="addonAfter" v-if="icon != null && icon !== ''" :type="icon"/>
+    </a-input>
+
+    <a-modal width="960px" v-model="iconModalVisible" title="选择图标" @ok="handleOk">
+      <icon-select v-model="currentSelectedIcon" @change="handleIconChange"/>
+    </a-modal>
+  </a-card>
+</template>
+
+<script>
+import IconSelect from '@/components/IconSelector/IconSelector'
+export default {
+  name: 'SampleComponentsDataEntryIconSelector',
+  components: { IconSelect },
+  data () {
+    return {
+      // 显示图标对话框
+      iconModalVisible: false,
+      currentSelectedIcon: null,
+      icon: 'lock'
+    }
+  },
+  methods: {
+    handleIconInputClick () {
+      this.currentSelectedIcon = this.icon
+      this.iconModalVisible = true
+    },
+    handleOk () {
+      this.icon = this.currentSelectedIcon
+      this.iconModalVisible = false
+    },
+    handleIconChange (icon) {
+      this.currentSelectedIcon = icon
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/sample/components/data-entry/LimitTextArea.vue b/src/views/sample/components/data-entry/LimitTextArea.vue
new file mode 100644
index 0000000..5f7d0ab
--- /dev/null
+++ b/src/views/sample/components/data-entry/LimitTextArea.vue
@@ -0,0 +1,27 @@
+<template>
+  <a-card title="LimitTextArea - 文字数量提示" :bordered="false">
+    <a slot="extra" target="_blank" href="http://rest-doc.easy-frame.top/front-end/components/general.html">文档地址</a>
+    <p>
+      提示允许输入多少个字、已输入多少字
+    </p>
+    <limit-text-area v-model="value"/>
+  </a-card>
+</template>
+
+<script>
+import Ellipsis from '@/components/Ellipsis/Ellipsis'
+import LimitTextArea from '@/components/TextArea'
+export default {
+  name: 'SampleComponentsDataEntryLimitTextArea',
+  components: { LimitTextArea, Ellipsis },
+  data () {
+    return {
+      value: 'There were injuries alleged in three cases in 2015, and a fourth incident in September, according to the safety recall report. After meeting with US regulators in October.'
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/sample/components/data-entry/UserSearchSelect.vue b/src/views/sample/components/data-entry/UserSearchSelect.vue
new file mode 100644
index 0000000..c86ec45
--- /dev/null
+++ b/src/views/sample/components/data-entry/UserSearchSelect.vue
@@ -0,0 +1,59 @@
+<template>
+  <div class="sample-components-general">
+    <a-card title="EUserSearchSelect - 用户选择器" :bordered="false">
+      <a
+        slot="extra"
+        target="_blank"
+        href="http://rest-doc.easy-frame.top/front-end/components/data-entry/user-search-select.html">文档地址</a>
+      <p>
+        根据用户名、昵称、部门名称搜索，选择一个或多个用户
+      </p>
+      <a-form-model
+        ref="form"
+        :label-col="FORM_LAYOUT.labelCol"
+        :wrapper-col="FORM_LAYOUT.wrapperCol">
+        <a-row class="form-row" :gutter="16">
+          <a-col :lg="12" :sm="24">
+            <a-form-model-item label="单选">
+              <e-user-search-select v-model="value1"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :lg="12" :sm="24">
+            <a-form-model-item label="限当前部门">
+              <e-user-search-select v-model="value3" range="currentDept"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :sm="24">
+            <a-form-model-item label="多选" :labelCol="FULL_FORM_LAYOUT.labelCol" :wrapperCol="FULL_FORM_LAYOUT.wrapperCol">
+              <e-user-search-select v-model="value2" mode="multiple"/>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import EUserSearchSelect from '@/components/Easy/data-entry/UserSearchSelect'
+import { FORM_LAYOUT, FULL_FORM_LAYOUT } from '@/utils/const/form'
+
+export default {
+  name: 'SampleComponentsDataEntryUserSearchSelect',
+  components: { EUserSearchSelect },
+  data () {
+    return {
+      FULL_FORM_LAYOUT: FULL_FORM_LAYOUT,
+      FORM_LAYOUT: FORM_LAYOUT,
+
+      value1: '1',
+      value2: ['1', '0d77057dcae2af878ee7bb336bb2f254'],
+      value3: ['1']
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/sample/components/general/Button.vue b/src/views/sample/components/general/Button.vue
new file mode 100644
index 0000000..238e4cc
--- /dev/null
+++ b/src/views/sample/components/general/Button.vue
@@ -0,0 +1,92 @@
+<template>
+  <div class="sample-components">
+    <a-card title="Button - 按钮" :bordered="false">
+      <a slot="extra" target="_blank" href="http://rest-doc.easy-frame.top/front-end/components/general.html">文档地址</a>
+      <p>
+        我们将常用的按钮（新增、删除、修改等）封装成公用的组件，以保持在不同模块中按钮形式保持一致。
+      </p>
+      <a-row>
+        <a-col :lg="12">
+          <h3>常规按钮</h3>
+          <p>一般放到表格右上角</p>
+          <h4>EBtnAdd 新增</h4>
+          <p>打开新增页面</p>
+          <div class="btn-group">
+            <e-btn-add to="/sys/sample/input"/>
+            <!-- 自定义按钮文字 -->
+            <e-btn-add to="/sys/sample/input">自定义文字</e-btn-add>
+          </div>
+          <h4>EBtnRemoveBatch 删除</h4>
+          <p>批量删除数据</p>
+          <div class="btn-group">
+            <e-btn-remove-batch :ids="[1]" />
+            <!-- 自定义按钮文字 -->
+            <e-btn-remove-batch :ids="[1]" >自定义文字</e-btn-remove-batch>
+          </div>
+          <h4>EBtnSave 保存</h4>
+          <p>表单填写页面底部的保存</p>
+          <div class="btn-group">
+            <e-btn-save/>
+            <!-- 自定义按钮文字 -->
+            <e-btn-save>自定义文字</e-btn-save>
+          </div>
+          <h4>EBtnImport 导入</h4>
+          <p>通过Excel导入数据，点击打开导入页面</p>
+          <div class="btn-group">
+            <e-btn-import import-code="xxx"/>
+            <!-- 自定义按钮文字 -->
+            <e-btn-import import-code="xxx">自定义文字</e-btn-import>
+          </div>
+        </a-col>
+        <a-col :lg="12">
+          <h3>表格操作列按钮</h3>
+          <p>一般用于表格最后一列的操作列中。</p>
+          <h4>EBtnAddSub 新增下级</h4>
+          <p>打开新增页面并指定一个上级id</p>
+          <e-btn-add-sub to="/sys/sample/input" :params="{id: 'xxx'}"/>
+          <h4>EBtnEdit 修改</h4>
+          <p>打开修改页面</p>
+          <e-btn-edit to="/sys/sample/input"/>
+          <h4>EBtnInfo 查看</h4>
+          <p>打开查看页面</p>
+          <e-btn-info to="/sys/sample/info"/>
+          <h4>EBtnRemove 删除</h4>
+          <p>删除一条数据</p>
+          <e-btn-remove/>
+          <h4>EBtnWorkFlowStart 发起流程</h4>
+          <e-btn-work-flow-start
+            model-key="sample"
+            business-key="xxx"
+            business-title="工作名称"
+            business-details-path="views/sample/work-flow/Info"/>
+          <h4>EBtnWorkFlowProgress 审核进度</h4>
+          <e-btn-work-flow-progress business-key="xxx"/>
+          <h4>EBtnWorkFlowRevoke 撤销申请</h4>
+          <e-btn-work-flow-revoke business-key="xxx"/>
+        </a-col>
+      </a-row>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import EBtnAdd from '@/components/Easy/general/BtnAdd'
+import EBtnRemove from '@/components/Easy/general/BtnRemove'
+import EBtnRemoveBatch from '@/components/Easy/general/BtnRemoveBatch'
+import EBtnSave from '@/components/Easy/general/BtnSave'
+import EBtnImport from '@/components/Easy/general/BtnImport'
+import EBtnAddSub from '@/components/Easy/general/BtnAddSub'
+import EBtnEdit from '@/components/Easy/general/BtnEdit'
+import EBtnInfo from '@/components/Easy/general/BtnInfo'
+import EBtnWorkFlowStart from '@/components/Easy/general/work-flow/BtnStart'
+import EBtnWorkFlowProgress from '@/components/Easy/general/work-flow/BtnProgress'
+import EBtnWorkFlowRevoke from '@/components/Easy/general/work-flow/BtnRevoke'
+export default {
+name: 'SampleComponentsGeneralButton',
+  components: { EBtnWorkFlowRevoke, EBtnWorkFlowProgress, EBtnWorkFlowStart, EBtnInfo, EBtnEdit, EBtnAddSub, EBtnImport, EBtnSave, EBtnRemoveBatch, EBtnRemove, EBtnAdd }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/sample/components/general/Loading.vue b/src/views/sample/components/general/Loading.vue
new file mode 100644
index 0000000..37366f5
--- /dev/null
+++ b/src/views/sample/components/general/Loading.vue
@@ -0,0 +1,31 @@
+<template>
+  <a-card title="Loading - 加载提示" :bordered="false">
+    <a slot="extra" target="_blank" href="http://rest-doc.easy-frame.top/front-end/components/general.html">文档地址</a>
+    <p>
+      添加全局的loading状态
+    </p>
+    <div class="btn-group">
+      <a-button @click="showLoading(null)">显示Loading</a-button>
+      <a-button @click="showLoading('自定义文字')">自定义文字</a-button>
+    </div>
+  </a-card>
+</template>
+
+<script>
+export default {
+  name: 'SampleComponentsGeneralLoading',
+  methods: {
+    showLoading (tip) {
+      this.$loading.show({ tip: tip || null })
+
+      setTimeout(() => {
+        this.$loading.hide()
+      }, 2000)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
-- 
Gitee


From 4770abcc27fb79140d3c7c8a2486580b2b1dc1da Mon Sep 17 00:00:00 2001
From: tengchong <26172583@qq.com>
Date: Sun, 25 Apr 2021 21:23:45 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=B9=BF=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Other/CarbonAds.vue | 114 -----------------------------
 src/layouts/BasicLayout.vue        |   2 -
 2 files changed, 116 deletions(-)
 delete mode 100644 src/components/Other/CarbonAds.vue

diff --git a/src/components/Other/CarbonAds.vue b/src/components/Other/CarbonAds.vue
deleted file mode 100644
index 1e53ba6..0000000
--- a/src/components/Other/CarbonAds.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-<script>
-const carbonUrl = '//cdn.carbonads.com/carbon.js?serve=CK7DL2JW&placement=antdvcom'
-export default {
-  props: {
-    isMobile: Boolean
-  },
-  watch: {
-    $route (e, t) {
-      const adId = '#carbonads'
-      // if(isGitee) {
-      //   adId = '#cf';
-      // }
-      if (e.path !== t.path && this.$el.querySelector(adId)) {
-        this.$el.innerHTML = ''
-        this.load()
-      }
-      this.adInterval && clearInterval(this.adInterval)
-      this.adInterval = setInterval(() => {
-        if (!this.$el.querySelector(adId)) {
-          this.$el.innerHTML = ''
-          this.load()
-        }
-      }, 20000)
-    }
-  },
-  mounted () {
-    this.load()
-  },
-  methods: {
-    load () {
-      // if(isGitee) {
-      //   axios.get('https://api.codefund.app/properties/162/funder.html?template=horizontal')
-      //   .then(function (response) {
-      //     document.getElementById("codefund-ads").innerHTML = response.data;
-      //   });
-      // } else
-      if (carbonUrl) {
-        const e = document.createElement('script')
-        e.id = '_carbonads_js'
-        e.src = carbonUrl
-        this.$el.appendChild(e)
-      }
-    }
-  },
-  render () {
-    return <div id="carbon-ads" class={this.isMobile ? 'carbon-mobile' : ''} />
-  }
-}
-</script>
-<style lang="less">
-#carbon-ads {
-  width: 256px;
-  /* float: right; */
-  margin-top: 75px;
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  padding: 0;
-  overflow: hidden;
-  z-index: 100;
-  background-color: #fff;
-  /* border-radius: 3px; */
-  font-size: 13px;
-  background: #f5f5f5;
-  font-family: 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif;
-}
-#carbonads {
-  overflow: hidden;
-}
-#carbon-ads a {
-  display: inline-block;
-  color: #7f8c8d;
-  font-weight: normal;
-}
-#carbon-ads span {
-  color: #7f8c8d;
-}
-#carbon-ads img {
-  float: left;
-  padding-right: 10px;
-}
-#carbon-ads .carbon-img,
-#carbon-ads .carbon-text {
-  display: block;
-  font-weight: normal;
-  color: #34495e;
-}
-#carbon-ads .carbon-text {
-  padding-top: 6px;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 4;
-  overflow: hidden;
-}
-#carbon-ads .carbon-poweredby {
-  color: #aaa;
-  font-weight: normal;
-  line-height: 1.2;
-  margin-top: 6px;
-}
-#carbon-ads.carbon-mobile {
-  width: 100%;
-  position: relative;
-  right: 0;
-  bottom: 0;
-  padding: 0;
-  margin-bottom: 15px;
-  margin-top: 5px;
-  .carbon-img {
-    float: left;
-    margin-right: 10px;
-  }
-}
-</style>
diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue
index 6fb46c7..0465657 100644
--- a/src/layouts/BasicLayout.vue
+++ b/src/layouts/BasicLayout.vue
@@ -48,7 +48,6 @@ import { CONTENT_WIDTH_TYPE, SIDEBAR_TYPE, TOGGLE_MOBILE_TYPE } from '@/store/mu
 import defaultSettings from '@/config/defaultSettings'
 import RightContent from '@/components/GlobalHeader/RightContent'
 import GlobalFooter from '@/components/GlobalFooter'
-import Ads from '@/components/Other/CarbonAds'
 import LogoSvg from '@/assets/logo.svg?inline'
 import BaseMenu from '@/components/RouteMenu'
 import { isNotBlank } from '@/utils/util'
@@ -62,7 +61,6 @@ export default {
     RightContent,
     GlobalFooter,
     LogoSvg,
-    Ads,
     BaseMenu
   },
   data () {
-- 
Gitee


From bc6a4f087aed93cf32da77a17b75bcce45c62681 Mon Sep 17 00:00:00 2001
From: tengchong <26172583@qq.com>
Date: Sun, 25 Apr 2021 21:24:13 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sys/user.js                             |  6 ++++--
 .../Easy/data-entry/UserSearchSelect.vue        |  7 +++++--
 src/components/Ellipsis/Ellipsis.vue            | 17 ++---------------
 src/components/Ellipsis/index.md                |  6 +++---
 src/components/NumberInfo/NumberInfo.vue        |  2 +-
 src/components/PageLoading/index.jsx            |  2 +-
 src/components/TextArea/index.jsx               |  1 -
 src/components/Trend/Trend.vue                  | 10 +++++-----
 src/components/_util/util.js                    |  2 +-
 9 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/src/api/sys/user.js b/src/api/sys/user.js
index 5ae043f..37ae499 100644
--- a/src/api/sys/user.js
+++ b/src/api/sys/user.js
@@ -21,14 +21,16 @@ export function select (params) {
  * 搜索
  *
  * @param keyword 关键字
+ * @param range 数据范围，可以选择哪些用户 'all' | 'currentDept'
  * @return Page<SysUser>
  */
-export function selectByKeyword (keyword) {
+export function selectByKeyword (keyword, range) {
   return request({
     url: `${baseUrl}keyword`,
     method: HTTP_METHOD.GET,
     params: {
-      keyword
+      keyword,
+      range
     }
   })
 }
diff --git a/src/components/Easy/data-entry/UserSearchSelect.vue b/src/components/Easy/data-entry/UserSearchSelect.vue
index 1ff2b15..a209118 100644
--- a/src/components/Easy/data-entry/UserSearchSelect.vue
+++ b/src/components/Easy/data-entry/UserSearchSelect.vue
@@ -32,7 +32,10 @@ export default {
   name: 'EUserSearchSelect',
   components: { EAvatar },
   props: {
-    mode: PropTypes.string.def(),
+    // 设置 Select 的模式为多选或标签 'default' | 'multiple' | 'tags' | 'combobox'
+    mode: PropTypes.string.def('default'),
+    // 数据范围，可以选择哪些用户 'all' | 'currentDept'
+    range: PropTypes.string.def('all'),
     placeholder: PropTypes.string.def('输入用户名、昵称、部门查询用户'),
     disabled: PropTypes.bool.def(false),
     allowClear: PropTypes.bool.def(true),
@@ -97,7 +100,7 @@ export default {
     selectUser (value) {
       if (isNotBlank(value)) {
         this.fetching = true
-        selectByKeyword(value).then(res => {
+        selectByKeyword(value, this.range).then(res => {
           this.selectOptions = res.data.data
           this.fetching = false
         })
diff --git a/src/components/Ellipsis/Ellipsis.vue b/src/components/Ellipsis/Ellipsis.vue
index 25eb7ee..7998a2a 100644
--- a/src/components/Ellipsis/Ellipsis.vue
+++ b/src/components/Ellipsis/Ellipsis.vue
@@ -1,30 +1,17 @@
 <script>
 import Tooltip from 'ant-design-vue/es/tooltip'
 import { cutStrByFullLength, getStrFullLength } from '@/components/_util/util'
+import PropTypes from 'ant-design-vue/es/_util/vue-types'
 export default {
   name: 'Ellipsis',
   components: {
     Tooltip
   },
   props: {
-    prefixCls: {
-      type: String,
-      default: 'ant-pro-ellipsis'
-    },
-    tooltip: {
-      type: Boolean
-    },
+    tooltip: PropTypes.bool.def(true),
     length: {
       type: Number,
       required: true
-    },
-    lines: {
-      type: Number,
-      default: 1
-    },
-    fullWidthRecognition: {
-      type: Boolean,
-      default: false
     }
   },
   methods: {
diff --git a/src/components/Ellipsis/index.md b/src/components/Ellipsis/index.md
index f528ac7..e0b9a6a 100644
--- a/src/components/Ellipsis/index.md
+++ b/src/components/Ellipsis/index.md
@@ -1,6 +1,6 @@
 # Ellipsis 文本自动省略号
 
-文本过长自动处理省略号，支持按照文本长度和最大行数两种方式截取。
+文本过长自动处理省略号，支持按照文本长度截取。
 
 
 
@@ -34,5 +34,5 @@ export default {
 
 参数 | 说明 | 类型 | 默认值
 ----|------|-----|------
-tooltip | 移动到文本展示完整内容的提示 | boolean | -
-length | 在按照长度截取下的文本最大字符数，超过则截取省略 | number | -
\ No newline at end of file
+tooltip | 移动到文本展示完整内容的提示 | boolean | true 
+length | 在按照长度截取下的文本最大字符数，超过则截取省略 | number | -
diff --git a/src/components/NumberInfo/NumberInfo.vue b/src/components/NumberInfo/NumberInfo.vue
index bdde3e0..1d44ccb 100644
--- a/src/components/NumberInfo/NumberInfo.vue
+++ b/src/components/NumberInfo/NumberInfo.vue
@@ -28,7 +28,7 @@ export default {
       required: true
     },
     subTotal: {
-      type: Number,
+      type: [String, Number],
       required: true
     },
     subTitle: {
diff --git a/src/components/PageLoading/index.jsx b/src/components/PageLoading/index.jsx
index af6d6d6..3d5b476 100644
--- a/src/components/PageLoading/index.jsx
+++ b/src/components/PageLoading/index.jsx
@@ -5,7 +5,7 @@ export const PageLoading = {
   props: {
     tip: {
       type: String,
-      default: 'Loading..'
+      default: 'Loading...'
     },
     size: {
       type: String,
diff --git a/src/components/TextArea/index.jsx b/src/components/TextArea/index.jsx
index 00aeb2f..28c38a2 100644
--- a/src/components/TextArea/index.jsx
+++ b/src/components/TextArea/index.jsx
@@ -14,7 +14,6 @@ export default {
       type: String,
       default: 'ant-textarea-limit'
     },
-    // eslint-disable-next-line
     value: {
       type: String
     },
diff --git a/src/components/Trend/Trend.vue b/src/components/Trend/Trend.vue
index 526e1cc..d770b86 100644
--- a/src/components/Trend/Trend.vue
+++ b/src/components/Trend/Trend.vue
@@ -19,15 +19,15 @@ export default {
       default: 'ant-pro-trend'
     },
     /**
-       * 上升下降标识：up|down
-       */
+     * 上升下降标识：up|down
+     */
     flag: {
       type: String,
       required: true
     },
     /**
-       * 颜色反转
-       */
+     * 颜色反转
+     */
     reverseColor: {
       type: Boolean,
       default: false
@@ -37,5 +37,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
-  @import "index";
+@import "index";
 </style>
diff --git a/src/components/_util/util.js b/src/components/_util/util.js
index 8f715da..82d3c2c 100644
--- a/src/components/_util/util.js
+++ b/src/components/_util/util.js
@@ -16,7 +16,7 @@ export function filterEmpty (children = []) {
  * @param {*} str
  */
 export const getStrFullLength = (str = '') => {
-  str.split('').reduce((pre, cur) => {
+  return str.split('').reduce((pre, cur) => {
     const charCode = cur.charCodeAt(0)
     if (charCode >= 0 && charCode <= 128) {
       return pre + 1
-- 
Gitee


From 17b8adc83ed8027c38a5f88cd5c80dbbca92eb30 Mon Sep 17 00:00:00 2001
From: tengchong <26172583@qq.com>
Date: Sun, 25 Apr 2021 21:24:47 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83=20v.0.?=
 =?UTF-8?q?8.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env             | 2 +-
 .env.development | 2 +-
 .env.preview     | 2 +-
 CHANGELOG.md     | 7 ++++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.env b/.env
index 315bc61..381bfd3 100644
--- a/.env
+++ b/.env
@@ -2,4 +2,4 @@ NODE_ENV=production
 VUE_APP_PREVIEW=true
 # 后端服务访问地址
 VUE_APP_API_BASE_URL=http://rest-api.easy-frame.top
-VUE_APP_VERSION=0.8.0
\ No newline at end of file
+VUE_APP_VERSION=0.8.1
\ No newline at end of file
diff --git a/.env.development b/.env.development
index dd8888f..db1e9ca 100644
--- a/.env.development
+++ b/.env.development
@@ -2,6 +2,6 @@ NODE_ENV=development
 VUE_APP_PREVIEW=true
 # 后端服务访问地址
 VUE_APP_API_BASE_URL=http://127.0.0.1
-VUE_APP_VERSION=0.8.0
+VUE_APP_VERSION=0.8.1
 # 代码生成 - 前端项目路径（填写前端项目所在磁盘路径）
 VUE_APP_FRONT_END_PATH=/Users/tengchong/workspaces/webStorm/vue/Easy-RESTful-UI
\ No newline at end of file
diff --git a/.env.preview b/.env.preview
index 315bc61..381bfd3 100644
--- a/.env.preview
+++ b/.env.preview
@@ -2,4 +2,4 @@ NODE_ENV=production
 VUE_APP_PREVIEW=true
 # 后端服务访问地址
 VUE_APP_API_BASE_URL=http://rest-api.easy-frame.top
-VUE_APP_VERSION=0.8.0
\ No newline at end of file
+VUE_APP_VERSION=0.8.1
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18a00a2..5f21a56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
 # 更新日志
+## [v.0.8.1] 2021-04-25
+- 修复代码生成步骤条跳过bug
+- 优化字典加载方式
+- 添加一些组件示例
+
 ## [v.0.8.0] 2021-02-24
 - 偏好设置数据保存在浏览器storage
 - 添加数据导入功能
@@ -25,4 +30,4 @@
 - 解决部分bug
 
 ## [v.0.4.0] 2021-01-01
-- 添加系统设置、权限管理、系统监控、个人中心模块
\ No newline at end of file
+- 添加系统设置、权限管理、系统监控、个人中心模块
-- 
Gitee