sohelp-eleplus 1.1.19 → 1.1.20

package/components.js

@@ -44,3 +44,5 @@ export { default as SohelpTenantSelect } from './sohelp-tenant-select/index.vue'
 export { default as SohelpVxeGridSelect } from './sohelp-vxe-grid-select/index.vue';
 export { default as SohelpIconSelect } from './sohelp-icon-select/index.vue';
 export { default as SohelpModal } from './sohelp-modal/index.vue';
+export { default as SohelpCard } from './sohelp-card/index.vue';
+export { default as SohelpPage } from './sohelp-page/index.vue';

package/http/SohelpHttp.js

@@ -18,9 +18,11 @@ export const SohelpHttp = {
    * @param _url
    * @param param
    * @param fileName
+   * @param onProgress
+   * @param config
    * @returns {Promise<never>}
    */
-  download: async function(_url, param, fileName) {
+  download: async function(_url, param, fileName, onProgress, config = {}) {
     if (window.$axios == null) {
       console.error("请在配置main.js中配置window.$axios实例！！");
       return;
@@ -29,10 +31,17 @@ export const SohelpHttp = {
       if (!fileName) {
         fileName = (new Date()).getTime();
       }
-      // 发起GET请求，设置responseType为blob
-      const response = await window.$axios.get(_url, {
-        responseType: "blob",
-        params: param
+      // 发起POST请求，设置responseType为blob
+      const response = await window.$axios.post(_url, param || {}, {
+        responseType: 'blob',
+        ...config,
+        onDownloadProgress: (evt) => {
+          if (typeof onProgress === "function") {
+            const total = evt?.total || 0;
+            const loaded = evt?.loaded || 0;
+            onProgress(loaded, total);
+          }
+        }
       }).catch(e => {
         return Promise.reject(e.message);
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sohelp-eleplus",
-  "version": "1.1.19",
+  "version": "1.1.20",
   "description": "SohelpEleplus Extension Components",
   "public": true,
   "main": "index.js",

package/sohelp-card/index.vue

@@ -0,0 +1,13 @@
+<script setup>
+
+</script>
+
+<template>
+  <ele-card flex-table  v-bind="$attrs" v-on="$attrs">
+    <slot></slot>
+  </ele-card>
+</template>
+
+<style scoped lang="scss">
+
+</style>

package/sohelp-dict/index.vue

@@ -11,10 +11,19 @@
         padding-right: 6px;
         padding-top: 3px;
         padding-bottom: 3px;
+        display: flex;
+        align-items: center;
       "
       v-for="(item, index) in valueData"
       :key="item.value"
-      >{{ item.label }}
+    >
+      <el-icon :size="18" style="margin: 2px 5px 0 0">
+        <component :is="ElementPlusIcons[icon]" v-if="ElementPlusIcons[icon]" />
+        <component :is="EleAdminPlusIcons[icon]" v-else-if="EleAdminPlusIcons[icon]" />
+        <span :class="icon" v-else></span>
+      </el-icon>
+
+      {{ item.label }}
     </el-text>
   </template>
   <template v-else-if="type === 'tag'">
@@ -27,6 +36,11 @@
         :key="item.value"
         :disable-transitions="true"
       >
+        <el-icon :size="18" style="margin: 2px 5px 0 0">
+          <component :is="ElementPlusIcons[icon]" v-if="ElementPlusIcons[icon]" />
+          <component :is="EleAdminPlusIcons[icon]" v-else-if="EleAdminPlusIcons[icon]" />
+          <span :class="icon" v-else></span>
+        </el-icon>
         {{ item.label }}
       </el-tag>
     </div>
@@ -39,6 +53,11 @@
     @change="change"
   >
     <el-radio v-for="item in data.value" :key="item.value" :label="item.value">
+      <el-icon :size="18" style="margin: 2px 5px 0 0">
+        <component :is="ElementPlusIcons[icon]" v-if="ElementPlusIcons[icon]" />
+        <component :is="EleAdminPlusIcons[icon]" v-else-if="EleAdminPlusIcons[icon]" />
+        <span :class="icon" v-else></span>
+      </el-icon>
       {{ item.label }}
     </el-radio>
   </el-radio-group>
@@ -50,6 +69,11 @@
     @change="change"
   >
     <el-checkbox v-for="item in data.value" :key="item.value" :label="item.value">
+      <el-icon :size="18" style="margin: 2px 5px 0 0">
+        <component :is="ElementPlusIcons[icon]" v-if="ElementPlusIcons[icon]" />
+        <component :is="EleAdminPlusIcons[icon]" v-else-if="EleAdminPlusIcons[icon]" />
+        <span :class="icon" v-else></span>
+      </el-icon>
       {{ item.label }}
     </el-checkbox>
   </el-checkbox-group>

package/sohelp-grid/components/filter-condition-item.vue

@@ -15,7 +15,7 @@
     }
   });
 
-  const emit = defineEmits(['update:modelValue', 'change']);
+  const emit = defineEmits(['update:modelValue', 'change', 'search']);
   const condition = reactive({});
 
   const dropDownRef = ref(null);
@@ -24,6 +24,10 @@
     return typeof val === 'number';
   };
 
+  const search = () => {
+    emit('search', condition);
+  };
+
   const getComparisonByEditor = (type) => {
     let data = null;
     if (comparisonType[type]) {
@@ -80,7 +84,7 @@
   };
 </script>
 <template>
-  <div class="sohelp-filter-condition" v-if="properties">
+  <el-form class="sohelp-filter-condition" v-if="properties" @keyup.enter="search" @submit.prevent="">
     <el-form-item :label="t(properties.i18n) || properties.label">
       <ele-dropdown
         ref="dropDownRef"
@@ -275,7 +279,7 @@
       style="width: 160px"
       class="filter-condition"
     ></sohelp-input>
-  </div>
+  </el-form>
 </template>
 
 <style lang="scss" scoped>