sohelp-eleplus 1.1.22 → 1.1.25

package/sohelp-pro-form/components/pro-form-item.vue

@@ -274,11 +274,11 @@
 
     <!-- 数据表格 -->
     <SohelpTableSelect
-      v-if="item.type === 'SohelpTableSelect'"
       v-bind="item.props || {}"
       @="item.props || {}"
       v-model="model[item.prop]"
       :data="data"
+      v-if="item.type === 'SohelpTableSelect'"
       style="width: 100%"
     >
       <template
@@ -334,18 +334,17 @@
     <!-- 上传附件 -->
     <SohelpFileUpload
       v-if="item.type === 'SohelpFileUpload'"
-      v-bind="item.props || {}"
+      v-bind="{ ...item.props, ...saveParams }"
       v-model="model[item.prop]"
       :readonly="readonly"
       @="item.props || {}"
       :data="data"
     >
     </SohelpFileUpload>
-
     <!-- 上传图片 -->
     <SohelpImageUpload
       v-if="item.type === 'SohelpImageUpload'"
-      v-bind="item.props || {}"
+      v-bind="{ ...item.props, ...saveParams }"
       @="item.props || {}"
       v-model="model[item.prop]"
       :readonly="readonly"
@@ -1073,9 +1072,12 @@
     readonly: {
       type: Boolean,
       default: false
+    },
+    saveParams: {
+      type: Object,
+      default: () => ({})
     }
   });
-
   const emit = defineEmits(['updateValue']);
 
   /** 更新值 */

package/sohelp-pro-form/index.vue

@@ -22,6 +22,7 @@
           :data="data[item.prop]"
           :disabled="disabled"
           :readonly="readonly"
+          :saveParams="saveParams"
           :ref="(el) => setFormItemRef(el, item.prop)"
           @updateValue="(value) => updateValue(item.prop, value)"
         >
@@ -69,6 +70,7 @@
             :data="data[item.prop]"
             :disabled="disabled"
             :readonly="readonly"
+            :saveParams="saveParams"
             :ref="(el) => setFormItemRef(el, item.prop)"
             @updateValue="(value) => updateValue(item.prop, value)"
           >
@@ -165,6 +167,10 @@
     readonly: {
       type: Boolean,
       default: false
+    },
+    saveParams: {
+      type: Object,
+      default: () => ({})
     }
   });
 

package/sohelp-rate/index.vue

@@ -3,11 +3,17 @@
     <ele-text v-if="type === 'select'">
       <sohelp-select :datasource="datasource" v-model="value" v-bind="$attrs" />
     </ele-text>
-    <el-rate v-model="value" v-else v-bind="$attrs" :texts="['1 分', '2 分', '3 分', '4 分', '5 分']" show-text></el-rate>
+    <el-rate
+      v-model="value"
+      v-else
+      v-bind="$attrs"
+      :texts="['1 分', '2 分', '3 分', '4 分', '5 分']"
+      show-text
+    ></el-rate>
   </div>
 </template>
 <script>
-  import { reactive, ref, watch } from 'vue';
+  import { ref, watch } from 'vue';
   import SohelpDynSelect from '../sohelp-dyn-select/index.vue';
   export default {
     name: 'SohelpRate',
@@ -15,7 +21,7 @@
     props: {
       type: {
         type: String,
-        default: "rate"
+        default: 'rate'
       },
       modelValue: [Number, String, Array]
     },
@@ -46,11 +52,9 @@
   };
 </script>
 <style lang="scss" scoped>
-
-  .sohelp-rate{
-    .el-rate{
-      margin-top: 0;
+  .sohelp-rate {
+    .el-rate {
+      margin-top: 0 !important;
     }
   }
-
 </style>

package/sohelp-select/index.vue

@@ -18,7 +18,7 @@
   </el-select>
 </template>
 <script>
-  import { onMounted, ref, watch } from 'vue';
+  import { onMounted, ref, computed } from 'vue';
   import { useI18n } from 'vue-i18n';
 
   export default {
@@ -50,7 +50,6 @@
     setup(props, { emit, attrs }) {
       const { t } = useI18n();
       const data = ref([]);
-      const dataValue = ref('');
 
       const mapData = (items) => {
         return items?.map((item) => ({
@@ -71,27 +70,25 @@
         }
       });
 
-      watch(
-        () => props.modelValue,
-        (val) => {
-          let value = val + '';
-          if (props.multiple) {
-            // 转换成数组
-            if (!Array.isArray(value)) {
-              value = value
-                ?.toString()
-                .split(',')
-                ?.filter((item) => item);
-            }
-          } else {
-            value = value?.split(',')[0];
+      // 使用 computed 替代 watch，性能更好
+      const dataValue = computed(() => {
+        let value = props.modelValue + '';
+        if (props.multiple) {
+          if (!Array.isArray(value)) {
+            value = value
+              ?.toString()
+              .split(',')
+              ?.filter((item) => item);
           }
-          dataValue.value = value;
-        },
-        {
-          immediate: true
+          // 验证数组中的每个值是否在 data 中存在
+          return value.filter((v) => data.value.some((item) => item.value === v));
+        } else {
+          value = value?.split(',')[0];
+          // 验证单个值是否在 data 中存在
+          const isValid = data.value.some((item) => item.value === value);
+          return isValid ? value : '';
         }
-      );
+      });
 
       const optionClick = (val) => {
         emit('optionClick', val);

package/sohelp-table/index.vue

@@ -9,10 +9,11 @@
     :where="where"
     :show-overflow-tooltip="true"
     v-model:selections="selections"
-    highlight-current-row>
+    highlight-current-row
+  >
     <slot>
       <template v-for="(slotProps, slotName) in $scopedSlots" :key="slotName">
-        <slot :name="slotName" v-bind="slotProps"/>
+        <slot :name="slotName" v-bind="slotProps" />
       </template>
     </slot>
     <template #toolbar="{ row }">
@@ -25,127 +26,124 @@
   </ele-pro-table>
 </template>
 <script>
-import {reactive, ref} from 'vue';
-import {moduleCache} from '../cache/ModuleCache';
-import {EleMessage} from "@/components/ele-admin-plus/components";
+  import { reactive, ref } from 'vue';
+  import { moduleCache } from '../cache/ModuleCache';
+  import { EleMessage } from '@/components/ele-admin-plus/components';
 
-
-export default {
-  name: "SohelpTable",
-  props: {
-    /**网格列表配置ID*/
-    refid: {
-      type: String,
-      default: "",
-      required: true
-    },
-    /**数据源URL**/
-    url: {
-      type: String,
-      default: ""
+  export default {
+    name: 'SohelpTable',
+    props: {
+      /**网格列表配置ID*/
+      refid: {
+        type: String,
+        default: '',
+        required: true
+      },
+      /**数据源URL**/
+      url: {
+        type: String,
+        default: ''
+      },
+      /**数据源URL**/
+      where: {
+        type: Object,
+        default: {}
+      }
     },
-    /**数据源URL**/
-    where: {
-      type: Object,
-      default: {}
-    }
-  },
-  setup(props, {emit}) {
-    /**列表实例*/
-    const sohelpTableRef = ref(null);
-    /**存储表格配置*/
-    const sohelpConfig = reactive({});
-    /**在放选中数据列表**/
-    const selections = ref([]);
-    /**默认加载数据**/
-    const loadOnCreated = ref(false);
+    setup(props, { emit }) {
+      /**列表实例*/
+      const sohelpTableRef = ref(null);
+      /**存储表格配置*/
+      const sohelpConfig = reactive({});
+      /**在放选中数据列表**/
+      const selections = ref([]);
+      /**默认加载数据**/
+      const loadOnCreated = ref(false);
 
-    /**自定义列配置 **/
-    const columns = reactive([{
-      type: 'selection',
-      columnKey: 'selection',
-      width: 50,
-      align: 'center',
-      fixed: 'left'
-    }, {
-      type: 'index',
-      columnKey: 'index',
-      width: 50,
-      align: 'center',
-      fixed: 'left'
-    }]);
+      /**自定义列配置 **/
+      const columns = reactive([
+        {
+          type: 'selection',
+          columnKey: 'selection',
+          width: 50,
+          align: 'center',
+          fixed: 'left'
+        },
+        {
+          type: 'index',
+          columnKey: 'index',
+          width: 50,
+          align: 'center',
+          fixed: 'left'
+        }
+      ]);
 
-    /** 表格数据源 */
-    const datasource = async ({page, limit, where, orders}) => {
-      if (!loadOnCreated.value) {
-        return {total: 0, results: []}
-      }
-      const res = await SohelpHttp.get(props.url || sohelpConfig.requestValue, {
-        page,
-        limit,
-        ...where,
-        ...props.where,
-        orders
-      }).catch(e => {
-        EleMessage.error(e.message);
-      });
-      return res.data;
-    };
+      /** 表格数据源 */
+      const datasource = async ({ page, limit, where, orders }) => {
+        if (!loadOnCreated.value) {
+          return { total: 0, results: [] };
+        }
+        const res = await SohelpHttp.get(props.url || sohelpConfig.requestValue, {
+          page,
+          limit,
+          ...where,
+          ...props.where,
+          orders
+        }).catch((e) => {
+          EleMessage.error(e.message);
+        });
+        return res.data;
+      };
 
-    /**根据配置列转成ProTable格式的列*/
-    const switchProperty = (property) => {
-      return {
-        prop: property.name,
-        columnKey: property.name,
-        label: property.label,
-        width: property.width || 100
-      }
-    }
+      /**根据配置列转成ProTable格式的列*/
+      const switchProperty = (property) => {
+        return {
+          prop: property.name,
+          columnKey: property.name,
+          label: property.label,
+          width: property.width || 100
+        };
+      };
 
-    /***初始化网格列表配置**/
-    const initProTableConfiguration = (cfg) => {
-      loadOnCreated.value = true;
-      reload();
-    }
-    /**获取列表配置*/
-    moduleCache.getGrid(props.refid).then(data => {
-      Object.assign(sohelpConfig, {...data});
-      //初始化属性列表配置
-      data.properties.map(property => {
-        columns.push(switchProperty(property));
-      });
-      /**添加操作列**/
-      columns.push({
-        columnKey: 'action',
-        label: '操作',
-        width: 200,
-        align: 'center',
-        slot: 'action'
+      /***初始化网格列表配置**/
+      const initProTableConfiguration = (cfg) => {
+        loadOnCreated.value = true;
+        reload();
+      };
+      /**获取列表配置*/
+      moduleCache.getGrid(props.refid).then((data) => {
+        Object.assign(sohelpConfig, { ...data });
+        //初始化属性列表配置
+        data.properties.map((property) => {
+          columns.push(switchProperty(property));
+        });
+        /**添加操作列**/
+        columns.push({
+          field: 'action',
+          label: '操作',
+          width: 200,
+          align: 'center',
+          slot: 'action'
+        });
+        //初始化表格配置
+        initProTableConfiguration();
       });
-      //初始化表格配置
-      initProTableConfiguration();
-    });
 
+      const reload = (param) => {
+        sohelpTableRef.value?.reload?.(param);
+      };
+      const getData = () => {
+        return sohelpTableRef.value?.getData?.();
+      };
+      const getTableRef = () => {
+        return sohelpTableRef.value?.getTableRef?.();
+      };
 
-    const reload = (param) => {
-      sohelpTableRef.value?.reload?.(param);
-    }
-    const getData = () => {
-      return sohelpTableRef.value?.getData?.();
-    }
-    const getTableRef = () => {
-      return sohelpTableRef.value?.getTableRef?.();
+      // defineExpose({
+      //   reload, getData,getTableRef,datasource
+      // })
+      return { columns, reload, getData, getTableRef, datasource, selections, sohelpTableRef, sohelpConfig };
     }
-
-    // defineExpose({
-    //   reload, getData,getTableRef,datasource
-    // })
-    return {columns, reload, getData, getTableRef, datasource, selections, sohelpTableRef, sohelpConfig}
-  }
-
-};
-
+  };
 </script>
-<style scoped>
-
-</style>
+<style scoped></style>