meixioacomponent 2.0.32 → 2.0.33

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/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/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

@@ -78,7 +78,7 @@
             :maxlength="config.maxlength"
             :min="config.min"
             :placeholder="config.placeholder"
-            :size="componentSize"
+            :size="size"
             :style="{width:`${config.width? `${config.width}px`:'100%'}`}"
             :unit="config.unit"
             :use-string="true"
@@ -95,7 +95,7 @@
             :maxlength="config.maxlength"
             :min="config.min"
             :placeholder="config.placeholder"
-            :size="componentSize"
+            :size="size"
             :style="{width:`${config.width? `${config.width}px`:'100%'}`}"
             :unit="config.unit"
         ></BaseNumberInput>
@@ -112,7 +112,7 @@
             :min="config.min"
             :placeholder="config.placeholder"
             :precision="2"
-            :size="componentSize"
+            :size="size"
             :style="{width:`${config.width? `${config.width}px`:'100%'}`}"
             :unit="config.unit"
         ></BaseNumberInput>
@@ -143,6 +143,7 @@
             :clearable="true"
             :size="componentSize"
             :disabled="isDisabled"
+            :presets="config.presets"
             style="width: 100%;height: 100%"
             value-type="time-stamp"
         />
@@ -155,6 +156,7 @@
             :clearable="true"
             :size="componentSize"
             :disabled="isDisabled"
+            :presets="config.presets"
             style="width: 100%;height: 100%"
             value-type="time-stamp"
         />
@@ -166,6 +168,7 @@
             :disabled="isDisabled"
             :placeholder="datePickPlace"
             style="width: 100%;height: 100%"
+            :presets="config.presets"
             value-type="time-stamp"
         />
 
@@ -178,11 +181,12 @@
             :disabled="isDisabled"
             :placeholder="datePickPlace"
             style="width: 100%;height: 100%"
+            :presets="config.presets"
             value-type="time-stamp"
         />
 
         <!-- 单选框 -->
-        <base-toggle v-if="config.type === 'radio'" v-model="module" :disabled="isDisabled" :size="componentSize"
+        <base-toggle v-if="config.type === 'radio'" v-model="module" :disabled="isDisabled" :size="size"
                      :toggle-color="['var(--color-primary)']"
                      :toggle-list="config.list"></base-toggle>
         <!-- 选择器 -->
@@ -515,8 +519,9 @@ export default {
         if (value.toString().length <= 10) {
           return value * 1000
         }
+        return parseInt(value);
       }
-      return value
+      return null;
     },
 
     // 返回daterange的时间戳
@@ -568,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 {

package/packages/components/proForm/proForm/pro_form.vue

@@ -18,7 +18,7 @@
           :style="{
           width: itemWidth,
         }"
-          class="pro-form-item-content   "
+          class="pro-form-item-content"
       >
         <t-form-item
             v-if="formType !== 'template'"
@@ -250,7 +250,6 @@ export default {
 
     formdata() {
       let obj = {}
-      console.log(this.formType);
       this.module.forEach((item) => {
         if (!item.renderHide) {
           try {
@@ -364,13 +363,14 @@ export default {
     },
     // 重置表单的值
     reset() {
-      this.$refs.form.resetFields()
+      this.$refs.form.reset()
     },
 
     checkValidate() {
       return new Promise(async (resolve, reject) => {
 
         const res = await this.$refs.form.validate();
+        console.log(res);
 
         if (typeof res === 'boolean') {
           if (res) {
@@ -483,14 +483,12 @@ export default {
   width: 100%;
   height: auto;
 
-  .chunk-1 {
-
-    &:last-of-type {
-      /deep/ .el-form-item {
-        margin-bottom: 0 !important;
-      }
-    }
+  .pro-form-item-content {
+    padding: var(--padding-4);
+    box-sizing: border-box;
+  }
 
+  .chunk-1 {
   }
 
   .form-line-box {
@@ -519,8 +517,12 @@ export default {
     height: auto;
     display: flex;
     flex-flow: row wrap;
-    align-items: center;
+    align-items: flex-start;
     justify-content: flex-start;
+
+    .t-is-warning {
+      margin-bottom: calc(var(--margin-3) * 2);
+    }
   }
 
   /deep/ .t-form-item {
@@ -564,14 +566,7 @@ export default {
       font-size: var(--font-size-s) !important;
     }
 
-    /deep/ .el-form-item__label {
-      line-height: 24px !important;
-    }
 
-    /deep/ .el-form-item__error {
-      line-height: 0;
-      padding-top: 0;
-    }
   }
 
   .item-label-wrap {

package/packages/components/proPageTable/oaProTableSearch/oa_pro_screen_item.vue

@@ -100,9 +100,9 @@
             <close-icon></close-icon>
           </template>
         </t-button>
-        <el-checkbox v-model="item.exposed" :disabled="!item.key">
+        <t-checkbox v-model="item.exposed" :disabled="!item.key">
           外露
-        </el-checkbox>
+        </t-checkbox>
       </div>
     </div>
   </div>

package/packages/components/proPageTable/oa_pro_colum_config.vue

@@ -3,8 +3,7 @@
       v-model="popoverFlag"
       button-size="small"
       button-text="表格设置"
-      buttonIcon="el-icon-s-operation"
-      iconClass="element"
+      buttonIcon="setting-1"
       style="margin: 0 var(--margin-4)"
       @popoverShow="setDragConfigList"
   >
@@ -64,8 +63,7 @@
 
 <script>
 import baseButtonHandle from '../base/baseButtonHandle/baseButtonHandle.vue'
-import proTableLocalConfigManage from "../../config/ProTableLocalConfigManage/ProTableLocalConfigManage";
-import {DragMoveIcon} from"tdesign-icons-vue"
+import {DragMoveIcon} from "tdesign-icons-vue"
 
 export default {
   name: 'oaProColumConfig',

package/packages/components/proPageTable/oa_pro_table.vue

@@ -74,7 +74,7 @@
 
       <t-enhanced-table
           ref="enhancedTableRef"
-          row-key="key"
+          :row-key="rowKey"
           :expanded-row-keys="expandRowKeys"
           :columns="showTableHeader"
           :data="tableData"
@@ -86,15 +86,24 @@
           :expandIcon="useExpand"
           table-layout="fixed"
           :height="tableHeight"
-          :expanded-row="expandedRow"
+          :rowspan-and-colspan='rowspanAndColspan'
           :tree=" treeProps[`children`]? {
             childrenKey: treeProps[`children`],
             checkStrictly:  false
       }:null"
           :selected-row-keys="tableCheckboxConfig.value"
           @sort-change="sortChange"
+          @expand-change="rehandleExpandChange"
       >
 
+
+
+
+        <template #expanded-row="{row}" v-if="expandId">
+          <slot name="expandedRow" :scope="row"></slot>
+        </template>
+
+
         <!-- 表格暂无数据 -->
         <template slot="empty">
           <baseDefaultSvgVue
@@ -276,7 +285,7 @@ export default {
         sortBy: null,
         // 是否按照降序进行排序
         descending: false,
-      }
+      },
 
     };
   },
@@ -494,19 +503,23 @@ export default {
       type: String,
       default: ''
     },
+
     // 使用序号下标
     useIndex: {
       type: Boolean,
       default: false
     },
-    expandedRow: {
+
+    expandId:{
+      type:String,
+      default:null
+    },
+    rowspanAndColspan: {
       type: Function,
       default: () => {
-        return null;
+        return null
       }
     }
-
-
   },
   computed: {
     checkType() {
@@ -617,6 +630,9 @@ export default {
   },
   mixins: [tableSectionMixins],
   methods: {
+    rehandleExpandChange(value,params){
+      this.$emit('rehandleExpandChange',value)
+    },
     isToolTip(value) {
       if (!value) {
         return false;
@@ -887,8 +903,10 @@ export default {
       }
 
       result[`keyword`] = this.module;
-      result[`sortField`] = this.sort?.sortBy;
-      result[`sortOrder`] = this.sort?.descending ? 'desc' : 'asc';
+      if(this.sort.sortBy){
+        result[`sortField`] = this.sort?.sortBy;
+        result[`sortOrder`] = this.sort?.descending ? 'desc' : 'asc';
+      }
 
       // 高级筛选的结果
       const searchList = [];

package/packages/components/searchHeader/searchHeader.vue

@@ -20,18 +20,17 @@
           <span class="view-text">筛选：</span>
           <slot name="search-hearch-extend"></slot>
           <t-space :size="4">
-            <base-button
+            <t-tag
+                style="cursor: pointer"
                 v-for="(item, index) in searchList.list"
                 :key="index"
-                :class="{
-              'is-plain': index != searchList.index,
-            }"
-                size="mini"
-                :type="index == searchList.index ? 'primary' : 'info'"
+                variant="light"
+                size="small"
+                :theme="index === searchList.index ? 'primary' : 'default'"
                 @click="handleScreen(index)"
             >
               {{ item.label }}
-            </base-button>
+            </t-tag>
           </t-space>
         </div>
       </base-list>

package/packages/components/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;
+}