sohelp-eleplus 1.1.22 → 1.1.25

package/sohelp-grid/js/useSohelpGridConfig.js

@@ -4,6 +4,7 @@ import { moduleCache } from '../../cache/ModuleCache';
 import { usePermission } from '@/utils/use-permission';
 import { useMobile } from '@/utils/use-mobile';
 import { useI18n } from 'vue-i18n';
+import { EleMessage } from '@/components/ele-admin-plus/components';
 
 /**
  * 深拷贝
@@ -89,13 +90,13 @@ const switchVxeProperty = (property, sortList, f, formulaMap) => {
    * 自定义格式化渲然
    */
 
-  if (property.renderType && property.renderType === 'customFormatter') {
+  if (property.render && property.render === 'customFormatter') {
     delete editor.slots.default;
     editor.type = 'html';
     editor.formatter = function ({ row, column, cellValue }) {
-      if (property.render) {
+      if (property.renderParam) {
         try {
-          const func = new Function('row', 'column', 'cellValue', `return ( () => { ${property.render} })()`);
+          const func = new Function('$row', '$column', '$value', `return ( () => { ${property.renderParam} })()`);
           return func(row, column, cellValue);
         } catch (e) {
           console.error('customFormatter 执行错误:', e);
@@ -184,7 +185,7 @@ const filterFieldsByProperties = (_data) => {
   };
 
   let validProperties = Object.fromEntries(
-    data.properties.filter((item) => item.name && !item.hidden)?.map((item) => [item.name, item.label])
+    data.properties?.filter((item) => item.name && !item.hidden)?.map((item) => [item.name, item.label])
   );
 
   data.list = filterArray(data.list).filter((item) => {
@@ -195,7 +196,7 @@ const filterFieldsByProperties = (_data) => {
 
   //过滤掉不在列表中的sort属性
   data.filter.sort = filterArray(data.filter.sort.filter((item) => data.list.some((f) => f === item)));
-  data.properties = data.properties.filter((item) => item.name && !item.hidden);
+  data.properties = data.properties?.filter((item) => item.name && !item.hidden);
 
   data.filter.field = data.filter.field.filter((item) => {
     return item.name in validProperties;
@@ -345,7 +346,7 @@ export function useSohelpGridConfig() {
     var batchButtonsIndex = -1;
     const DefaultGridOptions = reactive(deepClone(_DefaultGridOptions));
     /**获取列表配置*/
-    const config = isGridConfig ? await moduleCache.getGrid(_refid) : await moduleCache.getEntityGrid(_refid);
+    const config = await moduleCache.getGrid(_refid);
 
     if (!config) {
       throw new Error(_refid + ' : 没有发现网格列表配置!');

package/sohelp-grid-view/index.vue

@@ -30,7 +30,10 @@
     'operationButtonClick',
     'changeFilterScheme',
     'editClosed',
-    'currentColumnChange'
+    'currentColumnChange',
+    'checkboxChange',
+    'pageChange',
+    'radioChange'
   ]);
 
   // grid实例
@@ -75,6 +78,18 @@
     })
   });
 
+  const checkboxChange = (row, checked, type) => {
+    emit('checkboxChange', row, checked, type);
+  };
+
+  const radioChange = (config) => {
+    emit('radioChange', config);
+  };
+
+  const pageChange = (config) => {
+    emit('pageChange', config);
+  };
+
   /**
    * 分割器配置
    */
@@ -200,6 +215,41 @@
     return sohelpGridRef.value?.selections;
   };
 
+  /**
+   * 设置复选框行键
+
+   * @param row 行数据
+
+   * @param checked 是否选中
+   */
+  const setCheckboxRowKey = (row, checked) => {
+    sohelpGridRef.value?.setCheckboxRowKey(row, checked);
+  };
+
+  const setRadioRowKey = (row, checked) => {
+    sohelpGridRef.value?.setRadioRowKey(row, checked);
+  };
+
+  /**
+   * 获取选中的记录
+   */
+  const getCheckboxRecords = () => {
+    return sohelpGridRef.value?.getCheckboxRecords();
+  };
+  /**
+   * 获取保留的记录
+   */
+  const getCheckboxReserveRecords = (isFull = false) => {
+    return sohelpGridRef.value?.getCheckboxReserveRecords(isFull);
+  };
+
+  /**
+   * 获取数据
+   */
+  const getData = () => {
+    return sohelpGridRef.value?.getData();
+  };
+
   watch(
     _filterValue,
     (val) => {
@@ -217,7 +267,12 @@
     reload,
     load,
     refresh,
-    validate
+    validate,
+    setCheckboxRowKey,
+    getCheckboxRecords,
+    getCheckboxReserveRecords,
+    getData,
+    setRadioRowKey
   });
 </script>
 <script>
@@ -258,6 +313,11 @@
           @operationButtonClick="operationButtonClick"
           @editClosed="editClosed"
           @currentColumnChange="currentColumnChange"
+          @checkboxChange="checkboxChange"
+          @checkboxAll="checkboxChange"
+          @radioChange="radioChange"
+          @pageChange="pageChange"
+          v-bind="$attrs"
         >
           <template v-for="(_, name) in $slots" #[name]="slotProps">
             <slot :name="name" v-bind="slotProps" />

package/sohelp-image-upload/index.vue

@@ -105,7 +105,10 @@
           layout: 'horizontal'
         };
       }
-    }
+    },
+    refid: String,
+    ref_id: String,
+    ref_type: [String, Number]
   });
 
   const emit = defineEmits(['update:modelValue', 'update:data']);
@@ -160,7 +163,7 @@
         return false;
       }
 
-      const res = await SohelpHttp.post('/engine/web/file/delete', { id: id });
+      const res = await SohelpHttp.post('/engine/web/file/delete', { id: id, refid: props.refid });
 
       if (res.meta.success) {
         ElMessage.success(res.meta.message);
@@ -182,6 +185,9 @@
   const uploadMethod = async ({ file }) => {
     const formData = new FormData();
     formData.append('files', file);
+    formData.append('refid', props.refid);
+    formData.append('ref_id', props.ref_id);
+    formData.append('ref_type', props.ref_type);
 
     const res = await SohelpHttp.post('/engine/web/file/upload', formData);
     if (res.meta.success && res.data.length > 0) {