meixioacomponent 2.0.43 → 2.0.45

package/package.json

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

package/packages/components/base/baseInput/baseInput.vue

@@ -0,0 +1,98 @@
+<template>
+  <div class="base_input-wrap">
+    <t-input
+        v-model="module"
+        :clearable="clearable"
+        :readonly="readonly"
+        :maxlength="maxlength"
+        :size="size"
+        :disabled="disabled"
+        :placeholder="placeholder"
+        @change="onChange"
+        @blur="onBlur"
+        @focus="onFocus"
+        @input="onInput"
+        @clear="onClear"
+        @enter="onEnter"
+    />
+  </div>
+</template>
+
+
+<script>
+import {defineComponent} from 'vue'
+
+export default defineComponent({
+  name: "baseInput",
+  props: {
+    placeholder: {
+      type: String,
+      default: '请输入内容'
+    },
+    value: {
+      type: String,
+      default: '',
+      required: true
+    },
+    size: {
+      type: String,
+      default: 'mini'
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    maxlength: {
+      type: Number,
+    },
+    clearable: {
+      type: Boolean,
+      default: false,
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: {
+    computed: {
+      module: {
+        set(val) {
+          this.$emit('input', val);
+        },
+        get() {
+          return this.$props.value
+        }
+      }
+    },
+  },
+
+  methods: {
+    onBlur() {
+      this.$emit('blur')
+    },
+    onFocus() {
+      this.$emit('focus')
+    },
+    onChange() {
+      this.$emit('change')
+    },
+    onInput() {
+      this.$emit('input')
+    },
+    onClear() {
+      this.$emit('clear')
+    },
+    onEnter(event) {
+      this.$emit('enter', event);
+    }
+  }
+})
+</script>
+<style scoped lang="less">
+.base_input-wrap {
+  width: auto;
+  height: auto;
+}
+</style>
+

package/packages/components/base/baseSelect/baseSelect.vue

@@ -0,0 +1,102 @@
+
+
+<template>
+  <div class="base_select-wrap">
+
+    <t-select v-model="value"
+               :clearable="clearable"
+               @change="onChange"
+               @clear="onClear"
+               @blur="onBlur"
+               @focus="onFocus"
+               @visible-change="onVisibleChange"
+               :multiple="multiple" :placeholder="placeholder" :disabled="disabled" :size="size">
+      <t-option v-for="(item,index) in options" :key="index" :label="labelKey" :value="valueKey"></t-option>
+    </t-select>
+
+  </div>
+
+</template>
+
+<script>
+import {defineComponent} from 'vue'
+export default defineComponent({
+  name: "baseSelect",
+  props: {
+    multiple: {
+      type: Boolean,
+      default: false,
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    value: {},
+    size: {
+      type: String,
+      default: 'small'
+    },
+    clearable: {
+      type: Boolean,
+      default: false,
+    },
+    placeholder: {
+      type: String,
+      default: '请选择'
+    },
+    options: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    valueKey: {
+      type: String,
+      default: 'value'
+    },
+    labelKey: {
+      type: String,
+      default: 'label'
+    }
+  },
+  computed: {
+    module: {
+      set(val) {
+        this.$emit('input', val);
+      },
+      get() {
+        return this.$props.value
+      }
+    }
+
+  },
+  methods: {
+    onChange(event) {
+      this.$emit('change', event);
+    },
+    onClear(event) {
+      this.$emit('clear', event);
+    },
+    onBlur(event) {
+      this.$emit('blur', event);
+    },
+    onFocus(event) {
+      this.$emit('focus', event);
+    },
+    onVisibleChange(value) {
+      this.$emit('visible-change', value);
+    }
+  }
+})
+</script>
+
+
+
+<style scoped lang="less">
+.base_select-wrap {
+  width: auto;
+  height: auto;
+}
+</style>
+
+

package/packages/components/base/baseSelect/index.js

@@ -0,0 +1,6 @@
+import baseSelect from "./baseSection.vue";
+
+baseSelect.install = function (Vue) {
+    Vue.component(baseSelect.name, baseSelect);
+};
+export default baseSelect;

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

@@ -10,8 +10,21 @@
       {{ filterContent() }}
     </div>
     <div v-else-if="type==='money'" :class="[type]">
-      <t-statistic :value="parseFloat(content)" prefix="￥" trend="increase"/>
+      <t-statistic
+          :value="parseFloat(content)" prefix="￥" trend="increase"/>
     </div>
+
+    <div v-else-if="type==='money+'" :class="[type]">
+      <t-statistic
+          :color="parseFloat(content)>0?'var(--color-error)': 'var(--font-color-d)'"
+          :value="parseFloat(content)" prefix="￥" trend="increase"/>
+    </div>
+    <div v-else-if="type==='money-'" :class="[type]">
+      <t-statistic
+          :color="parseFloat(content)<0?'var(--color-success)':'var(--font-color-d)'"
+          :value="parseFloat(content)" prefix="￥" trend="increase"/>
+    </div>
+
     <div v-else-if="type==='number'" :class="[type]">
       {{ filterContent() }}
     </div>
@@ -19,13 +32,8 @@
     <div v-else class="default">
       {{ filterContent() }}
     </div>
-
   </div>
-
-
   <div v-else class="empty">暂无数据</div>
-
-
 </template>
 
 
@@ -150,11 +158,11 @@ export default {
     justify-content: flex-start;
   }
 
-  .time, .number, .money {
+  .time, .number, .money, .money +, .money- {
     font-family: TCloudNumber !important;
   }
 
-  .money {
+  .money, .money +, .money- {
     font-weight: var(--font-weight-kg);
   }
 

package/packages/components/base/baseTimeRangePicker/baseTimeRangePicker.vue

@@ -0,0 +1,60 @@
+<template>
+  <div class="base_time_range_picker-wrap">
+    <t-date-range-picker
+        ref="baseTimeRangePickerContentRef"
+        v-model="module" v-bind="$attrs"
+        @change="onChange"
+        @focus="onFocus"
+        @blur="onblur"
+    ></t-date-range-picker>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "baseTimeRangePicker",
+  data() {
+    return {}
+  },
+  computed: {
+    module: {
+      set(val) {
+        this.$emit('input', val);
+      },
+      get() {
+        return this.$props.value
+      }
+    }
+  },
+  props: {
+    value: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  methods: {
+    onChange(value) {
+      this.$emit('change', value);
+    },
+    onFocus(value) {
+      this.$emit('focus', value);
+    },
+    onblur(value) {
+      this.$emit('blur', value);
+    }
+
+  }
+}
+</script>
+
+
+<style scoped lang="less">
+.base_time_range_picker-wrap {
+  width: auto;
+  height: auto;
+}
+
+</style>

package/packages/components/base/baseTimeRangePicker/index.js

@@ -0,0 +1,7 @@
+import baseTimeRangePicker from "./baseTimeRangePicker.vue";
+
+baseTimeRangePicker.install = function (Vue) {
+    Vue.component(baseTimeRangePicker.name, baseTimeRangePicker);
+};
+
+export default baseTimeRangePicker;

package/packages/components/base/baseTimeTypeSelect/base_time_type_select.vue

@@ -1,5 +1,5 @@
 <template>
-  <t-popup v-model="isOpen" ref="popover" placement="bottom" trigger="click" @visible-change="visibleChange">
+  <t-popup placement="bottom" trigger="click" @visible-change="visibleChange">
     <template #content>
       <div class="time-type-select-content">
         <div class="content-line-wrap">
@@ -27,7 +27,6 @@
             <t-date-range-picker
                 v-model="timeModule"
                 size="medium"
-                enable-time-picker=""
                 :clearable="true"
                 style="width: 100%; margin-top: var(--margin-4)"
                 valueType="time-stamp"
@@ -70,11 +69,13 @@
 
 <script>
 import baseButtonHandle from "../baseButtonHandle/baseButtonHandle.vue";
+import tDateRangePicker from "../tDateRangePicker/tDateRangePicker.vue"
 import {TimeIcon} from "tdesign-icons-vue"
 //
 import {baseTimeTypeConfig} from "./config";
 import {FilterTime} from "../../../utils/utils";
 
+
 export default {
   name: "baseTimeTypeSelect",
   data() {
@@ -116,7 +117,8 @@ export default {
   },
   components: {
     baseButtonHandle,
-    TimeIcon
+    TimeIcon,
+    tDateRangePicker
   },
   computed: {
     module: {
@@ -183,18 +185,18 @@ export default {
         this.timeModule = renderTime;
       }
     },
-
     doClose() {
       this.isOpen = false;
     },
-
     eventHide() {
       this.isOpen = false;
     },
 
     visibleChange(visible) {
       if (visible) {
-        this.eventShow()
+        this.$nextTick(() => {
+          this.eventShow();
+        })
       } else {
         this.eventHide();
       }
@@ -208,6 +210,8 @@ export default {
 
       if ((Array.isArray(_timeModule) && _timeModule?.length >= 1)) {
         this.module = _timeModule;
+      } else {
+        this.module = [];
       }
       if (_selectLineItem) {
         this.module = _selectLineItem;
@@ -272,7 +276,7 @@ export default {
 
   .content-line-wrap {
     box-sizing: border-box;
-    padding: var(--padding-5) 0px;
+    padding: var(--padding-5) 0;
 
     .content-line {
       width: 100%;

package/packages/components/base/baseUpload/mixins.js

@@ -65,6 +65,7 @@ export const baseUploadMixins = {
     },
 
     async uploadEd(evt) {
+      console.log('uploadEd',evt);
       let filterList = [];
       let callBackParams = null;
       try {

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

@@ -204,7 +204,6 @@ export default {
       })
     },
     uploadEd(evt) {
-
       this.stepActive = 2
       if (evt instanceof Array) {
         const {url} = evt[0]

package/packages/components/base/tDateRangePicker/index.js

@@ -0,0 +1,6 @@
+import tDateRangePicker from "./tDateRangePicker.vue"
+
+tDateRangePicker.install = function (Vue) {
+    Vue.component(tDateRangePicker.name, tDateRangePicker)
+}
+export default tDateRangePicker

package/packages/components/base/tDateRangePicker/tDateRangePicker.vue

@@ -0,0 +1,96 @@
+<template>
+  <date-range-picker v-model="module"
+                     v-bind="$attrs"
+                     @blur="onBlur"
+                     @change="onChange"
+                     @confirm="onConfirm"
+                     @focus="onFocus"
+                     @input="onInput"
+                     @pick="onPick"
+                     @preset-click="onPresetClick"
+                     :presets="computedPresets"/>
+</template>
+
+
+<script>
+
+
+export default {
+  name: "tDateRangePicker",
+  data() {
+    return {}
+  },
+  props: {
+    value: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  components: {},
+  created() {
+  },
+  computed: {
+    module: {
+      set(val) {
+        this.$emit('input', val);
+      },
+      get() {
+        return this.$props.value;
+      }
+    },
+    computedPresets() {
+      const now = {
+        '此刻': () => {
+          if (this.$attrs['valueType'] === 'time-stamp') {
+            return [new Date().valueOf(), new Date().valueOf()]
+          }
+          return [new Date(), new Date()];
+        }
+      }
+      if (this.$attrs[`presets`] && typeof this.$attrs[`presets`] === 'object') {
+        return {
+          ...this.$attrs['presets'],
+          ...now,
+        }
+      } else {
+        return {
+          ...now
+        }
+      }
+    }
+  },
+  methods: {
+    onBlur(event) {
+      this.$emit('blur', event);
+    },
+    onChange(event) {
+      this.$emit('change', event);
+    },
+    onConfirm(event) {
+      this.$emit('confirm', event);
+    },
+    onFocus(event) {
+      this.$emit('focus', event);
+    },
+    onInput(event) {
+      this.$emit('input', event);
+    },
+    onPick(event) {
+      this.$emit('pick', event);
+    },
+    onPresetClick(event) {
+      this.$emit('preset-click', event);
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.t_date_range_picker-wrap {
+  width: auto;
+  height: auto;
+}
+
+</style>

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

@@ -23,10 +23,10 @@
     </div>
     <div class="upload-content">
       <uploadItemVue
-        v-for="(item, index) in filterArray"
-        :key="index"
-        :item="item"
-        @deleteAppendixItem="deleteAppendixItem"
+          v-for="(item, index) in filterArray"
+          :key="index"
+          :item="item"
+          @deleteAppendixItem="deleteAppendixItem"
       ></uploadItemVue>
     </div>
   </div>
@@ -36,7 +36,7 @@
 import uploadItemVue from "./uploadItem.vue";
 //
 import Upload from "../../../utils/upload";
-import {ArrowDownIcon,ArrowUpIcon,CloseIcon} from "tdesign-icons-vue"
+import {ArrowDownIcon, ArrowUpIcon, CloseIcon} from "tdesign-icons-vue"
 
 export default {
   name: "upload",
@@ -89,13 +89,13 @@ export default {
     completed() {
       let uploadArray = this.uploadArray;
       return (
-        uploadArray?.filter((item) => {
-          return item.process === 100;
-        }).length / uploadArray?.length
+          uploadArray?.filter((item) => {
+            return item.process === 100;
+          }).length / uploadArray?.length
       );
     },
     totalStyle() {
-      return { width: `${this.completed * 100}%` };
+      return {width: `${this.completed * 100}%`};
     },
   },
   methods: {
@@ -139,27 +139,26 @@ export default {
         }
 
         this.$set(
-          uploadItem,
-          "upload",
-          new Upload({
-            file: uploadItem.file,
-            uploadProgressFn: (process) => {
-              uploadItem.process = process;
-            },
-          })
+            uploadItem,
+            "upload",
+            new Upload({
+              file: uploadItem.file,
+              uploadProgressFn: (process) => {
+                uploadItem.process = process;
+              },
+            })
         );
 
         uploadItem.upload
-          .start(this.$props.isOss)
-          .then((uploadEdUrl) => {
-            this.$set(uploadItem, "url", uploadEdUrl);
-
-            this.uploadEd();
-          })
-          .catch((error) => {
-            this.$set(uploadItem, "url", "cancel");
-            this.uploadEd(error);
-          });
+            .start(this.$props.isOss)
+            .then((uploadEdUrl) => {
+              this.$set(uploadItem, "url", uploadEdUrl);
+              this.uploadEd();
+            })
+            .catch((error) => {
+              this.$set(uploadItem, "url", "cancel");
+              this.uploadEd(error);
+            });
       }
     },
 
@@ -174,21 +173,22 @@ export default {
           cancelButtonText: "取消",
           type: "warning",
         })
-          .then(() => {
-            this.uploadArray.forEach((item) => {
-              if (item.upload?.state === 0) {
-                item.upload.cancel();
-              }
+            .then(() => {
+              this.uploadArray.forEach((item) => {
+                if (item.upload?.state === 0) {
+                  item.upload.cancel();
+                }
+              });
+              this.uploadEd();
+            })
+            .catch(() => {
             });
-            this.uploadEd();
-          })
-          .catch(() => {});
       } else {
         this.uploadEd();
       }
     },
 
-    judgeUploadMapItemUploaded() {
+    judgeUploadMapItemUploaded(statusOfError = false) {
       this.uploadArrayMap.forEach((value, key) => {
         let uploadArr = this.uploadArrayMap.get(key);
 
@@ -197,14 +197,14 @@ export default {
         });
         // 判断群组是否上传了 只需要执行数组的第一个就行了
         if (flag) {
-          uploadArr[0]?.cb(uploadArr);
+          uploadArr[0]?.cb(statusOfError ? statusOfError : uploadArr);
         }
       });
     },
 
     uploadEd(statusOfError = false) {
       let uploadArray = this.uploadArray;
-      this.judgeUploadMapItemUploaded();
+      this.judgeUploadMapItemUploaded(statusOfError);
       let flag = uploadArray.every((item) => {
         return !item.upload || item.upload.state !== 0 || item.url === "cancel";
       });
@@ -216,7 +216,7 @@ export default {
           });
 
           this.$props.uploadEdEvent(
-            statusOfError ? statusOfError : uploadArray
+              statusOfError ? statusOfError : uploadArray
           );
         }
       }
@@ -228,12 +228,13 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       })
-        .then(() => {
-          if (item.upload?.state === 0) {
-            item.upload.cancel();
-          }
-        })
-        .catch(() => {});
+          .then(() => {
+            if (item.upload?.state === 0) {
+              item.upload.cancel();
+            }
+          })
+          .catch(() => {
+          });
     },
 
     uploadFailed() {