meixioacomponent 2.0.31 → 2.0.33

package/lib/style/tableStyle.less

@@ -1,9 +1,8 @@
 
-
-
 .cell-content-text {
   width: 100%;
   overflow: hidden;
+  display: block;
   white-space: nowrap;
   text-overflow: ellipsis;
   font-weight: var(--font-weight-m);
@@ -26,18 +25,14 @@
   color: var(--color-success) !important;
 }
 
-/deep/ .el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell {
-  background-color: var(--color-gray-s) !important;
-}
-
 
 .primary,
-.fun,.handle-primary {
+.fun, .handle-primary {
   color: var(--color-primary) !important;
   font-size: var(--font-size-base) !important;
 }
 
-.fun,.handle-primary  {
+.fun, .handle-primary {
   cursor: pointer;
 
   &:hover {
@@ -47,11 +42,9 @@
 
 
 .wait {
-  /deep/ .el-table__fixed-header-wrapper {
-    z-index: 0 !important;
-  }
 
-  /deep/ .el-table__fixed-body-wrapper {
-    z-index: 0 !important;
-  }
 }
+
+/deep/ .t-table__tree-leaf-node {
+  display: flex !important;
+}

package/lib/style/tdesignStyle.less

@@ -1,13 +1,22 @@
-.t-drawer__content-wrapper{
+.t-drawer__content-wrapper {
   background: transparent !important;
 }
-.t-drawer{
+
+.t-drawer {
   box-shadow: none !important;
 }
-.t-drawer__body{
+
+.t-drawer__body {
   padding: 0 !important;
 }
 
-.t-list__inner{
+.t-list__inner {
   height: 100% !important;
 }
+
+
+.t-form__item  {
+  .t-is-error {
+    margin-bottom: var(--td-line-height-body-small) !important;
+  }
+}

package/lib/typings/type.d.ts

@@ -391,5 +391,16 @@ export declare interface TableProScreenInterFace {
     type: "timeRange" | "singleTime" | "text" | "select";
     formType: "text" | "textarea" | "select" | "date" | "number" | "floatnumber" | "mobile";
 }
+export declare type TypeByTheme = "danger" | "warning" | "info" | "success";
+export declare type TypeByConfirmOptions = {
+    confirmButtonText?: string;
+    cancelButtonText?: string;
+    type: TypeByTheme & "default" | undefined;
+};
+export declare type TypeByNotifyOptions = {
+    title?: string;
+    content?: string;
+    duration?: number;
+};
 export {};
 //# sourceMappingURL=type.d.ts.map

package/lib/typings/type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../packages/typings/type.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../packages/typings/type.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/packages/components/base/baseArea/baseArea.vue

@@ -23,7 +23,7 @@
               <span>地区选择器</span>
             </div>
             <div class="title-right">
-              <LocationIcon @click="backArea" v-show="activeIndex>1"></LocationIcon>
+              <arrow-left-icon @click="backArea" v-show="activeIndex>1"></arrow-left-icon>
             </div>
           </div>
           <div class="content-middle">
@@ -47,7 +47,8 @@
                     class="area-item"
                 >
 
-                  <t-button v-if="item.label == activeArea" shape="square" variant="outline" @click="deleteCheck">
+                  <t-button class="delete-btn" v-if="item.label == activeArea" shape="square" variant="outline"
+                            @click="deleteCheck">
                     <template #icon>
                       <CloseCircleIcon
                       ></CloseCircleIcon>
@@ -80,7 +81,7 @@
                  :readonly="true"
                  placeholder="请选择地区">
           <template #suffix-icon>
-            <arrow-down-icon v-if="isOpen"></arrow-down-icon>
+            <arrow-down-icon v-if="!isOpen"></arrow-down-icon>
             <arrow-up-icon v-else></arrow-up-icon>
           </template>
         </t-input>
@@ -94,7 +95,7 @@ import baseButtonHandleVue from '../baseButtonHandle/baseButtonHandle.vue'
 //
 import areaJson from './area'
 import areaConfig from './areaConfig'
-import {ArrowDownIcon, ArrowUpIcon, CloseCircleIcon, LocationIcon} from "tdesign-icons-vue"
+import {ArrowDownIcon, ArrowLeftIcon, ArrowUpIcon, CloseCircleIcon, LocationIcon} from "tdesign-icons-vue"
 import {baseTimeTypeConfig} from "../baseTimeTypeSelect/config";
 import {TransomComponentSize} from "../../../utils/utils";
 
@@ -136,7 +137,8 @@ export default {
     CloseCircleIcon,
     baseButtonHandleVue,
     ArrowUpIcon,
-    ArrowDownIcon
+    ArrowDownIcon,
+    ArrowLeftIcon
   },
   computed: {
     module: {
@@ -524,7 +526,9 @@ export default {
         border-bottom: 2px solid var(--color-gray-m);
 
         .area-item {
-          height: 24px;
+          padding: 0 var(--padding-4);
+          box-sizing: border-box;
+          height: 40px;
           display: flex;
           cursor: pointer;
           position: relative;
@@ -537,6 +541,13 @@ export default {
           justify-content: flex-start;
           border-radius: calc(var(--radius) * 2);
 
+          .delete-btn {
+            position: absolute;
+            top: -16px;
+            right: -16px;
+          }
+
+
           span {
             max-width: 100%;
             line-height: 24px;

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

@@ -8,6 +8,7 @@
         :closeBtn="false"
         :attach="attach" :showOverlay="modal" :closeOnOverlayClick="false" :closeOnEscKeydown="false"
         :top="top"
+        :z-index="zIndex?zIndex:componentConfig.dynamicId+1"
         :destroy-on-close="destroyOnClose"
         :width="width" :visible.sync="centerDialogVisible">
 
@@ -24,7 +25,7 @@
               <span>{{ title }}</span>
               <div class="title-handle-wrap">
 
-                <t-button shape="square" variant="outline" v-if="isCache" @click="handleCache"
+                <t-button shape="square" variant="text" v-if="isCache" @click="handleCache"
                           style="margin-right: var(--margin-4)">
                   <template #icon>
                     <remove-icon
@@ -37,7 +38,7 @@
                 <!--                    ref="dragIcon"-->
                 <!--                ></drag-move-icon>-->
 
-                <t-button shape="square" variant="outline" v-if="hasCloseIcon" @click="onHandleClose">
+                <t-button shape="square" variant="text" v-if="hasCloseIcon" @click="onHandleClose">
                   <template #icon>
                     <close-icon
                     ></close-icon>
@@ -80,6 +81,8 @@
 import DialogSkeleton from "./dialogSkeleton";
 import UseDrag from "../../../config/use/useDrag";
 import {CloseIcon, RemoveIcon} from "tdesign-icons-vue"
+import componentConfig from "../../../config/componentConfig";
+import UseConfirm from "../../../config/use/useConfirm/UseConfirm";
 
 export default {
   name: "baseDialog",
@@ -187,9 +190,16 @@ export default {
       type: Boolean,
       default: false,
     },
+    zIndex: {
+      type: Number,
+      default: 0
+    }
   },
 
   computed: {
+    componentConfig() {
+      return componentConfig
+    },
     dialogContentStyle() {
       return {
         height: this.$props.contentHeight,
@@ -311,19 +321,30 @@ export default {
       //     .catch(() => {
       //     });
 
-      const confirmDia = this.$dialog.confirm({
-        header: '关闭对话框',
-        body: `${this.noticeText}`,
-        confirmBtn: '确定',
-        cancelBtn: '取消',
-        onConfirm: ({e}) => {
-          confirmDia.destroy();
-          this.closeDialog();
-        },
-        onClose: ({e, trigger}) => {
-          confirmDia.destroy();
-        },
-      });
+
+      new UseConfirm().toMountedConfirm(this.noticeText, '关闭对话框', {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定'
+
+      }).then(() => {
+        this.closeDialog();
+      }).catch(() => {
+
+      })
+
+      // const confirmDia = this.$dialog.confirm({
+      //   header: '关闭对话框',
+      //   body: `${this.noticeText}`,
+      //   confirmBtn: '确定',
+      //   cancelBtn: '取消',
+      //   onConfirm: ({e}) => {
+      //     confirmDia.destroy();
+      //     this.closeDialog();
+      //   },
+      //   onClose: ({e, trigger}) => {
+      //
+      //   },
+      // });
 
 
     },
@@ -388,6 +409,7 @@ export default {
 }
 
 .dialog__footer__wrap {
+  margin-top: var(--td-comp-paddingTB-xxl);
   //padding-bottom: calc(var(--padding-4) * 2) ;
 }
 </style>

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

@@ -10,6 +10,7 @@
             :header="false"
             :footer="false"
             @close="close"
+            :z-index="componentConfig.dynamicId+=1"
             :close-on-esc-keydown="closeOnPressEscape"
             :close-on-overlay-click="wrapperClosable"
   >
@@ -64,6 +65,7 @@ import drawerController from "./drawerController";
 //
 import UseResize from "../../../config/use/UseResize";
 import {CloseIcon} from "tdesign-icons-vue"
+import componentConfig from "../../../config/componentConfig";
 
 export default {
   name: "baseDrawer",
@@ -71,7 +73,7 @@ export default {
     return {
       open: false,
       useResize: null,
-      ignoreList: ['t-select__list','t-popup'],
+      ignoreList: ['t-select__list', 't-popup','t-dialog__wrap'],
       showCloseButton: false
     };
   },
@@ -300,6 +302,9 @@ export default {
 
   },
   computed: {
+    componentConfig() {
+      return componentConfig
+    },
     drawerSize() {
       if (this.handleShow) {
         return this.$props.size + 44

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

@@ -1,7 +1,7 @@
 <template>
   <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"
+                    :max="max" :min="min" :placeholder="placeholder" :decimal-places="precision" :size="componentSize"
                     @change="onChange" style="width: 100%; height: 100%;"
                     @blur="onBlue"
     >
@@ -23,7 +23,7 @@
     </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"
+                    :max="max" :min="min" :placeholder="placeholder" :decimal-places="precision" :size="componentSize"
                     @blur="onBlue"
                     @change="onChange" style="width: 100%; height: 100%;">
       <template #suffix>
@@ -46,11 +46,17 @@
 
 <script>
 import BaseStoreSelect from '../baseStoreSelect/index.vue'
+import {TransomComponentSize} from "../../../utils/utils";
 
 export default {
   name: 'baseNumberInput',
   data() {
-    return {}
+    return {
+      privateValue: null
+    }
+  },
+  created() {
+    this.privateValue = this.module;
   },
   props: {
     value: {},
@@ -105,33 +111,61 @@ export default {
         return this.$props.linkValue
       },
     },
+
+    componentSize() {
+      return TransomComponentSize(this.$props.size);
+    },
   },
   methods: {
     focus() {
       this.$refs.target.focus()
     },
 
-    onChange(currentValue) {
-      this.$nextTick(() => {
-        if (currentValue === 0) {
-          this.$nextTick(() => {
-            this.module = this.$props.min;
-          })
-        } else if (!currentValue) {
-          this.$nextTick(() => {
-            this.module = this.$props.defaultValue;
-          })
-        }
-        this.$emit('onChange', this.module)
-      })
-
+    onChange(currentValue, ChangeSource) {
+      if (currentValue >= this.max) {
+        this.module = this.max;
+        return;
+      }
+      if (currentValue === 0) {
+        this.$nextTick(() => {
+          this.module = this.$props.min;
+        })
+      } else if (!currentValue) {
+        this.$nextTick(() => {
+          this.module = this.$props.defaultValue;
+        })
+      }
+      // this.$emit('onChange', this.module)
     },
 
     onBlue() {
-      this.$emit('blur');
+      if (this.module !== this.privateValue) {
+        this.$emit('onChange', this.module)
+        this.privateValue = this.module;
+      } else {
+        this.$emit('blur');
+      }
     }
   },
   components: {BaseStoreSelect},
+  watch: {
+    min: {
+      handler(newVal){
+        if (this.module < newVal) {
+          this.onChange(newVal);
+        }
+      },
+      deep:true
+    },
+    max: {
+      handler (newVal) {
+        if (this.module > newVal) {
+          this.onChange(newVal);
+        }
+      },
+      deep:true
+    }
+  }
 }
 </script>
 

package/packages/components/base/basePlainTable/basePlainTable.vue

@@ -1,13 +1,17 @@
 <template>
   <div class="table-wrap">
-
-    <t-table
-        :row-key="rowKey"
-        :columns="renderColumns"
+    <t-enhanced-table
+        ref="tTable"
+        :rowKey="rowKey"
         :data="tableData"
+        :bordered="bordered"
+        :max-height="maxHeight"
+        :columns="renderColumns"
+        :tree="tree"
         :default-selected-row-keys="preCheckValue"
         :selected-row-keys="preCheckValue"
-        @select-change=""
+        :rowspan-and-colspan='rowspanAndColspan'
+        @select-change="onHandleSelectChange"
     >
       <template slot="empty">
         <baseDefaultSvgVue
@@ -40,7 +44,7 @@
                   :type="item.type"></baseText>
 
       </template>
-    </t-table>
+    </t-enhanced-table>
 
   </div>
 </template>
@@ -59,9 +63,7 @@ export default {
     return {
       id: null,
       checkValue: null,
-      maxHeight: 'auto',
       tableColumns: []
-
     }
   },
   mixins: [tableSectionMixins],
@@ -71,9 +73,6 @@ export default {
       this.id = this.$props.tableId
     }
 
-    if (this.$props.height === 'auto') {
-      this.maxHeight = 9999999
-    }
 
     this.checkValue = this.preCheckValue;
 
@@ -135,28 +134,44 @@ export default {
       type: Array,
       require: true,
     },
+    rowspanAndColspan: {
+      type: Function,
+    },
+    maxHeight: {
+      type: [String, Number],
+      default: ''
+    },
+    bordered: {
+      type: Boolean,
+      default: false
+    },
+    tree:{
+      type:Object,
+      default:()=>{
+        return null
+      }
+    }
 
   },
   computed: {
     renderColumns() {
 
-
-      const config  = this.tableColumns.map((item, index) => {
+      const config = this.tableColumns.map((item, index) => {
         item['key'] = item.value;
         item['colkey'] = item.key;
         TransomTableConfig(item, index)
         return item;
       });
-
-
+      console.log('checkType')
+      console.log(this.$props.checkType);
       if (this.$props.checkType) {
         const checkConfig = {
           colKey: 'row-select',
-          type: 'multiple',
+          type: this.$props.checkType,
           label: 'row-select',
           disabled: (scope) => {
             if (this.$props.canSelected) {
-              return !(this.$props.canSelected(scope))
+                return !(this.$props.canSelected(scope))
             } else {
               return false
             }
@@ -164,8 +179,8 @@ export default {
           }
         }
 
-        return [checkConfig,...config]
-      }else{
+        return [checkConfig, ...config]
+      } else {
       }
       return config
     }
@@ -202,8 +217,12 @@ export default {
         return value
       }
     },
-
-
+    onHandleSelectChange(value, event) {
+      this.$emit("selectChange", {
+        keys: value,
+        rowData: event,
+      });
+    }
   },
   watch: {
     tableData(newVal, oldVal) {

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

@@ -18,20 +18,22 @@
           @click="buttonClick">
 
         <template #icon v-if="buttonIcon">
-          <base-icon
-              :style="{
-                marginRight:buttonText?'var(--margin-2)':'0'
-              }"
-              v-if="buttonIcon"
-              :color="module ? 'var(--text-white)' : 'd'"
-              :event="!disabled"
-              :iconClass="iconClass"
-              :name="buttonIcon"
-              :plain="true"
-              :size="`s`"
-              class="button-icon"
-              @iconClick="iconClick"
-          ></base-icon>
+          <t-icon :name="buttonIcon"></t-icon>
+
+<!--          <base-icon-->
+<!--              :style="{-->
+<!--                marginRight:buttonText?'var(&#45;&#45;margin-2)':'0'-->
+<!--              }"-->
+<!--              v-if="buttonIcon"-->
+<!--              :color="module ? 'var(&#45;&#45;text-white)' : 'd'"-->
+<!--              :event="!disabled"-->
+<!--              :iconClass="iconClass"-->
+<!--              :name="buttonIcon"-->
+<!--              :plain="true"-->
+<!--              :size="`s`"-->
+<!--              class="button-icon"-->
+<!--              @iconClick="iconClick"-->
+<!--          ></base-icon>-->
         </template>
         <span v-if="buttonText" class="inner-span">{{ buttonText }}</span>
       </base-button>

package/packages/components/base/baseSection/baseSection.vue

@@ -15,7 +15,7 @@
       <div class="header-right">
         <slot name="section-header-right"></slot>
 
-        <t-button shape="square" variant="outline" @click="iconClick">
+        <t-button shape="square" style="margin-left: var(--margin-4)" variant="text" @click="iconClick">
           <template #icon>
             <ArrowDownIcon
                 v-if="!module"