meixioacomponent 2.0.31 → 2.0.33

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;
+}

package/packages/components/style/tdesignStyle.less

@@ -1,13 +1,22 @@
-.t-drawer__content-wrapper{
+.t-drawer__content-wrapper {
   background: transparent !important;
 }
-.t-drawer{
+
+.t-drawer {
   box-shadow: none !important;
 }
-.t-drawer__body{
+
+.t-drawer__body {
   padding: 0 !important;
 }
 
-.t-list__inner{
+.t-list__inner {
   height: 100% !important;
 }
+
+
+.t-form__item  {
+  .t-is-error {
+    margin-bottom: var(--td-line-height-body-small) !important;
+  }
+}

package/packages/config/componentConfig.js

@@ -8,7 +8,7 @@ var LinkViewClass_1 = require("./LinkViewClass");
 var componentConfig = {
     store: {},
     router: {},
-    dynamicId: 0,
+    dynamicId: 3000,
     uploadUrl: "",
     uploadPrefix: "",
     eventBus: null,

package/packages/config/componentConfig.ts

@@ -8,7 +8,7 @@ import { componentConfigType } from "../typings/type";
 const componentConfig: componentConfigType = {
   store: {},
   router: {},
-  dynamicId: 0,
+  dynamicId: 3000,
   uploadUrl: "",
   uploadPrefix: "",
   eventBus: null,

package/packages/config/use/UseImg.js

@@ -22,13 +22,15 @@ var UseImg = /** @class */ (function () {
             this.destroy();
         }
         componentConfig_1["default"].Vue.nextTick(function () {
+            componentConfig_1["default"].dynamicId += 1;
             _this.dynamicMount = new DynamicMountClass_1["default"]({
                 componentProps: {
                     value: true,
                     urlList: list,
                     onClose: function () {
                         _this.destroy();
-                    }
+                    },
+                    zIndex: componentConfig_1["default"].dynamicId
                 },
                 vueComponent: image_viewer_vue_1["default"]
             });

package/packages/config/use/UseImg.ts

@@ -16,13 +16,15 @@ class UseImg implements UserImgInterface {
             this.destroy();
         }
         componentConfig.Vue.nextTick(() => {
+            componentConfig.dynamicId += 1;
             this.dynamicMount = new DynamicMount({
                 componentProps: {
-                    value:true,
+                    value: true,
                     urlList: list,
                     onClose: () => {
                         this.destroy();
                     },
+                    zIndex: componentConfig.dynamicId
                 },
                 vueComponent: imageViewer,
             });

package/packages/config/use/useConfirm/UseConfirm.js

@@ -0,0 +1,31 @@
+"use strict";
+exports.__esModule = true;
+var componentConfig_1 = require("../../componentConfig");
+var UseConfirm = /** @class */ (function () {
+    function UseConfirm() {
+        this.toMountedConfirm = function (body, title, options) {
+            return new Promise(function (resolve, reject) {
+                var _a, _b, _c;
+                componentConfig_1["default"].dynamicId += 1;
+                var dialogInstance = componentConfig_1["default"].Vue.prototype.$dialog.confirm({
+                    header: title,
+                    body: body,
+                    confirmBtn: (_a = options.confirmButtonText) !== null && _a !== void 0 ? _a : '确定',
+                    cancelBtn: (_b = options.cancelButtonText) !== null && _b !== void 0 ? _b : '取消',
+                    theme: (_c = options.type) !== null && _c !== void 0 ? _c : 'default',
+                    zIndex: componentConfig_1["default"].dynamicId,
+                    onConfirm: function (context) {
+                        resolve(context);
+                        dialogInstance === null || dialogInstance === void 0 ? void 0 : dialogInstance.destroy();
+                    },
+                    onCancel: function (context) {
+                        reject(context);
+                        dialogInstance === null || dialogInstance === void 0 ? void 0 : dialogInstance.destroy();
+                    }
+                });
+            });
+        };
+    }
+    return UseConfirm;
+}());
+exports["default"] = UseConfirm;

package/packages/config/use/useConfirm/UseConfirm.ts

@@ -0,0 +1,35 @@
+import {TypeByConfirmOptions} from "../../../typings/type";
+import componentConfig from "../../componentConfig";
+
+
+class UseConfirm {
+
+    constructor() {
+
+    }
+
+    toMountedConfirm = (body: string, title: string, options: TypeByConfirmOptions) => {
+        return new Promise((resolve, reject) => {
+            componentConfig.dynamicId += 1;
+            let dialogInstance = componentConfig.Vue.prototype.$dialog.confirm({
+                header: title,
+                body: body,
+                confirmBtn: options.confirmButtonText ?? '确定',
+                cancelBtn: options.cancelButtonText ?? '取消',
+                theme: options.type ?? 'default',
+                zIndex: componentConfig.dynamicId,
+                onConfirm: (context) => {
+                    resolve(context);
+                    dialogInstance?.destroy();
+                },
+                onCancel: (context) => {
+                    reject(context);
+                    dialogInstance?.destroy();
+                },
+            })
+        })
+    }
+}
+
+
+export default UseConfirm

package/packages/config/use/useConfirm/UseNotify.js

@@ -0,0 +1,16 @@
+"use strict";
+exports.__esModule = true;
+var componentConfig_1 = require("../../componentConfig");
+var UseNotify = /** @class */ (function () {
+    function UseNotify() {
+        this.toMountedConfirm = function (type, options) {
+            componentConfig_1["default"].Vue.prototype.$notify(type, {
+                title: options.title,
+                content: options.content,
+                duration: options.duration
+            });
+        };
+    }
+    return UseNotify;
+}());
+exports["default"] = UseNotify;

package/packages/config/use/useConfirm/UseNotify.ts

@@ -0,0 +1,19 @@
+import {TypeByNotifyOptions, TypeByTheme} from "../../../typings/type";
+import componentConfig from "../../componentConfig";
+
+class UseNotify {
+    constructor() {
+    }
+
+
+    toMountedConfirm = (type: TypeByTheme, options: TypeByNotifyOptions) => {
+        componentConfig.Vue.prototype.$notify(type,{
+            title: options.title,
+            content: options.content,
+            duration: options.duration
+        })
+    }
+}
+
+
+export default UseNotify;

package/packages/config/use/useConfirm/executeConfirm.js

@@ -0,0 +1,8 @@
+"use strict";
+exports.__esModule = true;
+exports.executeConfirm = void 0;
+var UseConfirm_1 = require("./UseConfirm");
+var executeConfirm = function (body, title, options) {
+    return new UseConfirm_1["default"]().toMountedConfirm(body, title, options);
+};
+exports.executeConfirm = executeConfirm;

package/packages/config/use/useConfirm/executeConfirm.ts

@@ -0,0 +1,6 @@
+import {TypeByConfirmOptions} from "../../../typings/type";
+import UseConfirm from "./UseConfirm";
+
+export const executeConfirm = (body: string, title: string, options: TypeByConfirmOptions) => {
+    return new UseConfirm().toMountedConfirm(body, title, options)
+}

package/packages/config/use/useConfirm/registerConfirm.js

@@ -0,0 +1,8 @@
+"use strict";
+exports.__esModule = true;
+var executeConfirm_1 = require("./executeConfirm");
+exports["default"] = {
+    install: function (Vue) {
+        Vue.prototype.$confirm = executeConfirm_1.executeConfirm;
+    }
+};

package/packages/config/use/useConfirm/registerConfirm.ts

@@ -0,0 +1,8 @@
+
+import {executeConfirm} from "./executeConfirm";
+
+export default {
+    install(Vue) {
+        Vue.prototype.$confirm = executeConfirm;
+    }
+}