meixioacomponent 2.0.45 → 2.0.46

package/lib/style/tableStyle.less

@@ -7,21 +7,21 @@
   text-overflow: ellipsis;
   font-weight: var(--font-weight-m);
   color: var(--font-color-d) !important;
-  font-size: var(--font-size-base) !important;
+  font-size: var(--font-size-l) !important;
 }
 
 .warn {
-  font-size: var(--font-size-base) !important;
+  font-size: var(--font-size-l) !important;
   color: var(--color-warn) !important;
 }
 
 .error {
-  font-size: var(--font-size-base) !important;
+  font-size: var(--font-size-l) !important;
   color: var(--color-error) !important;
 }
 
 .success {
-  font-size: var(--font-size-base) !important;
+  font-size: var(--font-size-l) !important;
   color: var(--color-success) !important;
 }
 
@@ -29,7 +29,7 @@
 .primary,
 .fun, .handle-primary {
   color: var(--color-primary) !important;
-  font-size: var(--font-size-base) !important;
+  font-size: var(--font-size-l) !important;
 }
 
 .fun, .handle-primary {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "2.0.45",
+  "version": "2.0.46",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/packages/components/base/baseText/index.vue

@@ -143,7 +143,7 @@ export default {
 
 .base-text-wrap {
   width: fit-content;
-  font-size: var(--font-size-base);
+  font-size: var(--font-size-l);
 
   .default {
     overflow: hidden;
@@ -172,7 +172,7 @@ export default {
   }
 
   /deep/ .t-statistic-content-value {
-    font-size: var(--font-size-base) !important;
+    font-size: var(--font-size-l) !important;
     font-family: TCloudNumber !important;
   }
 
@@ -180,7 +180,7 @@ export default {
 
 .handle {
   color: var(--color-primary) !important;
-  font-size: var(--font-size-base) !important;
+  font-size: var(--font-size-l) !important;
   cursor: pointer;
 
   &:hover {
@@ -191,6 +191,6 @@ export default {
 
 .empty {
   color: var(--font-color-ds);
-  font-size: var(--font-size-s);
+  font-size: var(--font-size-l);
 }
 </style>

package/packages/components/base/baseToggle/toggle.vue

@@ -1,15 +1,21 @@
 <template>
-    <t-radio-group v-model="module" :disabled="disabled"  variant="primary-filled" :size="componentSize">
-      <t-radio-button
-          :disabled="item.disabled"
-          v-for="(item, index) in toggleList"
-          :key="index"
-          :value="item.value">{{ item.label }}
-      </t-radio-button>
-    </t-radio-group>
+  <t-radio-group
+      ref="tRadioGroupRef"
+      v-model="module" :disabled="disabled" variant="primary-filled" :size="componentSize">
+    <t-radio-button
+        :disabled="item.disabled"
+        v-for="(item, index) in toggleList"
+        :key="index"
+        :value="item.value">{{ item.label }}
+    </t-radio-button>
+  </t-radio-group>
 </template>
 
 <script>
+const checkedClassName = 't-is-checked';
+const radioButtonClassName = 't-radio-button';
+const blockClassName = 't-radio-group__bg-block'
+
 import {TransomComponentSize} from "../../../utils/utils";
 
 export default {
@@ -24,6 +30,7 @@ export default {
     },
     toggleList: {
       require: true,
+      type: Array,
     },
     size: {
       type: String,
@@ -49,32 +56,71 @@ export default {
   computed: {
     module: {
       set(val) {
-        const {beforeHandle,toggleList} = this.$props
-        const index =  toggleList.findIndex(item=>{return item.value===val});
-        const item  = toggleList[index];
+        const {beforeHandle, toggleList} = this.$props
+        const index = toggleList.findIndex(item => {
+          return item.value === val
+        });
+        const item = toggleList[index];
         if (beforeHandle) {
           beforeHandle(() => {
             this.setModule(item)
             this.$emit('input', val)
+            this.onRadioChange(val);
           }, item)
         } else {
           this.$emit('input', val)
           this.setModule(item)
+          this.onRadioChange(val);
         }
       },
       get() {
         return this.$props.value
       },
     },
-    componentSize(){
+    componentSize() {
       return TransomComponentSize(this.$props.size);
-
     }
   },
+  mounted() {
+    this.$nextTick(() => {
+      this.onRadioChange(this.module)
+    })
+  },
+  updated() {
+    this.onRadioChange(this.module)
+  },
   methods: {
     setModule(item) {
       this.$emit('handletoggle', item)
     },
+    onRadioChange(value) {
+      if (this.$props.toggleList.length !== 2) return;
+      this.$nextTick(() => {
+        const toggleIndex = this.$props.toggleList.findIndex(item => {
+          return item.value === value;
+        })
+        if (toggleIndex > -1) {
+          const el = this.$refs.tRadioGroupRef.$el;
+          if (el) {
+            const buttonList = el.querySelectorAll(`.${radioButtonClassName}`);
+            const checkEl = el.querySelector(`.${checkedClassName}`);
+            if (buttonList) {
+              for (let i = 0; i < buttonList.length; i++) {
+                const item = buttonList[i];
+                item.style.setProperty('color', `var(--font-color-m)`)
+              }
+            }
+            if (checkEl) {
+              checkEl.style.setProperty('color', `${this.$props.toggleTextColor[toggleIndex]} !important`)
+            }
+            const blockEl = el.querySelector(`.${blockClassName}`);
+            if (blockEl) {
+              blockEl.style.setProperty('background-color', `${this.$props.toggleColor[toggleIndex]} !important`);
+            }
+          }
+        }
+      })
+    }
   },
 }
 </script>

package/packages/components/index.ts

@@ -156,8 +156,6 @@ const install = (Vue) => {
     componentConfig.createDialogCacheWrap();
     componentConfig.eventBus = new componentConfig.Vue();
     proTableLocalConfigManage.initByProTableLocalConfigManage();
-
-
 };
 //
 if (typeof window !== "undefined" && window[`Vue`]) {

package/packages/components/proPageTable/oa_pro_table.vue

@@ -233,6 +233,8 @@ import TableCheckControl from "./TableCheckControl";
 import proTableLocalConfigManage from "../../config/ProTableLocalConfigManage/ProTableLocalConfigManage";
 import {TransomTableCheckConfig, TransomTableConfig} from "../../utils/utils";
 
+
+const tableContentClassName = 't-table__content';
 export default {
   name: "baseProTable",
   data() {
@@ -1006,9 +1008,9 @@ export default {
         }
 
         this.$nextTick(() => {
-          if (refreshLayout) {
+          // if (refreshLayout) {
             this.daLayoutTable();
-          }
+          // }
         });
       }
     },
@@ -1028,23 +1030,20 @@ export default {
     scrollToTop() {
       const {isAuth} = this.$props;
       if (!isAuth) return;
-
       try {
-        // todo
-        // let elTable = this.$refs.elTable.$el;
-        // let target = elTable.querySelector(".el-table__body-wrapper");
-        // if (target) {
-        //   target.scrollTop = 0;
-        // }
+        let tableContent = this.$refs.enhancedTableRef.$el;
+        let target = tableContent.querySelector(`.${tableContentClassName}`);
+        if (target) {
+          target.scrollTop = 0;
+        }
       } catch (error) {
       }
     },
     // element表格的重新渲染方法
     daLayoutTable() {
-      // this.$nextTick(() => {
-      // todo
-      //   this.$refs.elTable.doLayout();
-      // });
+      this.$nextTick(()=>{
+          console.log(this.$refs.enhancedTableRef);
+      })
     },
     // 清空高级筛选的条件
     cleanProscreenCondition(flag = false) {

package/packages/components/searchHeader/searchHeader.vue

@@ -5,7 +5,7 @@
           v-if="input"
           v-model="module"
           :placeholder="placeholder"
-          size="small"
+          size="medium"
           style="width: 220px"
           @keyup.enter.native="handleSearch"
       >
@@ -25,7 +25,7 @@
                 v-for="(item, index) in searchList.list"
                 :key="index"
                 variant="light"
-                size="small"
+                size="medium"
                 :theme="index === searchList.index ? 'primary' : 'default'"
                 @click="handleScreen(index)"
             >

package/packages/components/style/tableStyle.less

@@ -7,21 +7,21 @@
   text-overflow: ellipsis;
   font-weight: var(--font-weight-m);
   color: var(--font-color-d) !important;
-  font-size: var(--font-size-base) !important;
+  font-size: var(--font-size-l) !important;
 }
 
 .warn {
-  font-size: var(--font-size-base) !important;
+  font-size: var(--font-size-l) !important;
   color: var(--color-warn) !important;
 }
 
 .error {
-  font-size: var(--font-size-base) !important;
+  font-size: var(--font-size-l) !important;
   color: var(--color-error) !important;
 }
 
 .success {
-  font-size: var(--font-size-base) !important;
+  font-size: var(--font-size-l) !important;
   color: var(--color-success) !important;
 }
 
@@ -29,7 +29,7 @@
 .primary,
 .fun, .handle-primary {
   color: var(--color-primary) !important;
-  font-size: var(--font-size-base) !important;
+  font-size: var(--font-size-l) !important;
 }
 
 .fun, .handle-primary {