feat -- update iconfont

2 years ago · 000eaf2dc4
parent 55e1805903
commit 000eaf2dc4
11 changed files with 121 additions and 47 deletions
--- a/report-ui/src/assets/iconfont/demo_index.html
+++ b/report-ui/src/assets/iconfont/demo_index.html
@ -54,6 +54,24 @@
      <div class="content unicode" style="display: block;">
          <ul class="icon_lists dib-box">
          
+            <li class="dib">
+              <span class="icon iconfont">&#xe692;</span>
+                <div class="name">符号-单行输入框</div>
+                <div class="code-name">&amp;#xe692;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe611;</span>
+                <div class="name">下拉框</div>
+                <div class="code-name">&amp;#xe611;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe64e;</span>
+                <div class="name">时间筛选</div>
+                <div class="code-name">&amp;#xe64e;</div>
+              </li>
+          
            <li class="dib">
              <span class="icon iconfont">&#xe640;</span>
                <div class="name">雷达图2</div>
@ -174,12 +192,6 @@
                <div class="code-name">&amp;#xe626;</div>
              </li>
          
-            <li class="dib">
-              <span class="icon iconfont">&#xe738;</span>
-                <div class="name">中国地图</div>
-                <div class="code-name">&amp;#xe738;</div>
-              </li>
-          
            <li class="dib">
              <span class="icon iconfont">&#xe625;</span>
                <div class="name">表格</div>
@ -816,9 +828,9 @@
 <pre><code class="language-css"
 >@font-face {
  font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1666946350865') format('woff2'),
-       url('iconfont.woff?t=1666946350865') format('woff'),
-       url('iconfont.ttf?t=1666946350865') format('truetype');
+  src: url('iconfont.woff2?t=1678340307663') format('woff2'),
+       url('iconfont.woff?t=1678340307663') format('woff'),
+       url('iconfont.ttf?t=1678340307663') format('truetype');
 }
 </code></pre>
          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@ -844,6 +856,33 @@
      <div class="content font-class">
        <ul class="icon_lists dib-box">
          
+          <li class="dib">
+            <span class="icon iconfont icondanhangshurukuang"></span>
+            <div class="name">
+              符号-单行输入框
+            </div>
+            <div class="code-name">.icondanhangshurukuang
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconxialakuang1"></span>
+            <div class="name">
+              下拉框
+            </div>
+            <div class="code-name">.iconxialakuang1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconshijianshaixuan"></span>
+            <div class="name">
+              时间筛选
+            </div>
+            <div class="code-name">.iconshijianshaixuan
+            </div>
+          </li>
+          
          <li class="dib">
            <span class="icon iconfont iconleidatu"></span>
            <div class="name">
@ -1024,15 +1063,6 @@
            </div>
          </li>
          
-          <li class="dib">
-            <span class="icon iconfont iconzhongguoditu"></span>
-            <div class="name">
-              中国地图
-            </div>
-            <div class="code-name">.iconzhongguoditu
-            </div>
-          </li>
-          
          <li class="dib">
            <span class="icon iconfont iconbiaoge"></span>
            <div class="name">
@ -1987,6 +2017,30 @@
      <div class="content symbol">
          <ul class="icon_lists dib-box">
          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icondanhangshurukuang"></use>
+                </svg>
+                <div class="name">符号-单行输入框</div>
+                <div class="code-name">#icondanhangshurukuang</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconxialakuang1"></use>
+                </svg>
+                <div class="name">下拉框</div>
+                <div class="code-name">#iconxialakuang1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconshijianshaixuan"></use>
+                </svg>
+                <div class="name">时间筛选</div>
+                <div class="code-name">#iconshijianshaixuan</div>
+            </li>
+          
            <li class="dib">
                <svg class="icon svg-icon" aria-hidden="true">
                  <use xlink:href="#iconleidatu"></use>
@ -2147,14 +2201,6 @@
                <div class="code-name">#iconfuzhi1</div>
            </li>
          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconzhongguoditu"></use>
-                </svg>
-                <div class="name">中国地图</div>
-                <div class="code-name">#iconzhongguoditu</div>
-            </li>
-          
            <li class="dib">
                <svg class="icon svg-icon" aria-hidden="true">
                  <use xlink:href="#iconbiaoge"></use>
--- a/report-ui/src/assets/iconfont/iconfont.css
+++ b/report-ui/src/assets/iconfont/iconfont.css
@ -1,8 +1,8 @@
@font-face {
  font-family: "iconfont"; /* Project id 1513211 */
-  src: url('iconfont.woff2?t=1666946350865') format('woff2'),
-       url('iconfont.woff?t=1666946350865') format('woff'),
-       url('iconfont.ttf?t=1666946350865') format('truetype');
+  src: url('iconfont.woff2?t=1678340307663') format('woff2'),
+       url('iconfont.woff?t=1678340307663') format('woff'),
+       url('iconfont.ttf?t=1678340307663') format('truetype');
 }

 .iconfont {
@ -13,6 +13,18 @@
  -moz-osx-font-smoothing: grayscale;
 }

+.icondanhangshurukuang:before {
+  content: "\e692";
+}
+
+.iconxialakuang1:before {
+  content: "\e611";
+}
+
+.iconshijianshaixuan:before {
+  content: "\e64e";
+}
+
 .iconleidatu:before {
  content: "\e640";
 }
@ -93,10 +105,6 @@
  content: "\e626";
 }

-.iconzhongguoditu:before {
-  content: "\e738";
-}
-
 .iconbiaoge:before {
  content: "\e625";
 }
--- a/report-ui/src/assets/iconfont/iconfont.js
+++ b/report-ui/src/assets/iconfont/iconfont.js
--- a/report-ui/src/assets/iconfont/iconfont.json
+++ b/report-ui/src/assets/iconfont/iconfont.json
@ -5,6 +5,27 @@
  "css_prefix_text": "icon",
  "description": "",
  "glyphs": [
+    {
+      "icon_id": "1766474",
+      "name": "符号-单行输入框",
+      "font_class": "danhangshurukuang",
+      "unicode": "e692",
+      "unicode_decimal": 59026
+    },
+    {
+      "icon_id": "8560318",
+      "name": "下拉框",
+      "font_class": "xialakuang1",
+      "unicode": "e611",
+      "unicode_decimal": 58897
+    },
+    {
+      "icon_id": "15388197",
+      "name": "时间筛选",
+      "font_class": "shijianshaixuan",
+      "unicode": "e64e",
+      "unicode_decimal": 58958
+    },
    {
      "icon_id": "9013588",
      "name": "雷达图2",
@ -145,13 +166,6 @@
      "unicode": "e626",
      "unicode_decimal": 58918
    },
-    {
-      "icon_id": "22378736",
-      "name": "中国地图",
-      "font_class": "zhongguoditu",
-      "unicode": "e738",
-      "unicode_decimal": 59192
-    },
    {
      "icon_id": "21338828",
      "name": "表格",
--- a/report-ui/src/assets/iconfont/iconfont.ttf
+++ b/report-ui/src/assets/iconfont/iconfont.ttf
--- a/report-ui/src/assets/iconfont/iconfont.woff
+++ b/report-ui/src/assets/iconfont/iconfont.woff
--- a/report-ui/src/assets/iconfont/iconfont.woff2
+++ b/report-ui/src/assets/iconfont/iconfont.woff2
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-form-time.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-form-time.js
@ -7,7 +7,7 @@ export const widgetFormTime = {
  type: 'form',
  tabName: '表单',
  label: '时间筛选器',
-  icon: 'iconchaolianjie',
+  icon: 'iconshijianshaixuan',
  options: {
    setup: [
      {
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-input.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-input.js
@ -3,7 +3,7 @@ export const widgetInput = {
  type: 'form',
  tabName: '表单',
  label: '输入框',
-  icon: 'iconchaolianjie',
+  icon: 'icondanhangshurukuang',
  options: {
    setup: [
      {
@ -25,7 +25,7 @@ export const widgetInput = {
      {
        type: 'vue-color',
        label: '字体颜色',
-        name: 'color',
+        name: 'select_color',
        required: false,
        placeholder: '',
        value: '#FAD400',
@ -33,7 +33,7 @@ export const widgetInput = {
      {
        type: 'vue-color',
        label: '字体背景',
-        name: 'background',
+        name: 'select_fontSize',
        required: false,
        placeholder: '',
        value: 'rgba(115,170,229,.5)',
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-select.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-select.js
@ -11,7 +11,7 @@ export const widgetSelect = {
  type: 'form',
  tabName: '表单',
  label: '下拉框',
-  icon: 'iconchaolianjie',
+  icon: 'iconxialakuang1',
  options: {
    setup: [
      {
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetInput.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetInput.vue
@ -22,7 +22,6 @@ export default {
      optionsStyle: {},
      optionsData: {},
      optionsSetup: {},
-      options: {},
    };
  },
  computed: {
@ -33,6 +32,8 @@ export default {
        height: this.optionsStyle.height + "px",
        left: this.optionsStyle.left + "px",
        top: this.optionsStyle.top + "px",
+        background: this.optionsSetup.select_fontSize,
+        color: this.optionsSetup.select_color,
      };
    },
    eventChange() {
@ -74,6 +75,11 @@ export default {

    .el-input__inner {
      height: 100%;
+      background: inherit;
+      color: inherit;
+      &::placeholder {
+        color: inherit;
+      }
    }
  }
 }