meixioacomponent 2.0.2 → 2.0.3

package/package.json

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

package/packages/components/base/baseButton/baseButton.vue

@@ -1,6 +1,5 @@
 <template>
   <t-button
-      v-bind="$attrs"
       :loading="loading"
       :disabled="disabled"
       :size="transomSize" :theme="transomTheme" @click="onHandleClick ">
@@ -37,16 +36,22 @@ export default {
   },
   computed: {
     transomSize() {
+      let size = '';
       switch (this.$props.size) {
         case 'mini':
-          return "small";
+          size = "small";
+          break;
         case 'small':
-            return 'medium'
+          size = 'medium'
+          break;
         case 'medium':
-          return 'large'
+          size = 'large'
+          break;
         default:
-          return 'medium'
+          size = 'medium'
+          break;
       }
+      return size;
     },
     transomTheme() {
       switch (this.type) {

package/packages/components/base/baseButtonHandle/baseButtonHandle.vue

@@ -12,7 +12,7 @@
         @click="handleClick(item)"
     >
       <template #icon>
-        <i v-if="item.icon" :class="item.icon"></i>
+        <t-icon v-if="item.icon" :name="item.icon"></t-icon>
       </template>
       {{ item.text }}
     </base-button>

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

@@ -24,17 +24,18 @@
               <span>{{ title }}</span>
               <div class="title-handle-wrap">
 
-                <t-button shape="square" variant="outline" v-if="isCache" @click="handleCache">
+                <t-button shape="square" variant="outline" v-if="isCache" @click="handleCache"
+                          style="margin-right: var(--margin-4)">
                   <template #icon>
                     <remove-icon
                     ></remove-icon>
                   </template>
                 </t-button>
 
-                <drag-move-icon
-                    v-if="onDrag"
-                    ref="dragIcon"
-                ></drag-move-icon>
+                <!--                <drag-move-icon-->
+                <!--                    v-if="onDrag"-->
+                <!--                    ref="dragIcon"-->
+                <!--                ></drag-move-icon>-->
 
                 <t-button shape="square" variant="outline" v-if="hasCloseIcon" @click="onHandleClose">
                   <template #icon>
@@ -78,11 +79,11 @@
 <script>
 import DialogSkeleton from "./dialogSkeleton";
 import UseDrag from "../../../config/use/useDrag";
-import {CloseIcon, DragMoveIcon, RemoveIcon} from "tdesign-icons-vue"
+import {CloseIcon, RemoveIcon} from "tdesign-icons-vue"
 
 export default {
   name: "baseDialog",
-  components: {DialogSkeleton, RemoveIcon, CloseIcon, DragMoveIcon},
+  components: {DialogSkeleton, RemoveIcon, CloseIcon},
   data() {
     return {
       isShow: true,
@@ -225,15 +226,15 @@ export default {
       // )}px;left:${left}px;margin:0px !important`;
       //
       this.$nextTick(() => {
-        if (this.$props.onDrag) {
-          let iconEl = this.$refs.dragIcon.$el;
-          if (!this.isListen) {
-            iconEl.addEventListener("mousedown", this.startDrag);
-          } else {
-            this.onUnListen();
-          }
-          iconEl.addEventListener("mousedown", this.startDrag);
-        }
+        // if (this.$props.onDrag) {
+        //   let iconEl = this.$refs.dragIcon.$el;
+        //   if (!this.isListen) {
+        //     iconEl.addEventListener("mousedown", this.startDrag);
+        //   } else {
+        //     this.onUnListen();
+        //   }
+        //   iconEl.addEventListener("mousedown", this.startDrag);
+        // }
       });
     },
     startDrag(e) {

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

@@ -71,7 +71,7 @@ export default {
     return {
       open: false,
       useResize: null,
-      ignoreList: [],
+      ignoreList: ['t-select__list','t-popup'],
       showCloseButton: false
     };
   },

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

@@ -2,17 +2,19 @@
   <div :class="{ select: select, disabled: disabled }" class="pro-number-wrap">
     <t-input-number v-if="!useString" v-model.number="module" :theme=" controls?'row':'normal' " :disabled="disabled"
                     :max="max" :min="min" :placeholder="placeholder" :decimal-places="precision" :size="size"
-                    @change="onChange" style="width: 100%; height: 100%;">
+                    @change="onChange" style="width: 100%; height: 100%;"
+                    @blur="onBlue"
+    >
       <template #suffix>
         <div v-if="(unit || select) && !controls" class="number-unit">
           <span v-if="!select">{{ unit }}</span>
           <BaseStoreSelect
               v-else
+              :size="size"
               style="width: 100px"
               v-model="_linkValue"
               :disabled="disabled"
               :placeholder="unitPlaceholder"
-              :size="size"
               :useStore="selectStore"
           ></BaseStoreSelect>
         </div>
@@ -20,28 +22,25 @@
 
     </t-input-number>
 
-
     <t-input-number v-else v-model="module" :theme=" controls?'row':'normal' " :disabled="disabled"
                     :max="max" :min="min" :placeholder="placeholder" :decimal-places="precision" :size="size"
+                    @blur="onBlue"
                     @change="onChange" style="width: 100%; height: 100%;">
       <template #suffix>
         <div v-if="(unit || select) && !controls" class="number-unit">
           <span v-if="!select">{{ unit }}</span>
           <BaseStoreSelect
               v-else
+              :size="size"
               style="width: 100px"
               v-model="_linkValue"
               :disabled="disabled"
               :placeholder="unitPlaceholder"
-              :size="size"
               :useStore="selectStore"
           ></BaseStoreSelect>
         </div>
       </template>
-
     </t-input-number>
-
-
   </div>
 </template>
 
@@ -127,6 +126,10 @@ export default {
       })
 
     },
+
+    onBlue() {
+      this.$emit('blur');
+    }
   },
   components: {BaseStoreSelect},
 }
@@ -136,8 +139,9 @@ export default {
 .pro-number-wrap {
   width: 100%;
 
-  .number-unit{
-    width: fit-content;}
+  .number-unit {
+    width: fit-content;
+  }
 
 }
 </style>

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

@@ -2,17 +2,19 @@
   <div class="page-wrap">
 
 
-    <t-pagination v-if="!small" v-model:current="pageProps[`${config.page}`]" :page-size="pageSize"
+    <t-pagination v-if="!small"
+                  :default-current="current"
+                  :page-size="pageSize"
                   :total="pageProps[`${config.total}`]" :page-size-options="pageSizes"
-                  @change="onChange"
-                  @pageSizeChange="handleSizeChange" @current-change="handleCurrentChange">
+                  @page-size-change="handleSizeChange"
+                  @current-change="handleCurrentChange">
     </t-pagination>
 
 
-    <t-pagination-mini v-else v-model:current="pageProps[`${config.page}`]" :page-size="pageSize"
+    <t-pagination-mini v-else :default-current="current" :page-size="pageSize"
                        :total="pageProps[`${config.total}`]" :page-size-options="pageSizes"
-                       @change="onChange"
-                       @pageSizeChange="handleSizeChange" @current-change="handleCurrentChange"></t-pagination-mini>
+                       @page-size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"></t-pagination-mini>
 
   </div>
 </template>
@@ -43,6 +45,14 @@ export default {
     },
   },
   computed: {
+    current: {
+      set(val) {
+        this.pageProps[`${this.config.page}`] = val;
+      },
+      get() {
+        return this.pageProps[`${this.config.page}`]
+      }
+    },
     pageSize: {
       set(val) {
         this.pageProps[`${this.config.size}`] = val
@@ -54,15 +64,11 @@ export default {
     },
   },
   methods: {
-    onChange(e) {
-      const {pageSize} = e;
-      this.pageSize = pageSize;
-    },
     handleSizeChange(e) {
-      this.$emit("sizeChange");
+      this.pageSize = parseInt(e);
     },
     handleCurrentChange(e) {
-      this.$emit("currentChange");
+      this.$emit("currentChange", e);
     },
   },
   watch: {}

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

@@ -1,30 +1,28 @@
 <template>
-  <div :class="[ 'base-text-wrap' ]" v-if="content"  :title="content" @click="onClick">
+  <div :class="[ 'base-text-wrap' ]" v-if="content" :title="content" @click="onClick">
     <div v-if="type==='phone'" :class="['content-wrap',type]">
-        <MobileIcon></MobileIcon>
-      {{content}}
+      <MobileIcon style="margin-right: var(--margin-2)"></MobileIcon>
+      {{ content }}
     </div>
     <div v-else-if="type==='time'" :class="['content-wrap', type]">
-      <TimeIcon></TimeIcon>
-      {{filterContent()}}
+      <TimeIcon style="margin-right: var(--margin-2)"></TimeIcon>
+      {{ filterContent() }}
     </div>
     <div v-else-if="type==='money'" :class="[type]">
-      <t-statistic  :value="content" prefix="￥" trend="increase" />
+      <t-statistic :value="content" prefix="￥" trend="increase"/>
     </div>
     <div v-else-if="type==='number'" :class="[type]">
-      {{filterContent()}}
+      {{ filterContent() }}
     </div>
 
     <div v-else class="default">
-      {{filterContent()}}
+      {{ filterContent() }}
     </div>
 
   </div>
 
 
-
-  <div v-else  class="empty">暂无数据</div>
-
+  <div v-else class="empty">暂无数据</div>
 
 
 </template>
@@ -32,7 +30,7 @@
 
 <script>
 import {FilterTime} from "../../../utils/utils";
-import {MobileIcon,TimeIcon} from "tdesign-icons-vue"
+import {MobileIcon, TimeIcon} from "tdesign-icons-vue"
 
 export default {
   name: "baseText",
@@ -42,7 +40,7 @@ export default {
     }
   },
 
-  components:{
+  components: {
     MobileIcon,
     TimeIcon
   },
@@ -52,9 +50,7 @@ export default {
       this.setToolTipFlag();
     })
   },
-  computed: {
-
-  },
+  computed: {},
   props: {
     type: {},
     content: {},
@@ -136,33 +132,38 @@ export default {
 
 <style lang="less" scoped>
 
-.base-text-wrap{
+.base-text-wrap {
   width: fit-content;
   font-size: var(--font-size-base);
-  .content-wrap{
+
+  .content-wrap {
     display: flex;
     align-items: center;
     flex-flow: row nowrap;
     justify-content: flex-start;
   }
-  .time,.number,.money{
+
+  .time, .number, .money {
     font-family: TCloudNumber !important;
   }
-  .money{
+
+  .money {
     font-weight: var(--font-weight-kg);
   }
 
 
-  /deep/ .t-statistic-content-prefix{
+  /deep/ .t-statistic-content-prefix {
     font-size: var(--font-size-s) !important;
   }
-  /deep/ .t-statistic-content-value{
+
+  /deep/ .t-statistic-content-value {
     font-size: var(--font-size-base) !important;
     font-family: TCloudNumber !important;
   }
 
 }
-.empty{
+
+.empty {
   color: var(--font-color-ds);
   font-size: var(--font-size-s);
 }

package/packages/components/base/baseTimeLine/baseTimeLineLeft.vue

@@ -13,15 +13,14 @@
         class="base-time-line-point-wrap"
     >
       <div class="base-time-line-point">
-        <base-icon
+        <!--统一使用t-icon-->
+
+        <t-icon
             v-if="timeLineItem.icon"
-            :event="false"
-            :iconClass="`element`"
             :name="timeLineItem.icon"
-            :plain="true"
-            :size="`s`"
             class="line-icon"
-        ></base-icon>
+            :style="`color:var(--text-white)`"
+        ></t-icon>
       </div>
       <span class="point-line"></span>
     </div>
@@ -135,18 +134,12 @@ export default {
     .base-time-line-point {
       width: 20px;
       height: 20px;
-      border: 0px;
+      border: 0;
       display: flex;
       align-items: center;
       flex-flow: row nowrap;
       justify-content: center;
       background: var(--color-primary);
-
-      .line-icon {
-        /deep/ i {
-          color: var(--text-white) !important;
-        }
-      }
     }
 
     .point-line {

package/packages/components/proForm/proForm/proFormItem/pro_form_item.vue

@@ -288,16 +288,6 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      const {labelPosition, width} = this.$props
-      if (labelPosition !== 'top') {
-        try {
-          if (this.$refs.formItemRef.parentNode) {
-            this.$refs.formItemRef.parentNode.style.cssText += `width:${width}`
-          }
-        } catch (error) {
-
-        }
-      }
       if (this.$props.disableWatcher) {
         this.triggerDisable(this.$props.value)
       }
@@ -763,9 +753,6 @@ export default {
     font-size: var(--font-size-s) !important;
   }
 
-  /deep/ .el-select--mini {
-
-  }
 
   .item-content {
     min-height: 28px;
@@ -782,15 +769,6 @@ export default {
   }
 }
 
-/deep/ .el-textarea.is-disabled .el-textarea__inner {
-  background-color: var(--color-table-header) !important;
 
-  &:hover {
-    border-color: transparent !important;
-  }
-}
 
-/deep/ .el-radio-button__orig-radio:disabled:checked + .el-radio-button__inner {
-  background-color: var(--color-table-header) !important;
-}
 </style>

package/packages/components/proPageTable/oa_pro_footer.vue

@@ -59,20 +59,13 @@ export default {
     sizeChange(e) {
       this.$emit('pageSizeChange')
       this.$parent.refreshData()
-
       if (this.$parent._linkViewClassSubs.isLocalTablePagination) {
-
         const obj = JSON.parse(window.localStorage.getItem('LocalTablePagination'));
-
         this.$parent._linkViewClassSubs.setLocalPagination(obj);
-
-
       }
-
-
     },
-    currentChange() {
-      this.$emit('pageCurrentChange')
+    currentChange(e) {
+      this.$props.pageProps[`${this.$props.pageConfig.page}`]=e
       this.$parent.refreshData(false)
     },
   },

package/packages/components/proPageTable/oa_pro_table.vue

@@ -913,7 +913,6 @@ export default {
         }
         result[`order`] = orderItem;
       }
-
       result = Object.assign(result, this.$props.pageProps);
       return result;
     },
@@ -1196,7 +1195,6 @@ background-color: var(--color-gray-s);
   }
 
 
-
   .oa-pro-table-footer {
     width: 100%;
     background: inherit;

package/packages/components/searchHeader/searchHeader.vue

@@ -19,18 +19,20 @@
         <div :style="{ paddingLeft: `${input? 'calc(var(--padding-5) * 2)':0 }`}" class="search-header-config-content">
           <span class="view-text">筛选：</span>
           <slot name="search-hearch-extend"></slot>
-          <base-button
-              v-for="(item, index) in searchList.list"
-              :key="index"
-              :class="{
+          <t-space :size="4">
+            <base-button
+                v-for="(item, index) in searchList.list"
+                :key="index"
+                :class="{
               'is-plain': index != searchList.index,
             }"
-              size="mini"
-              :type="index == searchList.index ? 'primary' : 'info'"
-              @click="handleScreen(index)"
-          >
-            {{ item.label }}
-          </base-button>
+                size="mini"
+                :type="index == searchList.index ? 'primary' : 'info'"
+                @click="handleScreen(index)"
+            >
+              {{ item.label }}
+            </base-button>
+          </t-space>
         </div>
       </base-list>
     </div>