meixioacomponent 1.1.49 → 2.0.2

package/packages/components/proPageTable/oaProTableSearch/oa_pro_screen_item.vue

@@ -6,16 +6,16 @@
     }"
   >
     <div class="item-wrap-left">
-      <el-select
+      <t-select
         size="small"
         class="item"
         :disabled="disable"
         v-model="item.key"
         placeholder="请选择要筛选的字段名"
       >
-        <el-option
+        <t-option
           v-for="(item, index) in config"
-          :key="item.label"
+          :key="item.key"
           :value="item.key"
           :label="item.label"
           :disabled="item.isCheck"
@@ -25,82 +25,81 @@
               {{ item.label }}
             </div>
           </template>
-        </el-option>
-      </el-select>
+        </t-option>
+      </t-select>
     </div>
     <div class="item-wrap-right">
       <div class="item-wrap-field-wrap">
-        <el-select
+        <t-select
           size="small"
           class="item"
           style="width: 100px"
           v-model="item.field"
           placeholder="请选择匹配条件"
         >
-          <el-option
+          <t-option
             v-for="item in fieldList"
             :key="item.value"
             :value="item.value"
             :label="item.label"
-          ></el-option>
-        </el-select>
+          ></t-option>
+        </t-select>
       </div>
 
       <div class="item-wrap-field-value">
         <!-- type是input类型 -->
-        <el-input
+        <t-input
           size="small"
           class="item"
           v-model="item.value"
           v-if="item.type === 'text' || item.type === undefined"
           placeholder="请输入条件"
-        ></el-input>
+        ></t-input>
         <!-- 时间范围类型-->
-        <el-date-picker
+        <t-date-range-picker
           size="small"
           class="item"
-          type="daterange"
+          :enable-time-picker="true"
           v-model="item.value"
           end-placeholder="结束日期"
           start-placeholder="开始日期"
           value-format="timestamp"
           v-if="item.type === 'timeRange'"
         >
-        </el-date-picker>
+        </t-date-range-picker>
         <!-- 时间单类型-->
-        <el-date-picker
+        <t-date-picker
           size="small"
           class="item"
-          type="date"
+          :enable-time-picker="true"
           v-model="item.value"
           value-format="timestamp"
           v-if="item.type === 'singleTime'"
         >
-        </el-date-picker>
+        </t-date-picker>
         <!-- 下拉选择框类型 -->
-        <el-select
+        <t-select
           size="small"
           class="item"
           v-model="item.value"
           placeholder="请选择条件"
           v-if="item.type === 'select'"
         >
-          <el-option
+          <t-option
             v-for="item in config[findProselectList(item)].selectList"
             :key="item.value"
             :value="item.value"
             :label="item.label"
-          ></el-option>
-        </el-select>
+          ></t-option>
+        </t-select>
       </div>
 
       <div class="item-wrap-handle" v-if="!disable">
-        <base-icon
-          :color="`m`"
-          :event="true"
-          @iconClick="deleteProscreen"
-          :name="`meixicomponenticon-close`"
-        ></base-icon>
+        <t-button shape="square" variant="outline" @click="deleteProscreen">
+          <template #icon>
+            <close-icon></close-icon>
+          </template>
+        </t-button>
         <el-checkbox v-model="item.exposed" :disabled="!item.key">
           外露
         </el-checkbox>
@@ -110,6 +109,7 @@
 </template>
 
 <script>
+import {CloseIcon} from "tdesign-icons-vue"
 export default {
   data() {
     return {
@@ -142,6 +142,7 @@ export default {
   created() {
     this.privateConfigIndex = this.$props.configIndex;
   },
+  components:{CloseIcon},
   mounted() {},
   props: {
     item: {},

package/packages/components/proPageTable/oa_pro_colum_config.vue

@@ -19,10 +19,10 @@
               class="config-item-wrap"
           >
             <div class="item-left" @click="showTableColum(item)">
-              <el-checkbox
+              <t-checkbox
                   v-model="item.show"
-                  :disabled="item.lock ? true : false"
-              ></el-checkbox>
+                  :disabled="!!item.lock"
+              ></t-checkbox>
               <span class="item-text">{{ item.label }}</span>
             </div>
           </div>
@@ -38,18 +38,14 @@
                 class="config-item-wrap"
             >
               <div class="item-left" @click.self="showTableColum(item)">
-                <el-checkbox
+                <t-checkbox
                     v-model="item.show"
                     :disabled="item.lock"
-                ></el-checkbox>
+                ></t-checkbox>
                 <span class="item-text">{{ item.label }}</span>
               </div>
               <div class="item-right">
-                <base-icon
-                    :color="`m`"
-                    :name="`meixicomponenticon-tuozhuai`"
-                    :size="`s`"
-                ></base-icon>
+                <drag-move-icon></drag-move-icon>
               </div>
             </div>
           </draggable>
@@ -69,6 +65,7 @@
 <script>
 import baseButtonHandle from '../base/baseButtonHandle/baseButtonHandle.vue'
 import proTableLocalConfigManage from "../../config/ProTableLocalConfigManage/ProTableLocalConfigManage";
+import {DragMoveIcon} from"tdesign-icons-vue"
 
 export default {
   name: 'oaProColumConfig',
@@ -107,6 +104,7 @@ export default {
   },
   components: {
     baseButtonHandle,
+    DragMoveIcon
   },
   props: {
     config: {

package/packages/components/proPageTable/oa_pro_footer.vue

@@ -9,16 +9,16 @@
       <slot name="footer-slot"></slot>
     </div>
     <div class="footer-right">
-      <basePopoverButton
-          v-model="popoverFlag"
-          :buttonIcon="`el-icon-s-fold`"
-          :iconClass="`element`"
-          :placement="`top`"
-      >
-        <template slot="popoverContent">
-          <oa_pro_handle_table_borderVue></oa_pro_handle_table_borderVue>
-        </template>
-      </basePopoverButton>
+      <!--      <basePopoverButton-->
+      <!--          v-model="popoverFlag"-->
+      <!--          :buttonIcon="`el-icon-s-fold`"-->
+      <!--          :iconClass="`element`"-->
+      <!--          :placement="`top`"-->
+      <!--      >-->
+      <!--        <template slot="popoverContent">-->
+      <!--          <oa_pro_handle_table_borderVue></oa_pro_handle_table_borderVue>-->
+      <!--        </template>-->
+      <!--      </basePopoverButton>-->
 
       <base-pagination
           :config="pageConfig"
@@ -62,7 +62,7 @@ export default {
 
       if (this.$parent._linkViewClassSubs.isLocalTablePagination) {
 
-        const obj =JSON.parse( window.localStorage.getItem('LocalTablePagination'));
+        const obj = JSON.parse(window.localStorage.getItem('LocalTablePagination'));
 
         this.$parent._linkViewClassSubs.setLocalPagination(obj);
 
@@ -91,7 +91,7 @@ export default {
 
   .footer-left,
   .footer-right {
-    width: 40%;
+    width: fit-content;
     height: 100%;
   }
 
@@ -131,7 +131,7 @@ export default {
   }
 
   .footer-right {
-    width: 60%;
+    width: fit-content;
     display: flex;
     align-items: center;
     flex-flow: row nowrap;
@@ -147,8 +147,8 @@ export default {
     }
   }
 
-  /deep/ .el-button--small {
-    padding: 10px !important;
+  /deep/ .t-pagination__total {
+    margin-right: calc(var(--margin-4) * 3);
   }
 }
 </style>

package/packages/components/proPageTable/oa_pro_table-header.vue

@@ -1,10 +1,10 @@
 <template>
   <div v-show="config.key !== 'noData'" :id="`table-${config.key}`" class="table-header">
     <div class="table-header-left">
-      <span class="cell-text">{{ scope.column.label }}</span>
+      <span class="cell-text">{{ config.label }}</span>
       <span
           v-if="!config.disabledSortable"
-          :class="{ 'active-order': scope.column.order }"
+          :class="{ 'active-order': scope.order }"
           class="caret-wrapper defind"
       >
         <i class="sort-caret ascending"></i>
@@ -12,34 +12,20 @@
       </span>
     </div>
     <div class="table-header-right">
-      <!--            <base-icon-->
-      <!--                    v-if="!isAverageWidth && config.lock != 'right'"-->
-      <!--                    :active="config.lock ? true : false"-->
-      <!--                    :color="`s`"-->
-      <!--                    :event="true"-->
-      <!--                    :name="lockClass"-->
-      <!--                    :plain="false"-->
-      <!--                    :size="`s`"-->
-      <!--                    class="lock-icons"-->
-      <!--                    @iconClick="handleClick('lock')"-->
-      <!--            ></base-icon>-->
-
-      <base-icon
-          v-if="config.screen"
-          :color="`s`"
-          :event="true"
-          :name="`meixicomponenticon-shaixuan`"
-          :plain="true"
-          :size="`s`"
-          :title="`高级筛选`"
-          @iconClick="handleClick('screen')"
-      ></base-icon>
+
+      <t-button v-if="config.screen" shape="square" variant="outline" @click="handleClick('screen')">
+        <template #icon>
+          <layers-icon></layers-icon>
+        </template>
+      </t-button>
 
       <slot name="flex-slot"></slot>
     </div>
   </div>
 </template>
 <script>
+import {LayersIcon} from "tdesign-icons-vue"
+
 export default {
   data() {
     return {}
@@ -49,7 +35,9 @@ export default {
   mounted() {
 
   },
-
+  components: {
+    LayersIcon
+  },
   computed: {
     preIndex() {
       return this.$props.config.preIndex
@@ -139,12 +127,12 @@ export default {
 
 
   .cell-text {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    color: var(--font-color-m);
-    font-size: var(--font-size-base);
-    font-weight: var(--font-weight-m);
+    //overflow: hidden;
+    //white-space: nowrap;
+    //text-overflow: ellipsis;
+    //color: var(--font-color-m);
+    //font-size: var(--font-size-base);
+    //font-weight: var(--font-weight-m);
   }
 
   .table-header-left {