meixioacomponent 1.1.49 → 2.0.2

package/packages/components/proPageTable/oa_pro_table_check_handle_bar.vue

@@ -3,7 +3,7 @@
     <div class="handle-notify-data">
       <span class="handle-text">
         已选中
-        <span style="color: var(--color-primary); margin: 0px var(--margin-2);">
+        <span style="color: var(--color-primary); margin: 0 var(--margin-2);">
           {{ checkNum }}
         </span>
         项
@@ -11,24 +11,29 @@
     </div>
 
     <div class="handle-plugin-wrap">
-      <el-button
-        type="info"
-        size="mini"
-        icon="el-icon-upload2"
-        v-if="exportFn"
-        @click="exportFn"
+      <base-button
+          type="info"
+          size="mini"
+          v-if="exportFn"
+          @click="exportFn"
       >
+        <template #icon>
+          <UploadIcon></UploadIcon>
+        </template>
+
         导出选中
-      </el-button>
-      <el-button
-        type="info"
-        size="mini"
-        v-if="delFn"
-        @click="delFn"
-        icon="el-icon-delete"
+      </base-button>
+      <base-button
+          type="info"
+          size="mini"
+          v-if="delFn"
+          @click="delFn"
       >
+        <template #icon>
+          <DeleteIcon></DeleteIcon>
+        </template>
         删除
-      </el-button>
+      </base-button>
 
       <slot name="check-handle"></slot>
     </div>
@@ -36,10 +41,16 @@
 </template>
 
 <script>
+import {DeleteIcon, UploadIcon} from "tdesign-icons-vue"
+
 export default {
   data() {
     return {}
   },
+  components: {
+    UploadIcon,
+    DeleteIcon
+  },
   props: {
     delFn: {},
     exportFn: {},
@@ -47,7 +58,7 @@ export default {
   },
   computed: {
     checkNum() {
-      const { checkedValue } = this.$props
+      const {checkedValue} = this.$props
       return checkedValue.length
     },
   },
@@ -71,6 +82,7 @@ export default {
       font-weight: var(--font-weight-kg);
     }
   }
+
   .handle-plugin-wrap {
     display: flex;
   }

package/packages/components/searchHeader/searchHeader.vue

@@ -1,32 +1,36 @@
 <template>
   <div class="search-header-wrap">
     <div class="search-header-wrap-left">
-      <el-input
+      <t-input
           v-if="input"
           v-model="module"
           :placeholder="placeholder"
           size="small"
           style="width: 220px"
-          suffix-icon="el-icon-search"
           @keyup.enter.native="handleSearch"
-      ></el-input>
+      >
+        <template #suffix-icon>
+          <SearchIcon></SearchIcon>
+        </template>
+
+      </t-input>
 
       <base-list v-if="searchList" class="search-header-config-wrap">
         <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>
-          <el-button
+          <base-button
               v-for="(item, index) in searchList.list"
               :key="index"
               :class="{
               'is-plain': index != searchList.index,
             }"
-              :size="size"
-              :type="index == searchList.index ? 'selected' : 'info'"
+              size="mini"
+              :type="index == searchList.index ? 'primary' : 'info'"
               @click="handleScreen(index)"
           >
             {{ item.label }}
-          </el-button>
+          </base-button>
         </div>
       </base-list>
     </div>
@@ -37,6 +41,8 @@
 </template>
 
 <script>
+import {SearchIcon} from "tdesign-icons-vue"
+
 export default {
   data() {
     return {};
@@ -66,6 +72,9 @@ export default {
       },
     },
   },
+  components: {
+    SearchIcon
+  },
   methods: {
     handleSearch() {
       this.$emit("handleSearch");
@@ -97,16 +106,6 @@ export default {
     .search-header-config-wrap {
       width: calc(100% - 220px);
 
-      /deep/ .el-scrollbar__wrap {
-        overflow-y: hidden !important;
-      }
-
-      /deep/ .el-scrollbar__view {
-        height: 100%;
-        display: flex;
-
-      }
-
       /deep/ .is-vertical {
         display: none !important;
       }

package/packages/components/style/font-family.less

@@ -3,4 +3,5 @@
     src: url('data:application/font-woff;charset=utf-8;base64,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') format('woff');
     font-weight: normal;
     font-style: normal;
-}
+}
+

package/packages/components/style/index.less

@@ -1,9 +1,16 @@
 @import "./theme/theme.less";
 @import "./variables.less";
-@import "./element/index.css";
-@import "./element/common_class.less";
+@import "./tdesignStyle.less";
 @import "./meixioacomponenticonfont/meixicomponenticonfont.css";
 
+
+@font-face {
+  font-family: 'TCloudNumber ';
+  src: url("./meixioacomponenticonfont/TCloudNumberVF.ttf");
+  font-weight: normal;
+  font-style: normal;
+}
+
 body {
   color: var(--font-white-2);
   font-family: var(--font-family) !important;

package/packages/components/style/tableStyle.less

@@ -1,18 +1,5 @@
-/deep/ .el-table__row {
-  &:last-of-type {
-    td {
-      border-bottom: 0;
-    }
-  }
-
-  &:first-of-type {
-    td {
-      border-bottom: 1px solid var(--color-table-border)
-    }
-  }
 
 
-}
 
 .cell-content-text {
   width: 100%;
@@ -44,6 +31,21 @@
 }
 
 
+.primary,
+.fun,.handle-primary {
+  color: var(--color-primary) !important;
+  font-size: var(--font-size-base) !important;
+}
+
+.fun,.handle-primary  {
+  cursor: pointer;
+
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
+
 .wait {
   /deep/ .el-table__fixed-header-wrapper {
     z-index: 0 !important;

package/packages/components/style/tdesignStyle.less

@@ -0,0 +1,9 @@
+.t-drawer__content-wrapper{
+  background: transparent !important;
+}
+.t-drawer{
+  box-shadow: none !important;
+}
+.t-drawer__body{
+  padding: 0 !important;
+}

package/packages/components/style/variables.less

@@ -24,7 +24,7 @@
   --font-size-xl: calc(var(--font-size) * 2); // 字号-二级字号 20
   --font-size-xxl: calc(var(--font-size) * 3.6); // 字号-一级字号 36
   // 字号
-  --font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
+  --font-family: TCloudNumber, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
   Ubuntu, Fira Sans, Droid Sans, Helvetica Neue, sans-serif !important;
   // 图标尺寸
   --icon-size-s: 12px;

package/packages/config/use/UseImg.js

@@ -24,6 +24,7 @@ var UseImg = /** @class */ (function () {
         componentConfig_1["default"].Vue.nextTick(function () {
             _this.dynamicMount = new DynamicMountClass_1["default"]({
                 componentProps: {
+                    value: true,
                     urlList: list,
                     onClose: function () {
                         _this.destroy();

package/packages/config/use/UseImg.ts

@@ -18,6 +18,7 @@ class UseImg implements UserImgInterface {
         componentConfig.Vue.nextTick(() => {
             this.dynamicMount = new DynamicMount({
                 componentProps: {
+                    value:true,
                     urlList: list,
                     onClose: () => {
                         this.destroy();

package/packages/utils/upload.js

@@ -1,87 +1,76 @@
 import axios from "axios";
 import uploadRequest from "../config/uploadRequest";
 import componentConfig from "../config/componentConfig";
-import { v4 } from "uuid";
+import {v4} from "uuid";
+import {fileSuffix} from "./utils";
 
 // state  0是未开始  1是已完成 2是以失败
 class Upload {
-  constructor(config) {
-    this.file = config.file;
-    this.state = 0;
-    this.url = componentConfig.uploadUrl;
-    this.cancelToken = axios.CancelToken.source();
-    this.uploadProgressFn = config.uploadProgressFn
-      ? config.uploadProgressFn
-      : () => {};
-  }
+    constructor(config) {
+        this.file = config.file;
+        this.state = 0;
+        this.url = componentConfig.uploadUrl;
+        this.cancelToken = axios.CancelToken.source();
+        this.uploadProgressFn = config.uploadProgressFn ? config.uploadProgressFn : () => {
+        };
+    }
 
-  async start(isOss) {
-    return new Promise(async (resolve, reject) => {
-      let params = new FormData();
+    async start(isOss) {
+        return new Promise(async (resolve, reject) => {
+            let params = new FormData();
 
-      if (isOss) {
-        try {
-          const v4Id = v4();
-          const fileName = `${v4Id}-${this.file.name}`;
-          let { accessKeyId, signature, host, policy, dir } =
-            await this.getOssParams();
-          params.append("OSSAccessKeyId", `${accessKeyId}`);
-          params.append("signature", `${signature}`);
-          params.append("policy", `${policy}`);
-          params.append("key", `${dir}${fileName}`);
-          params.append("url", `${host}`);
-          params.append("success_action_status", "200");
-          // 文件必须最后面，否则报错
-          params.append(
-            "file",
-            new File([this.file], fileName, {
-              type: "application/octet-stream",
-            })
-          );
-        } catch (error) {
-          reject("oss参数获取错误");
-        }
-      } else {
-        params.append("file", this.file);
-        params.append("url", this.url);
-      }
+            if (isOss) {
+                try {
+                    const v4Id = v4();
+                        const fileName = `${v4Id}${new Date().valueOf()  }.${fileSuffix(this.file.name)}`;
+                    let {accessKeyId, signature, host, policy, dir} = await this.getOssParams();
+                    params.append("OSSAccessKeyId", `${accessKeyId}`);
+                    params.append("signature", `${signature}`);
+                    params.append("policy", `${policy}`);
+                    params.append("key", `${dir}${fileName}`);
+                    params.append("url", `${host}`);
+                    params.append("success_action_status", "200");
+                    // 文件必须最后面，否则报错
+                    params.append("file", new File([this.file], fileName, {
+                        type: "application/octet-stream",
+                    }));
+                } catch (error) {
+                    reject("oss参数获取错误");
+                }
+            } else {
+                params.append("file", this.file);
+                params.append("url", this.url);
+            }
 
-      try {
-        let uploadEdUrl = await uploadRequest(
-          params,
-          this.uploadProgressFn,
-          this.cancelToken,
-          isOss
-        );
-        this.state = 1;
-        resolve(uploadEdUrl);
-      } catch (error) {
-        this.state = 2;
-        reject(error);
-      } finally {
-      }
-    });
-  }
+            try {
+                let uploadEdUrl = await uploadRequest(params, this.uploadProgressFn, this.cancelToken, isOss);
+                this.state = 1;
+                resolve(uploadEdUrl);
+            } catch (error) {
+                this.state = 2;
+                reject(error);
+            } finally {
+            }
+        });
+    }
 
-  cancel() {
-    this.cancelToken.cancel("取消接口");
-  }
+    cancel() {
+        this.cancelToken.cancel("取消接口");
+    }
 
-  async getOssParams() {
-    // 获取时间
-    const date = new Date();
-    let time = `${date.getFullYear()}${date.getMonth() + 1}${date.getDate()}`;
-    this.url = `${componentConfig.uploadUrl}/${time}/`;
+    async getOssParams() {
+        // 获取时间
+        const date = new Date();
+        let time = `${date.getFullYear()}${date.getMonth() + 1}${date.getDate()}`;
+        this.url = `${componentConfig.uploadUrl}/${time}/`;
 
-    // 调用获取oss参数的地址
-    return await window.meixiRequest({
-      url: "files/osssource/common/oss/policy",
-      method: "post",
-      params: {
-        filepath: this.url,
-      },
-    });
-  }
+        // 调用获取oss参数的地址
+        return await window.meixiRequest({
+            url: "files/osssource/common/oss/policy", method: "post", params: {
+                filepath: this.url,
+            },
+        });
+    }
 }
 
 export default Upload;