meixioacomponent 1.1.49 → 2.0.2

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

@@ -1,15 +1,15 @@
 <template>
   <div class="base-video-wrap" title="点击播放视频">
-    <base-icon
-      :event="true"
-      :iconClass="`element`"
-      @iconClick="iconClick"
-      name="el-icon-video-play"
-    ></base-icon>
+    <t-button shape="square" variant="outline" @click="iconClick">
+      <template #icon>
+        <video-icon></video-icon>
+      </template>
+    </t-button>
   </div>
 </template>
 
 <script>
+import {VideoIcon} from "tdesign-icons-vue"
 import useViewVideo from '../../../config/use/UseViewVideo'
 
 export default {
@@ -17,7 +17,9 @@ export default {
   data() {
     return {}
   },
-
+  components:{
+    VideoIcon
+  },
   props: {
     resource: {
       type: String,

package/packages/components/base/upload/upload.vue

@@ -5,20 +5,19 @@
         <span>附件上传</span>
       </div>
       <div class="title-right">
-        <base-icon
-          :color="`d`"
-          :event="true"
-          :name="handleDownIcon"
-          :size="`l`"
-          @iconClick="handleDown"
-        ></base-icon>
-        <base-icon
-          :color="`d`"
-          :event="true"
-          :name="`meixicomponenticon-close`"
-          :size="`l`"
-          @iconClick="uploadCancel"
-        ></base-icon>
+
+        <t-button shape="square" variant="outline" @click="handleDown">
+          <template #icon>
+            <arrow-down-icon v-if="isDown"></arrow-down-icon>
+            <arrow-up-icon v-else></arrow-up-icon>
+          </template>
+        </t-button>
+
+        <t-button shape="square" variant="outline" @click="uploadCancel">
+          <template #icon>
+            <close-icon></close-icon>
+          </template>
+        </t-button>
       </div>
       <div v-if="isDown" :style="totalStyle" class="total-process-wrap"></div>
     </div>
@@ -37,6 +36,7 @@
 import uploadItemVue from "./uploadItem.vue";
 //
 import Upload from "../../../utils/upload";
+import {ArrowDownIcon,ArrowUpIcon,CloseIcon} from "tdesign-icons-vue"
 
 export default {
   name: "upload",
@@ -52,6 +52,9 @@ export default {
   },
   components: {
     uploadItemVue,
+    ArrowDownIcon,
+    ArrowUpIcon,
+    CloseIcon
   },
   props: {
     toUploadList: {

package/packages/components/base/upload/uploadItem.vue

@@ -16,42 +16,37 @@
     </div>
 
     <div class="item-status">
-      <base-icon
-        :size="`l`"
-        :active="true"
-        :event="true"
-        @iconClick="handleClose"
-        :name="uploadTypeIcon"
-        v-if="type == 'upload'"
-      ></base-icon>
-      <base-icon
-        :size="`l`"
-        :event="true"
-        title="下载"
-        v-if="type == 'appendix' && url"
-        @iconClick="onHandleToDown"
-        :name="`meixicomponenticon-xiala`"
-      ></base-icon>
-      <base-icon
-        :size="`l`"
-        :event="true"
-        title="删除"
-        v-if="type == 'appendix' && !disabled"
-        @iconClick="handleClose"
-        :name="`meixicomponenticon-lajixiang`"
-      ></base-icon>
+      <t-button shape="square" variant="outline" @click="handleClose" v-if="type == 'upload'">
+        <template #icon>
+          <div v-if="process==100">
+            <check-icon v-if="upload.state==1 "></check-icon>
+            <close-icon v-else-if="upload.state==2"></close-icon>
+          </div>
+          <close-icon v-else></close-icon>
+        </template>
+      </t-button>
+      <t-button shape="square" variant="outline" @click="onHandleToDown" v-if="type == 'appendix' && url">
+        <template #icon>
+          <arrow-down-icon></arrow-down-icon>
+        </template>
+      </t-button>
+
+      <t-button shape="square" variant="outline" @click="handleClose" v-if="type == 'appendix' && !disabled">
+        <template #icon>
+          <delete-icon></delete-icon>
+        </template>
+      </t-button>
     </div>
   </div>
 </template>
 
 <script>
-import {
-  fileSuffix,
-  filterFileSize,
-  fromUrlToDownFile,
-  jugeFileTypeKey,
-} from "../../../utils/utils";
+import {fileSuffix, filterFileSize, fromUrlToDownFile, jugeFileTypeKey,} from "../../../utils/utils";
+import {ArrowDownIcon, CheckIcon, CloseIcon, DeleteIcon} from "tdesign-icons-vue"
+
+
 export default {
+  components: {DeleteIcon, ArrowDownIcon, CheckIcon, CloseIcon},
   data() {
     return {};
   },
@@ -70,25 +65,12 @@ export default {
       default: false,
     },
   },
-  created() {},
+  created() {
+  },
   computed: {
     zhengqueShow() {
       return this.process === 100 && this.$props.type === "upload";
     },
-
-    uploadTypeIcon() {
-      const { item } = this.$props;
-      if (this.process == 100) {
-        const { upload } = item;
-        if (upload.state == 1) {
-          return "meixicomponenticon-zhengque";
-        } else if (upload.state == 2) {
-          return "meixicomponenticon-close";
-        }
-      } else {
-        return "meixicomponenticon-close";
-      }
-    },
     fileName() {
       return this.item.file.name;
     },
@@ -112,7 +94,7 @@ export default {
   },
   methods: {
     handleClose() {
-      const { type } = this.$props;
+      const {type} = this.$props;
       if (type === "upload") {
         if (this.process !== 100) {
           this.$emit("deleteAppendixItem", this.$props.item);
@@ -138,6 +120,7 @@ export default {
   justify-content: space-between;
   margin: var(--margin-4) 0px;
   border-radius: calc(var(--radius) * 2);
+
   .item-wrap-prefix {
     display: flex;
     align-items: center;
@@ -145,6 +128,7 @@ export default {
     width: calc(100% - 40px);
     justify-content: flex-start;
   }
+
   .item-type,
   .item-status {
     width: 40px;
@@ -154,6 +138,7 @@ export default {
     justify-content: center;
     flex-flow: row nowrap;
   }
+
   .item-content {
     width: auto;
     height: 100%;
@@ -175,11 +160,13 @@ export default {
         text-overflow: ellipsis;
         display: inline-block;
       }
+
       .item-name {
         width: auto;
         color: var(--font-color-s);
         font-size: var(--font-size-base);
       }
+
       .item-size {
         width: auto;
         margin-left: var(--margin-4);
@@ -188,11 +175,13 @@ export default {
         font-weight: var(--font-weight-kg);
       }
     }
+
     .item-process-wrap {
       width: 100%;
       height: 4px;
       position: relative;
       background: var(--color-gray-m);
+
       .item-process-bar {
         height: 100%;
         transition: all 0.3s ease;
@@ -201,19 +190,24 @@ export default {
     }
   }
 }
+
 .upload,
 .appendix {
   background: var(--color-gray-m);
+
   .item-content {
     width: calc(100% - 40px) !important;
+
     .item-name {
       max-width: 80%;
     }
+
     .item-size {
       max-width: 20%;
     }
   }
 }
+
 .appendix {
   justify-content: space-between;
   padding: var(--padding-4);

package/packages/components/dialogCache/index.vue

@@ -1,44 +1,50 @@
 <template>
   <div
-    v-if="getRenderShow"
-    ref="dialogCacheWrapRef"
-    class="dialog-cache-wrap"
-    v-clickOutside="dialogCacheWrapOnBlue"
+      v-if="getRenderShow"
+      ref="dialogCacheWrapRef"
+      class="dialog-cache-wrap"
+      v-clickOutside="dialogCacheWrapOnBlue"
   >
     <div
-      class="dialog-no-cache"
-      v-if="getCacheList && getCacheList.length <= 0"
+        class="dialog-no-cache"
+        v-if="getCacheList && getCacheList.length <= 0"
     >
       <baseDefaultSvg
-        :width="100"
-        :height="100"
-        :text="`暂无缓存表单`"
-        :svgName="`no-content`"
+          :width="100"
+          :height="100"
+          :text="`暂无缓存表单`"
+          :svgName="`no-content`"
       ></baseDefaultSvg>
     </div>
     <div class="dialog-cache-content" v-else>
-      <el-button
-        type="info"
-        :key="index"
-        size="medium"
-        icon="el-icon-tickets"
-        @click="openDialogCache(index)"
-        v-for="(item, index) in getCacheList"
+      <base-button
+          type="info"
+          :key="index"
+          size="medium"
+          @click="openDialogCache(index)"
+          v-for="(item, index) in getCacheList"
       >
+        <template #icon>
+          <TicketIcon></TicketIcon>
+        </template>
         {{ item.title }}
-      </el-button>
+      </base-button>
     </div>
   </div>
 </template>
 
 <script>
 import baseDefaultSvg from '../base/baseDefaultSvg/baseDefaultSvg.vue'
+import {TicketIcon} from "tdesign-icons-vue"
+
 export default {
   data() {
     return {}
   },
-  created() {},
-  mounted() {},
+  created() {
+  },
+  mounted() {
+  },
   computed: {
     getCacheList() {
       return this.$store.getters['dialogCacheStore/getCacheList']
@@ -47,7 +53,7 @@ export default {
       return this.$store.getters['dialogCacheStore/getRenderShow']
     },
   },
-  components: { baseDefaultSvg },
+  components: {baseDefaultSvg, TicketIcon},
   methods: {
     openDialogCache(index) {
       this.$store.commit('dialogCacheStore/OPEN_DIALOG_CACHE', index)
@@ -56,9 +62,7 @@ export default {
       this.$store.commit('dialogCacheStore/SET_RENDER_SHOW', false)
     },
   },
-  watch: {
-
-  },
+  watch: {},
 }
 </script>
 
@@ -74,6 +78,7 @@ export default {
   background: var(--bg-white);
   padding: calc(var(--padding-4) * 2);
   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.3);
+
   .dialog-no-cache {
     width: 100%;
     height: auto;
@@ -82,6 +87,7 @@ export default {
     flex-flow: row nowrap;
     justify-content: center;
   }
+
   .dialog-cache-content {
   }
 }

package/packages/components/index.js

@@ -9,7 +9,6 @@ var baseDefaultSvg_1 = require("./base/baseDefaultSvg");
 var baseDialog_1 = require("./base/baseDialog");
 var baseDialogTable_1 = require("./base/baseDialogTable");
 var baseDrawer_1 = require("./base/baseDrawer");
-var elDatePicker_1 = require("./base/elDatePicker");
 var baseEdito_1 = require("./base/baseEdito");
 var baseFixedHeader_1 = require("./base/baseFixedHeader");
 var baseIcon_1 = require("./base/baseIcon");
@@ -51,6 +50,7 @@ var baseTag_1 = require("./base/baseTag");
 var oaProTableSearch_1 = require("./proPageTable/oaProTableSearch");
 var baseWait_1 = require("./base/baseWait");
 var vuedraggable_1 = require("vuedraggable");
+var baseButton_1 = require("./base/baseButton");
 // js 文件相关
 var theme_1 = require("../config/theme/theme");
 var dynamicmount_1 = require("./dynamicmount");
@@ -68,6 +68,7 @@ var useCropper_1 = require("../config/use/useCropper");
 var UseViewVideo_1 = require("../config/use/UseViewVideo");
 var UseGuide_1 = require("../config/use/UseGuide");
 var LinkViewClass_1 = require("../config/LinkViewClass");
+require("tdesign-vue/es/style/index.css");
 //组件库type类型
 var useType_1 = require("../useType/useType");
 var ProTableLocalConfigManage_1 = require("../config/ProTableLocalConfigManage/ProTableLocalConfigManage");
@@ -121,7 +122,7 @@ var meixicomponents = [
     baseWait_1["default"],
     vuedraggable_1["default"],
     baseUploadImgAndName_1["default"],
-    elDatePicker_1["default"]
+    baseButton_1["default"]
 ];
 var install = function (Vue) {
     componentConfig_1["default"].Vue = Vue;
@@ -195,7 +196,6 @@ var meixioacomponent = {
     baseGuide: baseGuide_1["default"],
     baseText: baseText_1["default"],
     baseTag: baseTag_1["default"],
-    elDatePicker: elDatePicker_1["default"],
     oaProTableSearch: oaProTableSearch_1["default"],
     baseWait: baseWait_1["default"],
     Theme: theme_1["default"],

package/packages/components/index.ts

@@ -7,7 +7,6 @@ import baseDefaultSvg from "./base/baseDefaultSvg";
 import baseDialog from "./base/baseDialog";
 import baseDialogTable from "./base/baseDialogTable";
 import baseDrawer from "./base/baseDrawer";
-import elDatePicker from "./base/elDatePicker";
 import baseEdito from "./base/baseEdito";
 import baseFixedHeader from "./base/baseFixedHeader";
 import Icon from "./base/baseIcon";
@@ -49,6 +48,7 @@ import baseTag from "./base/baseTag";
 import oaProTableSearch from "./proPageTable/oaProTableSearch";
 import baseWait from "./base/baseWait";
 import draggable from 'vuedraggable'
+import baseButton from "./base/baseButton";
 
 // js 文件相关
 import Theme from "../config/theme/theme";
@@ -68,6 +68,8 @@ import useViewVideo from "../config/use/UseViewVideo";
 import useGuide from "../config/use/UseGuide";
 import LinkViewClass from "../config/LinkViewClass";
 
+import 'tdesign-vue/es/style/index.css';
+
 //组件库type类型
 import {useFormItemParamsType, useProScreenParamsItem, useTableColumnParamsType,} from "../useType/useType";
 import proTableLocalConfigManage from "../config/ProTableLocalConfigManage/ProTableLocalConfigManage";
@@ -123,7 +125,7 @@ const meixicomponents: any[] = [
     baseWait,
     draggable,
     baseUploadImgAndName,
-    elDatePicker
+    baseButton
 ];
 
 const install = (Vue) => {
@@ -202,7 +204,6 @@ const meixioacomponent = {
     baseGuide,
     baseText,
     baseTag,
-    elDatePicker,
     oaProTableSearch,
     baseWait,
     Theme,

package/packages/components/mixins/tableSectionMixins.js

@@ -17,18 +17,6 @@ export const tableSectionMixins = {
         name() {
             return this.$options.name;
         },
-        checkType() {
-
-            let checkType = null;
-            if (this.name === "baseProTable") {
-                let tableCheckboxConfig = this.$props.tableCheckboxConfig
-                checkType = tableCheckboxConfig.type
-            } else if (this.name === "basePlainTable") {
-                checkType = this.$props.tableExtend;
-            }
-
-            return checkType;
-        }
     },
     methods: {
 

package/packages/components/proForm/dialogForm/baseDialogForm.vue

@@ -286,21 +286,24 @@ export default {
     },
 
     beforeClose(done) {
-      this.$confirm('是否关闭当前表单?', '提示', {
-        type: 'warning',
-        cancelButtonText: '取消',
-        confirmButtonText: '确定'
-      }).then(res => {
-
-        if (done) {
-          done();
-        } else {
-          this.$refs.dialog.closeDialog();
-        }
-
-      }).catch(() => {
+      const confirmDia = this.$dialog.confirm({
+        header: '关闭对话框',
+        body: `是否关闭当前表单?`,
+        confirmBtn: '确定',
+        cancelBtn: '取消',
+        onConfirm: ({ e }) => {
+          confirmDia.destroy();
+          if (done) {
+            done();
+          } else {
+            this.$refs.dialog.closeDialog();
+          }
+        },
+        onClose: ({ e, trigger }) => {
+          confirmDia.destroy();
+        },
+      });
 
-      })
     }
   },
   watch: {},