cnhis-design-vue 2.1.126 → 2.1.128

package/packages/full-calendar/src/FullCalendar.vue

@@ -473,7 +473,7 @@ export default create({
 });
 </script>
 <style lang="less" scoped>
-@main-color: #2563f4;
+@primary-color: #2d7aff;
 
 .c-full-calendar {
   position: relative;
@@ -527,7 +527,7 @@ export default create({
         align-items: center;
         flex: 0 0 66px;
         padding: 0 5px;
-        background: #fff;
+        background: #f7f7f7;
         .header-left {
           color: #212121;
           span {
@@ -543,19 +543,19 @@ export default create({
             border: 1px solid #d9d9d9;
             cursor: pointer;
             &:hover {
-              color: @main-color;
+              color: #2d7aff;
               background: rgba(36, 116, 255, 0.1);
               border-color: rgba(36, 116, 255, 0.2);
               i {
-                color: @main-color;
+                color: #2d7aff;
               }
             }
             &:active {
-              color: @main-color;
+              color: #2d7aff;
               background: rgba(36, 116, 255, 0.2);
-              border-color: @main-color;
+              border-color: #2d7aff;
               i {
-                color: @main-color;
+                color: #2d7aff;
               }
             }
             &.disabled {
@@ -580,7 +580,7 @@ export default create({
               box-shadow: 1px 0 0 0 rgba(36, 116, 255, 0.2);
             }
             &:active {
-              box-shadow: 1px 0 0 0 @main-color;
+              box-shadow: 1px 0 0 0 #2d7aff;
             }
           }
           .btn-next {
@@ -629,10 +629,6 @@ export default create({
         overflow-y: auto;
         box-sizing: border-box;
 
-        .fc-timegrid-divider {
-          display: none;
-        }
-
         .fc-header-toolbar {
           margin-bottom: 0;
         }
@@ -645,7 +641,6 @@ export default create({
 
         .fc-col-header-cell-cushion {
           font-weight: normal;
-          color: @main-color;
           & > span {
             padding: 10px 0;
             display: inline-block;
@@ -721,9 +716,9 @@ export default create({
           }
         }
         .fc-day-today .week-header {
-          color: @main-color;
+          color: @primary-color;
           .week-day {
-            color: @main-color;
+            color: @primary-color;
           }
         }
 
@@ -760,7 +755,7 @@ export default create({
             background-color: #f2f7ff;
             .fc-daygrid-day-number {
               color: #fff;
-              background-color: @main-color;
+              background-color: #2d7aff;
               border-radius: 50%;
             }
           }

package/packages/full-calendar/src/components/ListTag.vue

@@ -113,8 +113,6 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-@main-color: #2563f4;
-
 .list-tag {
   width: 100%;
   height: 100%;
@@ -138,19 +136,19 @@ export default {
         }
         &.active {
           .list-day {
-            color: @main-color;
+            color: @primary-color;
             background: rgba(36, 116, 255, 0.1);
           }
         }
         &.curday {
           .list-day {
             color: #fff;
-            background: @main-color;
+            background: @primary-color;
             &:hover {
-              background: @main-color;
+              background: @primary-color;
             }
           }
-          color: @main-color;
+          color: @primary-color;
         }
         .list-day {
           width: 36px;

package/packages/grid/src/grid.js

@@ -6,10 +6,10 @@
 import Vue from 'vue';
 import 'xe-utils';
 import VXETable from 'vxe-table';
-import VXETablePluginAntd from 'vxe-table-plugin-antd';
+import VXETablePluginAntd from 'vxe-table-plugin-antd'
 import Grid from 'vxe-table/lib/grid';
-import 'vxe-table/lib/style.css';
-import 'vxe-table-plugin-antd/dist/style.css';
+// import 'vxe-table/lib/style.css';
+import 'vxe-table-plugin-antd/dist/style.css'
 
 VXETable.use(VXETablePluginAntd);
 import create from '@/core/create';

package/packages/scale-view/formitem/r-choice.vue

@@ -131,7 +131,7 @@
       show-search
       :mode="showMulti"
       :disabled="isLock"
-      @search="handleSearch"
+      @search="debounceSearch"
       @change="handleSelectChange"
       :getPopupContainer="getPopupContainer"
       :filterOption="filterOption"
@@ -171,11 +171,12 @@
  *  getSearchOptions 关键字检索的 function
  *  getCascadeOptions 获取级联数据的 furnction
  */
-import { Select, Input, Radio, Checkbox, Cascader, Icon } from 'ant-design-vue';
+import { Select, Input, Radio, Checkbox, Cascader, Icon, Spin } from 'ant-design-vue';
 import { judgeTypes } from '../mixin/judgeTypes';
 // import format from "@/components/table/mixins/format";
 // import TextOverTooltip from "./text-over-tooltip/TextOverTooltip.vue";
 import utils from '@/utils/utils-map';
+import vexutils from '@/utils/vexutils';
 import axios from 'axios';
 import 'viewerjs/dist/viewer.css';
 import { component as Viewer } from 'v-viewer';
@@ -211,6 +212,7 @@ export default {
     [Radio.name]: Radio,
     [Radio.Group.name]: Radio.Group,
     [Select.name]: Select,
+    [Spin.name]: Spin,
     [Select.Option.name]: Select.Option
   },
   computed: {
@@ -302,6 +304,9 @@ export default {
       optionsPreSuffixObj: {}
     };
   },
+  created(){
+    this.debounceSearch = vexutils.debounce(this.handleSearch, 100);
+  },
   methods: {
     init(value) {
       let options = value.options || [];
@@ -543,6 +548,7 @@ export default {
       try {
         // 动态数据源转静态数据
       if (this.cloneItem?.type == 'SELECT' && this.isDynamic2Static) return
+      this.fetching = true;
         this.curOptions = await this.getSearchOptions(
           {
             values: this.columnKey,
@@ -551,8 +557,10 @@ export default {
           },
           this.cloneItem
         );
+        this.fetching = false;
         console.log(this.curOptions, 'curOptions');
       } catch (error) {
+        this.fetching = false;
         console.log(error);
       }
     },