sohelp-eleplus 1.1.19 → 1.1.21

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.21",
   "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-dyn-select/props.js

@@ -7,14 +7,13 @@ export const prop = {
     required: true
   },
 
-
-  mappingFields:{
+  mappingFields: {
     type: Object,
     default: () => {
       return {
         label: 'label',
         value: 'value'
-      }
+      };
     }
   },
 
@@ -27,6 +26,7 @@ export const prop = {
     type: String,
     default: '请选择'
   },
+
   modelValue: {
     type: Array || String || Number,
     required: true
@@ -64,4 +64,4 @@ export const prop = {
  * 事件
  */
 
-export const emit = ['update:modelValue','change'];
+export const emit = ['update:modelValue', 'change'];

package/sohelp-entity-form/index.vue

@@ -36,6 +36,7 @@
   import { useMobile } from '@/utils/use-mobile';
   import { useI18n } from 'vue-i18n';
   import { EleMessage } from '@/components/ele-admin-plus/components';
+  import { SohelpInput, SohelpNumberInput } from '../components';
 
   const { query } = useRoute();
   const formValue = ref({});
@@ -88,6 +89,8 @@
    * @type {Ref<UnwrapRef<*[]>>}
    */
   const items = ref([]);
+  // 初始化表单配置
+  const initFormValue = ref({});
   /**
    * 默认显示1列
    * @type {Ref<UnwrapRef<number>>}
@@ -167,6 +170,24 @@
   const getRef = (refName) => {
     return proFormRef.value.getRef(refName);
   };
+
+  /**
+   * placeholder占位符映射
+   */
+  const placeholderMap = {
+    SohelpSelect: '请选择',
+    SohelpTreeSelect: '请选择',
+    SohelpDict: '请选择',
+    SohelpUserSelect: '请选择用户',
+    SohelpDeptSelect: '请选择部门',
+    SohelpRoleSelect: '请选择角色',
+    SohelpDatePicker: '请选择日期',
+    SohelpTimePicker: '请选择时间',
+    SohelpDateTimePicker: '请选择日期时间',
+    SohelpInput: '请输入',
+    SohelpNumberInput: '请输入'
+  };
+
   /**根据实体表单配置初始化表单数据 */
   const loadConfig = async (refid = props?.refid) => {
     if (!refid) {
@@ -191,12 +212,13 @@
           }
           let editParams = item?.editorParam ? JSON.parse(item.editorParam) : {};
           if (item.editor === 'SohelpDict') {
-            editParams['code'] = item.dict || editParams?.code;
+            editParams['code'] = editParams?.code || item?.dict;
           }
           if (item['length'] > 0) {
             editParams['maxlength'] = item['length'];
           }
           editParams.readonly = item?.readonly || false;
+          editParams.placeholder = item?.placeholder || placeholderMap[item?.editor] || '';
 
           return {
             key: item?.name || 'tempKey' + index,
@@ -216,6 +238,7 @@
           };
         })
         .filter((p) => p.hidden !== true);
+
       labelWidth.value = props.labelWidth || entityFormConfig.labelWidth || 'auto';
       grid.value = mobile.value ? 1 : entityFormConfig.gridNum || props.gridNum;
 
@@ -278,12 +301,14 @@
    * @param _data 数据对象
    */
 
-  const setFormData = async (_formData = {}) => {
+  const setFormData = async (_formData = {}, params = {}) => {
+    const data = { ..._formData, ...params };
+    initFormValue.value = params;
     loading.value = true;
-
     await isConfigDone();
-    Object.assign(formData.value, _formData);
-    setFormValue(switchFormValue(_formData));
+    Object.assign(formData.value, data);
+    setFormValue(switchFormValue(data));
+    emit('update:modelValue', formData.value);
     setTimeout(() => {
       clearValidate();
     }, 0);
@@ -319,7 +344,7 @@
         changedProps[key] = newObj[key];
       }
     }
-    return { id: oldObj?.id || newObj?.id || '', ...changedProps };
+    return { id: oldObj?.id || newObj?.id || '', ...changedProps, ...initFormValue.value };
   }
 
   /**

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"
@@ -112,8 +116,10 @@
       :code="properties?.dict || properties.editorParam?.code"
       style="width: 160px"
       :teleported="teleported"
+      :placeholder="properties.editorParam?.placeholder || '请选择'"
       class="filter-condition"
     />
+
     <div v-else-if="properties.editor === 'SohelpProcess'">
       <sohelp-number-range
         v-model="condition.value"
@@ -275,7 +281,7 @@
       style="width: 160px"
       class="filter-condition"
     ></sohelp-input>
-  </div>
+  </el-form>
 </template>
 
 <style lang="scss" scoped>