@idooel/components 0.0.2-beta.15 → 0.0.2-beta.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idooel/components",
-  "version": "0.0.2-beta.15",
+  "version": "0.0.2-beta.17",
   "description": "",
   "private": false,
   "main": "dist/@idooel/components.umd.js",

package/packages/business-components/modal-import/src/index.vue

@@ -18,10 +18,15 @@
         您可以请点击上方按钮查看任务进度或关闭弹框
       </div>
     </div>
-    <div v-if="!isFileEmpty && statusList.length > 0 && mode === 'sync'" class="ele-modal-import__errors">
-      <div v-for="(value, idx) in statusList" :key="idx">
-        {{ value.message }}
-      </div>
+    <div v-if="!isFileEmpty && mode === 'sync'" class="ele-modal-import__errors">
+      <template v-if="statusList.length > 0">
+          <div v-for="(value, idx) in statusList" :key="idx">
+            {{ value.message }}
+          </div>
+        </template>
+      <template v-else>
+        <ele-alert :type="hooks.uploaded.messages.type" :message="hooks.uploaded.messages.message"></ele-alert>
+      </template>
     </div>
   </ele-modal>
 </template>
@@ -56,9 +61,17 @@ export default {
           url: '',
           requestType: 'POST',
           params: {},
-          fieldMap: {}
+          fieldMap: {},
+          messages: {
+            type: 'success',
+            message: '文件上传成功'
+          }
         }
       })
+    },
+    errorList: {
+      type: Array,
+      default: () => []
     }
   },
   data() {
@@ -84,6 +97,9 @@ export default {
     },
     statusList () {
       // 0 default
+      if (this.errorList.length > 0) {
+        return this.buildErrorList(this.errorList)
+      }
       return this.innerErrorList
     }
   },
@@ -110,6 +126,20 @@ export default {
       const ctx = { _route: this.$route.query, route: this.$route, ...payloads }
       return parseFieldMap(fieldMap, ctx)
     },
+    buildErrorList (dataSource = []) {
+      const ret = dataSource.map(item => {
+        if (type.isStr(item)) {
+          return {
+            statusCode: '0',
+            message: item
+          }
+        } else {
+          // TODO
+          console.warn('not support error list type', item)
+        }
+      })
+      return ret
+    },
     uploadFileSuccess (props) {
       const { uploaded } = this.hooks
       const { url, requestType = 'POST', params = {}, fieldMap = {} } = uploaded
@@ -124,16 +154,7 @@ export default {
       net[requestType.toLowerCase()](url, formData , { headers: { 'Content-Type': 'multipart/form-data' } }).then(resp => {
         const { code, data } = resp
         if (code !== '2000') {
-          this.innerErrorList = data.map(item => {
-            if (type.isStr(item)) {
-              return {
-                statusCode: '0',
-                message: item
-              }
-            } else {
-              // TODO
-            }
-          })
+          this.innerErrorList = this.buildErrorList(data || [])
         }  else {
           this.innerErrorList = []
         }

package/packages/models/tree-table-model/src/index.vue

@@ -671,8 +671,7 @@ export default {
     },
     async requestTableData (props = {}) {
       const { url, requestType = 'GET', page = {} } = this.tableMeta
-      const { pageSize = 10 } = page
-      this.tableQuerys = Object.assign(this.tableQuerys, { currentPage: 1, pageSize }, props)
+      this.tableQuerys = Object.assign(this.tableQuerys, { currentPage: this.tableQuerys.currentPage || 1, pageSize: this.tableQuerys.pageSize || 10 }, props)
       this.$emit(RESERVE_EVENT_NAMES.WATCH, { ...this.exposed })
       this.loading = true
       const ret = await net[requestType.toLowerCase()](
@@ -706,6 +705,24 @@ export default {
       const modelTableContainerRef = this.$refs[this.modelTableContainerRef]
       const { height } = modelTableContainerRef.getBoundingClientRect()
       this.treeWrapperHeight = height
+    },
+    async keepAliveRefresh () {
+      // 重新计算表格高度（应对窗口大小变化）
+      this.$nextTick(() => {
+        this.calculateTableHeight()
+        if (this.showTree) {
+          this.calculateTreeHeight()
+        }
+      })
+      // 刷新列表数据
+      const { overrideInit = false } = this.tableMeta
+      if (overrideInit) {
+        // 如果使用自定义初始化模式，触发 INIT 事件
+        this.$emit(RESERVE_EVENT_NAMES.INIT, { ...this.exposed })
+      } else {
+        // 使用当前查询参数刷新表格数据
+        await this.requestTableData(this.tableQuerys)
+      }
     }
   },
   mounted () {
@@ -739,23 +756,7 @@ export default {
     }
   },
   async activated () {
-    // 重新计算表格高度（应对窗口大小变化）
-    this.$nextTick(() => {
-      this.calculateTableHeight()
-      if (this.showTree) {
-        this.calculateTreeHeight()
-      }
-    })
-    
-    // 刷新列表数据
-    const { overrideInit = false } = this.tableMeta
-    if (overrideInit) {
-      // 如果使用自定义初始化模式，触发 INIT 事件
-      this.$emit(RESERVE_EVENT_NAMES.INIT, { ...this.exposed })
-    } else {
-      // 使用当前查询参数刷新表格数据
-      await this.requestTableData()
-    }
+    await this.keepAliveRefresh()
   }
 }
 </script>

package/vitest.config.js

@@ -1,17 +1,17 @@
-import { defineConfig } from 'vitest/config'
-import vue from '@vitejs/plugin-vue2'
-import path from 'path'
-
-export default defineConfig({
-  plugins: [vue()],
-  resolve: {
-    alias: {
-      '@': path.resolve(__dirname, 'packages')
-    }
-  },
-  test: {
-    environment: 'jsdom',
-    globals: true,
-    setupFiles: ['__tests__/setup.js']
-  }
-})
+import { defineConfig } from 'vitest/config'
+import vue from '@vitejs/plugin-vue2'
+import path from 'path'
+
+export default defineConfig({
+  plugins: [vue()],
+  resolve: {
+    alias: {
+      '@': path.resolve(__dirname, 'packages')
+    }
+  },
+  test: {
+    environment: 'jsdom',
+    globals: true,
+    setupFiles: ['__tests__/setup.js']
+  }
+})