meixioacomponent 2.0.31 → 2.0.33

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

@@ -1,5 +1,5 @@
 <template>
-  <div :class="[ 'base-text-wrap' ]" v-if="content" :title="content" @click="onClick">
+  <div :class="[ 'base-text-wrap',type ]" v-if="content" :title="content" @click="onClick">
     <div v-if="type==='phone'" :class="['content-wrap',type]">
       <MobileIcon style="margin-right: var(--margin-2)"></MobileIcon>
       {{ content }}
@@ -9,7 +9,7 @@
       {{ filterContent() }}
     </div>
     <div v-else-if="type==='money'" :class="[type]">
-      <t-statistic :value="content" prefix="￥" trend="increase"/>
+      <t-statistic :value="parseFloat(content)" prefix="￥" trend="increase"/>
     </div>
     <div v-else-if="type==='number'" :class="[type]">
       {{ filterContent() }}
@@ -136,6 +136,12 @@ export default {
   width: fit-content;
   font-size: var(--font-size-base);
 
+  .default{
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+
   .content-wrap {
     display: flex;
     align-items: center;
@@ -163,6 +169,18 @@ export default {
 
 }
 
+.handle {
+  color: var(--color-primary) !important;
+  font-size: var(--font-size-base) !important;
+  cursor: pointer;
+
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
+
+
 .empty {
   color: var(--font-color-ds);
   font-size: var(--font-size-s);

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

@@ -6,15 +6,24 @@
       :multiple="multiple"
       :keys="{
         value:nodeKey,
-        ...props
+        ...treeProps
       }"
       :clearable="true"
       :placeholder="placeholder"
       :data="data"
+      :size="componentSize"
+      :tree-props="{
+        expandParent:true,
+         expandAll: true,
+        expandOnClickNode:true,
+        valueMode: onlyLeaf?'onlyLeaf':'all'
+      }"
   ></t-tree-select>
 </template>
 
 <script>
+import {TransomComponentSize} from "../../../utils/utils";
+
 export default {
   name: 'baseTreeSelect',
 
@@ -48,7 +57,7 @@ export default {
       default: 'id',
     },
     // tree的props配置
-    props: {
+    treeProps: {
       type: Object,
       default: function () {
         return {
@@ -85,34 +94,35 @@ export default {
     size: {
       type: String,
       default: 'mini'
+    },
+    onlyLeaf: {
+      type: Boolean,
+      default: true
     }
   },
   computed: {
     label() {
       return this.$props.props.label
     },
-    module:{
-      set(val){
-        this.$emit('input',val);
+    module: {
+      set(val) {
+        this.$emit('input', val);
       },
-      get(){
+      get() {
         return this.$props.value
       }
+    },
+    componentSize(){
+      return TransomComponentSize(this.$props.size);
     }
   },
-  methods: {
-
-  },
+  methods: {},
   watch: {
     value: function (val) {
-      if (!this.isEmpty(this.data)) {
-        this.init(val)
-      }
+
     },
     data: function (val) {
-      if (!this.isEmpty(val)) {
-        this.init(this.value)
-      }
+
     },
   },
 }

package/packages/components/base/baseUpload/baseUpload.vue

@@ -34,7 +34,6 @@
               :key="index"
               :item="item"
               :type="`appendix`"
-              style="margin: var(--margin-4);"
               @deleteAppendixItem="handleDeleteUploadItem(index)"
           ></uploadItemVue>
         </draggable>

package/packages/components/base/baseUpload/baseUploadItem.vue

@@ -38,13 +38,12 @@
     <div v-if="uploadedValue" class="type-pre-views">
       <div
           v-if="fileType === 'img' || fileType === 'video'"
-          style="width: 100%; height: 100%"
+          style="width: 100%; height: 100%;position: relative"
       >
         <div v-if="!disabled" class="handleUploadItem">
           <t-button shape="square" variant="outline" @click="handleDeleteUploadItem">
             <template #icon>
-              <CloseIcon
-              ></CloseIcon>
+              <t-icon name="delete"></t-icon>
             </template>
           </t-button>
 
@@ -495,16 +494,10 @@ export default {
       top: 0;
       right: 0;
       z-index: 2;
-      width: auto;
-      height: auto;
       display: none;
       position: absolute;
       border-radius: var(--radius);
       background: rgba(0, 0, 0, 0.3);
-
-      /deep/ i {
-        color: var(--text-white) !important;
-      }
     }
   }
 }

package/packages/components/base/baseUpload/uploadMediaView.vue

@@ -3,7 +3,9 @@
     <base-img v-if="type == 'img'" :src="resource" :event="true" :fit="`contain`"></base-img>
     <base-video v-if="type == 'video'" :resource="resource"></base-video>
     <!-- 删除icon -->
-    <t-button shape="square" variant="outline" @click="handleDeleteUploadItem" v-if="!disabled">
+    <t-button
+        class="handleUploadItem"
+        shape="square" variant="outline" @click="handleDeleteUploadItem" v-if="!disabled">
       <template #icon>
         <close-icon
             @click="handleDeleteUploadItem"
@@ -78,20 +80,12 @@ export default {
   }
 
   .handleUploadItem {
-    top: 0px;
+    top: 0;
     z-index: 2;
-    right: 0px;
-    z-index: 2;
-    width: auto;
-    height: auto;
+    right: 0;
     display: none;
     position: absolute;
-    border-radius: var(--radius);
     background: rgba(0, 0, 0, 0.3);
-
-    /deep/ i {
-      color: var(--text-white) !important;
-    }
   }
 }
 </style>

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

@@ -7,7 +7,7 @@
       :isDestroy="true"
       :modal="true"
       :title="`批量上传`"
-      :width="`600px`"
+      :width="`700px`"
       @destroy="destroy"
   >
     <div slot="dialog-content" class="dialog-content">
@@ -42,9 +42,9 @@
               v-model="fileName"
               :disabled="true"
               size="small"
-              style="margin-right: var(--margin-4);"
+              style="width: fit-content;margin-right: var(--margin-4);"
           ></t-input>
-          <base-button size="mini" type="primary" @click="onHandleFile">
+          <base-button style="width: fit-content" size="mini" type="primary" @click="onHandleFile">
             选择文件
           </base-button>
 
@@ -88,7 +88,7 @@
     <base-button-handle
         slot="dialog-footer"
         :config="buttonConfig"
-        :size="`mini`"
+        :size="`small`"
     ></base-button-handle>
   </base-dialog>
 </template>
@@ -169,6 +169,7 @@ export default {
         {
           type: 'info',
           text: '取消',
+          icon: 'close',
           disabled: this.stepActive == 1 ? true : false,
           click: () => {
             this.$refs.dialog.closeDialog()
@@ -176,6 +177,7 @@ export default {
         },
         {
           type: 'primary',
+          icon: 'check',
           disabled: this.stepActive == 1 || !this.fileName ? true : false,
           text: this.stepActive == 0 ? '导入文件' : '确定',
           click: () => {

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

@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import useWait from "../../../config/use/useWait";
+import useWait from "../../../config/use/UseWait";
 
 export default {
   name: "baseWait",

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

@@ -16,26 +16,28 @@
     </div>
 
     <div class="item-status">
-      <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>
+      <t-space :size="4">
+        <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>
+      </t-space>
     </div>
   </div>
 </template>
@@ -118,7 +120,7 @@ export default {
   align-items: center;
   flex-flow: row nowrap;
   justify-content: space-between;
-  margin: var(--margin-4) 0px;
+  margin: var(--margin-4) 0;
   border-radius: calc(var(--radius) * 2);
 
   .item-wrap-prefix {
@@ -131,7 +133,7 @@ export default {
 
   .item-type,
   .item-status {
-    width: 40px;
+    width: 60px;
     height: 100%;
     display: flex;
     align-items: center;
@@ -196,7 +198,7 @@ export default {
   background: var(--color-gray-m);
 
   .item-content {
-    width: calc(100% - 40px) !important;
+    width: calc(100% - 60px) !important;
 
     .item-name {
       max-width: 80%;

package/packages/components/index.js

@@ -58,7 +58,7 @@ var componentConfig_1 = require("../config/componentConfig");
 var DynamicMountClass_1 = require("./dynamicmount/DynamicMountClass");
 var SelectStore_1 = require("../config/selectStore/SelectStore");
 //
-var useWait_1 = require("../config/use/useWait");
+var UseWait_1 = require("../config/use/UseWait");
 var UseImg_1 = require("../config/use/UseImg");
 var useDrag_1 = require("../config/use/useDrag");
 var UseResize_1 = require("../config/use/UseResize");
@@ -72,6 +72,9 @@ require("tdesign-vue/es/style/index.css");
 //组件库type类型
 var useType_1 = require("../useType/useType");
 var ProTableLocalConfigManage_1 = require("../config/ProTableLocalConfigManage/ProTableLocalConfigManage");
+var executeConfirm_1 = require("../config/use/useConfirm/executeConfirm");
+var registerConfirm_1 = require("../config/use/useConfirm/registerConfirm");
+var UseNotify_1 = require("../config/use/useConfirm/UseNotify");
 var meixicomponents = [
     baseAnchor_1["default"],
     baseAppendix_1["default"],
@@ -131,6 +134,7 @@ var install = function (Vue) {
     });
     Vue.use(dynamicmount_1["default"]);
     Vue.use(vue_cropper_1["default"]);
+    Vue.use(registerConfirm_1["default"]);
     window["meixiComponentPlugin"] = {
         SelectStore: SelectStore_1["default"],
         UseDrag: useDrag_1["default"],
@@ -209,12 +213,18 @@ var meixioacomponent = {
     useViewVideo: UseViewVideo_1["default"],
     useGuide: UseGuide_1["default"],
     DynamicMountClass: DynamicMountClass_1["default"],
-    useWait: useWait_1["default"],
+    useWait: UseWait_1["default"],
     LinkViewClass: LinkViewClass_1["default"],
     //type 类型
     useTableColumnParamsType: useType_1.useTableColumnParamsType,
     useFormItemParamsType: useType_1.useFormItemParamsType,
-    useProScreenParamsItem: useType_1.useProScreenParamsItem
+    useProScreenParamsItem: useType_1.useProScreenParamsItem,
+    useConfirm: function (body, title, options) {
+        return (0, executeConfirm_1.executeConfirm)(body, title, options);
+    },
+    useNotify: function (type, options) {
+        return new UseNotify_1["default"]().toMountedConfirm(type, options);
+    }
 };
 window["meixioacomponent"] = meixioacomponent;
 exports["default"] = meixioacomponent;

package/packages/components/index.ts

@@ -57,7 +57,7 @@ import componentConfig from "../config/componentConfig";
 import DynamicMountClass from "./dynamicmount/DynamicMountClass";
 import SelectStore from "../config/selectStore/SelectStore";
 //
-import useWait from "../config/use/useWait";
+import useWait from "../config/use/UseWait";
 import useImg from "../config/use/UseImg";
 import UseDrag from "../config/use/useDrag";
 import UseResize from "../config/use/UseResize";
@@ -73,6 +73,10 @@ import 'tdesign-vue/es/style/index.css';
 //组件库type类型
 import {useFormItemParamsType, useProScreenParamsItem, useTableColumnParamsType,} from "../useType/useType";
 import proTableLocalConfigManage from "../config/ProTableLocalConfigManage/ProTableLocalConfigManage";
+import {TypeByConfirmOptions, TypeByNotifyOptions, TypeByTheme} from "../typings/type";
+import {executeConfirm} from "../config/use/useConfirm/executeConfirm";
+import registerConfirm from "../config/use/useConfirm/registerConfirm";
+import UseNotify from "../config/use/useConfirm/UseNotify";
 
 
 const meixicomponents: any[] = [
@@ -136,6 +140,7 @@ const install = (Vue) => {
 
     Vue.use(DynamicMount);
     Vue.use(VueCropper);
+    Vue.use(registerConfirm);
     window[`meixiComponentPlugin`] = {
         SelectStore: SelectStore,
         UseDrag: UseDrag,
@@ -223,6 +228,12 @@ const meixioacomponent = {
     useTableColumnParamsType,
     useFormItemParamsType,
     useProScreenParamsItem,
+    useConfirm: (body: string, title: string, options: TypeByConfirmOptions) => {
+        return executeConfirm(body, title, options);
+    },
+        useNotify: (type: TypeByTheme, options: TypeByNotifyOptions) => {
+        return new UseNotify().toMountedConfirm(type, options)
+    }
 };
 
 window[`meixioacomponent`] = meixioacomponent;

package/packages/components/mixins/tableSectionMixins.js

@@ -58,9 +58,10 @@ export const tableSectionMixins = {
         onTableDataChange(tableData) {
             const {rowKey} = this;
             let value = null;
-            if (this.name === "baseProTable") {
+            const name = this.name
+            if (name === "baseProTable") {
                 value = this.$props.tableCheckboxConfig.value || []
-            } else if (this.name === "basePlainTable") {
+            } else if (name === "basePlainTable") {
                 value = this.checkValue || []
             }
 
@@ -76,7 +77,9 @@ export const tableSectionMixins = {
                         }
                     })
                     if (index > -1) {
-                        this.$refs.elTable.toggleRowSelection(tableData[index], true);
+                        if(name==='baseProTable'){
+                            this.$refs.elTable.toggleRowSelection(tableData[index], true);
+                        }
                     }
                 })
 

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

@@ -73,6 +73,7 @@
 <script>
 import pro_formVue from '../proForm/pro_form.vue'
 import baseButtonHandleVue from '../../base/baseButtonHandle/baseButtonHandle.vue'
+import UseConfirm from "../../../config/use/useConfirm/UseConfirm";
 
 export default {
   name: 'baseDialogForm',
@@ -174,9 +175,11 @@ export default {
       default: '加载中，请稍后。。。'
     },
     hasIconClose: {
-
       type: Boolean, default: true,
-
+    },
+    noticeText: {
+      type: String,
+      default: '是否关闭该弹窗'
     }
   },
   components: {
@@ -286,23 +289,20 @@ export default {
     },
 
     beforeClose(done) {
-      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();
-        },
-      });
+
+      new UseConfirm().toMountedConfirm(this.$props.noticeText, '关闭对话框', {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定'
+      }).then(() => {
+        if (done) {
+          done();
+        } else {
+          this.$refs.dialog.closeDialog();
+        }
+      }).catch(() => {
+
+      })
+
 
     }
   },

package/packages/components/proForm/proForm/proFormItem/pro_form_item.vue

@@ -24,7 +24,8 @@
 
         <!-- 单选框 -->
 
-        <base-toggle v-if="config.type === 'radio'" v-model="module" :disabled="true" :size="size" :toggle-color="[
+        <base-toggle v-if="config.type === 'radio'" v-model="module" :disabled="true" :size="componentSize"
+                     :toggle-color="[
           'var(--color-primary)'
       ]" :toggle-list="config.list"></base-toggle>
 
@@ -36,9 +37,10 @@
             :autosize="{ minRows: config.rows}"
             :size="componentSize"
             :disabled="disabled"
+            :maxlength="config.max"
         ></t-textarea>
 
-        <t-button shape="square" variant="outline"    v-show="!isEdit && !isDisabled" @click="handleClick('edit')">
+        <t-button shape="square" variant="outline" v-show="!isEdit && !isDisabled" @click="handleClick('edit')">
           <template #icon>
             <edit-icon></edit-icon>
           </template>
@@ -141,6 +143,7 @@
             :clearable="true"
             :size="componentSize"
             :disabled="isDisabled"
+            :presets="config.presets"
             style="width: 100%;height: 100%"
             value-type="time-stamp"
         />
@@ -153,6 +156,7 @@
             :clearable="true"
             :size="componentSize"
             :disabled="isDisabled"
+            :presets="config.presets"
             style="width: 100%;height: 100%"
             value-type="time-stamp"
         />
@@ -164,6 +168,7 @@
             :disabled="isDisabled"
             :placeholder="datePickPlace"
             style="width: 100%;height: 100%"
+            :presets="config.presets"
             value-type="time-stamp"
         />
 
@@ -176,6 +181,7 @@
             :disabled="isDisabled"
             :placeholder="datePickPlace"
             style="width: 100%;height: 100%"
+            :presets="config.presets"
             value-type="time-stamp"
         />
 
@@ -216,6 +222,7 @@
             :autosize="{ minRows: config.rows}"
             :size="componentSize"
             :disabled="disabled"
+            :maxlength="config.max"
         ></t-textarea>
 
       </div>
@@ -269,7 +276,7 @@
 <script>
 import BaseNumberInput from '../../../base/baseNumberInput/index.vue'
 import baseStoreSelect from '../../../base/baseStoreSelect/index.vue'
-import {CheckIcon, CloseIcon,EditIcon} from "tdesign-icons-vue"
+import {CheckIcon, CloseIcon, EditIcon} from "tdesign-icons-vue"
 //
 import {FilterTime, TransomComponentSize} from '../../../../utils/utils'
 import FormSingleUploadItem from "./proFormItem/formSingleUploadItem";
@@ -512,8 +519,9 @@ export default {
         if (value.toString().length <= 10) {
           return value * 1000
         }
+        return parseInt(value);
       }
-      return value
+      return null;
     },
 
     // 返回daterange的时间戳
@@ -551,7 +559,7 @@ export default {
       }
     },
   },
-  components: {FormSingleUploadItem, BaseNumberInput, baseStoreSelect, CheckIcon, CloseIcon,EditIcon},
+  components: {FormSingleUploadItem, BaseNumberInput, baseStoreSelect, CheckIcon, CloseIcon, EditIcon},
 }
 </script>
 
@@ -565,7 +573,7 @@ export default {
   align-items: flex-start;
   flex-flow: column nowrap;
   justify-content: flex-start;
-  padding: var(--margin-4);
+  //padding: var(--margin-4);
   border-radius: calc(var(--radius) * 2);
 
   .item-content-wrap {
@@ -770,5 +778,4 @@ export default {
 }
 
 
-
 </style>