sohelp-eleplus 1.1.19 → 1.1.21

package/sohelp-grid/index.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { Filter, Search, Sort, SortDown, SortUp,Setting,Tickets,Postcard, Files, Grid} from "@element-plus/icons-vue";
+import { Filter, Search, Sort, SortDown, SortUp,Setting,Memo,Menu,Tickets,Postcard, Files, Grid, Refresh} from "@element-plus/icons-vue";
 import { useMobile } from "@/utils/use-mobile";
 import { usePermission } from "@/utils/use-permission";
 import DefaultProps from "./js/DefaultProps";
@@ -12,6 +12,7 @@ import { useFormData } from "@/utils/use-form-data";
 import { resetCommonConfig, updateCommonConfig } from "../http/ModuleHttp.js";
 import CrudHttp from "../http/CrudHttp.js";
 import {merge, cloneDeep } from "lodash-es";
+import { uuid } from "../utils/core.js"
 
 import ApprovalModal from "../sohelp-workflow-drawer/components/approval-modal.vue";
 import WorkflowDrawer from "../sohelp-workflow-drawer/index.vue";
@@ -22,10 +23,11 @@ import FilterConditionItem from "./components/filter-condition-item.vue";
 import { useSohelpGridConfig } from "./js/useSohelpGridConfig.js";
 import { useI18n } from "vue-i18n";
 import SohelpEntityForm from "../sohelp-entity-form/index.vue";
-  import * as ElementPlusIcons from '@element-plus/icons-vue';
-  import * as EleAdminPlusIcons from '@/components/icons';
+import * as ElementPlusIcons from '@element-plus/icons-vue';
+import * as EleAdminPlusIcons from '@/components/icons';
 import { moduleCache } from "../cache/ModuleCache.js";
 import SohelpModal from "../sohelp-modal/index.vue";
+import SohelpImport from "../sohelp-import/index.vue";
 import { useUserStore } from '@/store/modules/user';
 import { Alert } from "vxe-pc-ui";
 const { initial, isConfigDone } = useSohelpGridConfig();
@@ -49,6 +51,12 @@ const currentReportValue = ref(null);
 const visibleReport = ref(false);
 const reportData = ref([]);
 const currentRow = ref(null);
+
+/** 自动生成ID */
+const getId = () => {
+  return 'sohelp-grid-' + uuid();
+}
+
 const loadReport = () => {
   SohelpHttp.get("/engine/web/report/list", { refid: props.refid }).then(res => {
     if (res.meta.success) {
@@ -89,6 +97,9 @@ const closeReport = () => {
   visibleReport.value = false;
 };
 
+// 操作栏按钮配置
+const operationsButtons = reactive({});
+
 const loading = ref(false);
 //显示实体表单
 const visibleEntityForm = ref(false);
@@ -190,12 +201,24 @@ const getCellValue = (rowIndex, name) => {
   return (gridData[rowIndex] && gridData[rowIndex][name]) ? gridData[rowIndex][name] : "";
 };
 
+/**
+ * 获取行原始数据
+ */
+const getRowDataByField = (column, row) => {
+  if(column.type === 'SohelpTableSelect'){
+    const {field} = column;
+    return gridData.find(item => item[field].id === row[field]) || row;
+  } else{
+    return row;
+  }
+}
+
 /**
  * 获取关键字描述
  */
 const getKeywordsPlaceholder = computed(() => {
   if (sohelpConfig.value?.filter?.keywords?.length) {
-    return t("grid.toolbar.keywords") + ",【" + sohelpConfig.value.filter?.keywords?.filter(key => propertiesMap.value[key]).map(key => t(propertiesMap.value[key].i18n) || propertiesMap.value[key].label).join("/") + "】";
+    return t("grid.toolbar.keywords") + " [" + sohelpConfig.value.filter?.keywords?.filter(key => propertiesMap.value[key]).map(key => t(propertiesMap.value[key].i18n) || propertiesMap.value[key].label).join(",") + "]";
   }
   return t("grid.toolbar.keywords");
 });
@@ -208,6 +231,107 @@ const getCurrentFieldLabel = computed(() => {
   return (propertiesMap.value[textareaState["field"]]?.label || "") + "修改";
 });
 
+const importVisible = ref(false);
+const importAuthority = computed(() => {
+  try {
+    const prefix = (props.refid || '').split('!')[0] || '';
+    return prefix + ':batch.import';
+  } catch (e) {
+    return 'batch.import';
+  }
+});
+const exportAuthority = computed(() => {
+  try {
+    const prefix = (props.refid || '').split('!')[0] || '';
+    return prefix + ':batch.export';
+  } catch (e) {
+    return 'batch.export';
+  }
+});
+
+const openImport = () => {
+  try {
+    if (!permission.hasPermission(importAuthority.value)) {
+      EleMessage.error('暂无权限');
+      return;
+    }
+    if (!props.refid) {
+      EleMessage.error('列表地址缺失，无法打开导入');
+      return;
+    }
+    importVisible.value = true;
+  } catch (e) {
+    EleMessage.error(typeof e === 'string' ? e : e?.message || '打开导入失败');
+  }
+};
+const closeImport = () => {
+  importVisible.value = false;
+};
+const exportData = async (dataRange) => {
+  if (!permission.hasPermission(exportAuthority.value)) {
+    EleMessage.error('暂无权限');
+    return;
+  }
+  if (dataRange === 0) {
+    const $grid = sohelpVxeGridRef.value;
+    const selected = $grid?.getCheckboxRecords() || [];
+    if (!selected.length) {
+      EleMessage.error("请先勾选需要导出的记录");
+      return;
+    }
+    const ids = selected.map((item) => item.id).filter((id) => id !== undefined && id !== null);
+    if (!ids.length) {
+      EleMessage.error("选中记录未包含可导出的ID");
+      return;
+    }
+    let last = 0;
+    let loadingTip = EleMessage.loading("导出中 0%");
+    try {
+      await SohelpHttp.download("/engine/web/export/download", {
+        refid: props.refid,
+        exportRange: dataRange,
+       ...filterValue.value,
+        ids: ids
+      }, "导出数据.xlsx", (loaded, total) => {
+        if (total > 0) {
+          const p = Math.floor((loaded / total) * 100);
+          if (p - last >= 5) {
+            loadingTip.close();
+            loadingTip = EleMessage.loading(`导出中 ${p}%`);
+            last = p;
+          }
+        }
+      });
+    } catch (e) {
+      EleMessage.error(typeof e === "string" ? e : e?.message || "导出失败");
+    } finally {
+      loadingTip.close();
+    }
+    return;
+  }
+  let last = 0;
+  let loadingTip = EleMessage.loading("导出中 0%");
+  try {
+    await SohelpHttp.download("/engine/web/export/download", {
+      refid: props.refid,
+      exportRange: dataRange,
+      filterValue: JSON.stringify(filterValue.value)
+    }, "导出数据.xlsx", (loaded, total) => {
+      if (total > 0) {
+        const p = Math.floor((loaded / total) * 100);
+        if (p - last >= 5) {
+          loadingTip.close();
+          loadingTip = EleMessage.loading(`导出中 ${p}%`);
+          last = p;
+        }
+      }
+    });
+  } catch (e) {
+    EleMessage.error(typeof e === "string" ? e : e?.message || "导出失败");
+  } finally {
+    loadingTip.close();
+  }
+};
 const keywordsChange = (val) => {
   filterValue.value = {
     ...filterValue.value,
@@ -302,6 +426,7 @@ const loadConfig = (param = {}) => {
       /**配置刷新功能 */
       config.gridOptions = {
         ...config.gridOptions,
+        params: gridOptions.params ?? {},
         toolbarConfig: {
           ...config.gridOptions?.toolbarConfig,
           refresh: true,
@@ -315,6 +440,7 @@ const loadConfig = (param = {}) => {
         }
       };
 
+
       //工具栏按钮权限
       Object.assign(formulaMap, config.formulaMap);
       Object.assign(gridOptions, config.gridOptions);
@@ -328,6 +454,10 @@ const loadConfig = (param = {}) => {
       batchButtonsIndex.value = config.batchButtonsIndex;
       sohelpConfig.value.list = config.sohelpConfig.list;
 
+
+
+      Object.assign(operationsButtons, config.operationsButtons);
+
       if (!filterValue.value.filter) {
         filterValue.value.filter = [];
       }
@@ -359,6 +489,7 @@ const load = async (params = {}, callback) => {
   gridOptions.params = params;
   await isConfigDone();
   const $grid = sohelpVxeGridRef.value;
+
   if ($grid) {
     const url = props.url || sohelpConfig.value.requestValue;
     if (sohelpConfig.value.requestType != "crud" && !url) {
@@ -366,6 +497,7 @@ const load = async (params = {}, callback) => {
       return { results: [], total: 0 };
     }
 
+
     let pageConfig = {};
     // 是否分页
     if (gridOptions.pagerConfig?.enabled) {
@@ -383,6 +515,7 @@ const load = async (params = {}, callback) => {
     });
 
 
+
     if (res?.meta?.success) {
       if (res.data) {
         gridOptions.pagerConfig.total = Number(res.data.total);
@@ -407,12 +540,17 @@ const load = async (params = {}, callback) => {
       callback(res);
     }
   }
+
 };
 
 /**
  * 重新加载数据
  */
 const reload = async (params = {}) => {
+  //取消选中
+  selections.value = [];
+  sohelpVxeGridRef.value?.clearCheckboxRow();
+
   Object.assign(gridOptions.params, params);
   load(gridOptions.params);
 };
@@ -475,55 +613,28 @@ const pageChangeEvent = (page) => {
  * 获取Common类型操作栏 并根据flw_id判断是否显示
  * @param row
  */
-const getOperationButtonsByType = (row, type = "common") => {
-  let common = getOperationToolbars.value?.[type] || [];
-  if (common.length > 0) {
-    if (row.hasOwnProperty("flw_id")) {
-      const field = row.flw_id === "0" ? "workflow.view" : "workflow.submit";
-      common = common.filter(f => f.code != field);
-    } else {
-      common = common.filter(f => (f.code != "workflow.submit" || f.code != "workflow.view"));
-    }
-    return common;
-  }
-  return [];
-};
-
-/**
- * 获取操作栏
- */
-const getOperationToolbars = computed(() => {
-  const buttonsMap = {};
-  sohelpConfig.value.operationToolbars?.filter(f => !f.authority || permission.hasPermission(f.authority)).map(button => {
-    const type = button.buttonType || "common";
-    const code = button.type === "custom" ? button.id : button.type;
-    if (!buttonsMap[type]) {
-      buttonsMap[type] = [];
-    }
-    const title = (button.type === "custom") ? button.title : t("grid.toolbar." + button.type?.replaceAll(".", "-"));
-    let params = button.params || {};
-    if (button.params && typeof button.params === "string") {
-      try {
-        params = JSON.parse(button.params);
-      } catch (e) {
-        params = {};
-        EleMessage.error("button.params配置JSON参数格式错误");
+const getOperationButtonsByType = computed(() => {
+  return (row, column, type = "common") => {
+    const $grid = sohelpVxeGridRef.value;
+    let common = operationsButtons?.[type] || [];
+    if (common.length > 0) {
+      if (row.hasOwnProperty("flw_id")) {
+        const field = row.flw_id === "0" ? "workflow.view" : "workflow.submit";
+        common = common.filter(f => f.code != field);
+      } else {
+        common = common.filter(f => (f.code != "workflow.submit" || f.code != "workflow.view"));
       }
+      return common.map((item) => {
+        if(item.render && item.render?.length > 0) {
+          const func = new Function("row","item","column","$grid", `return (async () => { ${item.render} })()`);
+          func.call(undefined, row, item, column, $grid);
+        }
+        return item;
+      });
     }
-    buttonsMap[type].push({
-      title: title || button.title,
-      "id": button.id,
-      code: code,
-      handler: button.handler,
-      icon: button.iconCls,
-      params: params,
-      refid: button.refid,
-      openType: button.openType
-    });
-  });
-  return buttonsMap;
-});
-
+    return [];
+  };
+})
 
 /**
  * 行操作栏点击事件
@@ -531,7 +642,10 @@ const getOperationToolbars = computed(() => {
  * @param item
  */
 const operationHandler = ({ item, row, $grid }) => {
+
   //操作栏事件执行
+  $grid.reload = reload;
+  $grid.refresh = refresh;
   if (item.handler && typeof item.handler === "string") {
     try {
       const func = new Function("row", "$grid", `return (async () => { ${item.handler} })()`);
@@ -560,13 +674,15 @@ const operationHandler = ({ item, row, $grid }) => {
     if (item.openType === "tab") {
       window.$SohelpModule.openTab(item.refid, { id: row.id }, item.params || {});
     } else if (item.openType === "drawer") {
-      console.error("item", item.params);
       window.$SohelpModule.openDrawer(item.refid, { id: row.id }, item.params || {});
     } else {
       window.$SohelpModule.openModal(item.refid, { id: row.id }, item.params || {});
     }
   } else {
     switch (item.code) {
+      case "row.delete":
+        $grid?.remove(row)
+        break;
       case "crud.edit":
         visibleEntityForm.value = true;
         toolbarButtonParams.value = item.params || {};
@@ -577,7 +693,7 @@ const operationHandler = ({ item, row, $grid }) => {
         CrudHttp.detail(props.refid, { id: row.id }).then(res => {
           if (res.meta.success) {
             setTimeout(() => {
-              entityFormRef.value.setFormData(res.data);
+              entityFormRef.value.setFormData({...res.data});
             }, 10);
           } else {
             EleMessage.error(res.meta.message);
@@ -608,6 +724,9 @@ const operationHandler = ({ item, row, $grid }) => {
       case "crud.delete" :
         remove({ id: [row.id] });
         break;
+      case "row.pre-delete":
+        $grid?.setPendingRow(row, true);
+        break;
       case "workflow.submit":
         submitWorkflow({ id: [row.id] });
         break;
@@ -666,6 +785,10 @@ const insertField = (data, index = -1) => {
  * 刷新列表
  */
 const refresh = () => {
+  //取消选中
+  selections.value = [];
+  sohelpVxeGridRef.value?.clearCheckboxRow();
+
   if (!isPage.value) {
     if (gridOptions.pagerConfig && gridOptions.pagerConfig.enabled) {
       gridOptions.pagerConfig.currentPage = 1;
@@ -826,12 +949,13 @@ const orgDatasource = computed(async () => {
  */
 const getCrudUpdater = () => {
   const $grid = sohelpVxeGridRef.value;
+  const _delete = [...$grid?.getRemoveRecords()?.map(item => item.id),...$grid?.getPendingRecords()?.map(item => item.id)];
   return {
     "inserted": $grid?.getInsertRecords().map(item => {
       return { ...item };
     }) || [],
     "updated": $grid?.getUpdateRecords(),
-    "deleted": $grid?.getRemoveRecords().map(item => item.id) || []
+    "deleted": _delete
   };
 };
 
@@ -858,12 +982,16 @@ const remove = (params) => {
  */
 const executeToolbarCustomHandler = (button) => {
   const $grid = sohelpVxeGridRef.value;
+  $grid.refresh = refresh;
+  $grid.reload = reload;
   try {
-    let isRows = button.code.includes("batch.");
+    let isRows = button.buttonType === 'batch';
     const func = new Function(isRows ? "rows" : "row", "$grid", `return (async () => { ${button.handler} })()`);
     (async () => {
       const context = {
         $message: EleMessage,
+        $SohelpModule: window.$SohelpModule,
+        $SohelpHttp: window.$SohelpHttp,
         $confirm: (title, callback) => {
           ElMessageBox.confirm(title, "提示", {
             confirmButtonText: "确定",
@@ -893,7 +1021,6 @@ const toolbarClick = async ({ button }) => {
   let rowIndex = -1;
   const row = {};
 
-
   const current = $grid?.getCurrentRecord();
   if (current) {
     rowIndex = $grid?.getVTRowIndex(current);
@@ -937,10 +1064,13 @@ const toolbarClick = async ({ button }) => {
         if (!toolbarButtonParams.value["title"]) {
           toolbarButtonParams.value["title"] = t("grid.toolbar.create");
         }
+
+        const {title, ...params} = button.params;
+
         CrudHttp.initial(props.refid, { id: row.id }, (res) => {
           if (res.meta.success) {
             setTimeout(() => {
-              entityFormRef.value.setFormData(res.data);
+              entityFormRef.value.setFormData({...res.data}, params);
             }, 10);
           } else {
             EleMessage.error(res.meta.message);
@@ -999,7 +1129,7 @@ const gridEvents = {
 
   toolbarButtonClick(config) {
     toolbarClick(config);
-    emit("toolbarButtonClick", config);
+    emit("toolbarButtonClick", config, selections.value);
   }
 
 };
@@ -1065,7 +1195,6 @@ const viewWorkflow = (id) => {
  *  筛选
  */
 const changeNameFilter = (option, val, column) => {
-  console.log("option", option, val, column);
   const $grid = sohelpVxeGridRef.value;
   if ($grid) {
     $grid.setFilter(column.field, [{
@@ -1335,10 +1464,14 @@ const settingClick = (command) => {
   const { refid,extendEntity,name } = sohelpConfig.value;
   if(refid && extendEntity && name){
     const url = {
-      form: baseUrl + `/dev/index.html#/dev/form?datasource=${name}&name=${extendEntity}&refid=${refid}`,
-      entity: baseUrl + `/dev/index.html#/dev/module/entity?datasource=${name}&name=${extendEntity}`,
-      workflow: baseUrl + `/dev/index.html#/dev/form?datasource=${name}&name=${extendEntity}&refid=${refid}`,
-      grid: baseUrl + `/dev/index.html#/dev/module/grid?refid=${refid}`
+      form: baseUrl + `/dev/index.html#/dev/form?datasource=default&name=${extendEntity}&refid=${refid}`,
+      entity: baseUrl + `/dev/index.html#/dev/module/entity?datasource=default&name=${extendEntity}`,
+      workflow: baseUrl + `/dev/index.html#/dev/form?datasource=default&name=${extendEntity}&refid=${refid}&tab=workflow`,
+      grid: baseUrl + `/dev/index.html#/dev/module/grid?refid=${refid}`,
+      module: baseUrl+`/dev/index.html#/dev/module?name=${refid}`,
+    }
+    if(command === 'module' && !extendEntity){
+      url.module = baseUrl+`/dev/index.html#/dev/module?name=${name}`;
     }
     window.open(url[command],'_blank');
   }
@@ -1388,7 +1521,7 @@ defineExpose({
     @checkboxChange="onCheckboxChange"
     @checkboxAll="onCheckboxChange"
     class="sohelp-grid-view"
-    id="sohelp-grid"
+    :id="getId()"
     v-on="gridEvents"
     @filter-change="handleFilterChange"
     @custom="handleCustom"
@@ -1401,25 +1534,31 @@ defineExpose({
     @filter-visible="filterVisible"
   >
 
+    <!--  自定义列设置 -->
     <template #setting>
       <div class="column-setting">
         <vxe-checkbox @change="toggleAllEvent" v-model="columnCheckbox">全选</vxe-checkbox>
-          <vxe-pulldown  trigger="click" :transfer="true"  :show-popup-shadow="true" v-if="userStore.info.is_developer">
-        <template #default>
-          <el-link :icon="Setting" :underline="false"></el-link>
-        </template>
-        <template #dropdown>
-          <ele-text @click="settingClick('grid')">数据列表配置</ele-text>
-          <ele-text @click="settingClick('entity')">实体配置</ele-text>
-        </template>
-      </vxe-pulldown>
+        <vxe-pulldown  trigger="click" :transfer="true"  :show-popup-shadow="true" v-if="userStore.info.is_developer">
+          <template #default>
+            <el-link :icon="Setting" :underline="false"/>
+          </template>
+          <template #dropdown>
+            <ele-card shadow="always">
+              <el-space direction="vertical" :size="5" alignment="flex-start">
+                <el-link :icon="Memo" @click="settingClick('grid')" :underline="false" style="font-size:12px;"><span style="padding:0 5px;">列表配置</span></el-link>
+                <el-link :icon="Menu" @click="settingClick('entity')" :underline="false" style="font-size: 12px;"><span style="padding:0 5px;">实体配置</span></el-link>
+                <el-link :icon="Grid" @click="settingClick('module')" :underline="false" style="font-size: 12px;"><span style="padding:0 5px;">模块配置</span></el-link>
+              </el-space>
+            </ele-card>
+          </template>
+        </vxe-pulldown>
       </div>
     </template>
 
     <!--定义国际化I18n-->
     <template
       v-for="item in sohelpConfig?.properties?.map(item => item)"
-      v-slot:[`header_${item.name}`]="{ column, rowIndex }"
+      #[`header_${item.name}`]="{ column, rowIndex }"
       :key="item.name"
     >
       {{ item.i18n ? t(item.i18n) : item.label }}
@@ -1432,12 +1571,12 @@ defineExpose({
         v-model:currentPage="gridOptions.pagerConfig.currentPage"
         v-model:pageSize="gridOptions.pagerConfig.pageSize"
         :total="gridOptions.pagerConfig.total"
-        @page-change="pageChangeEvent">
-      </vxe-pager>
+        @page-change="pageChangeEvent"/>
     </template>
 
     <!-- 高级筛选 -->
-    <template v-for="field in Object.values(propertiesMap).filter(item => item.query)" :key="field.name"
+    <template
+v-for="field in Object.values(propertiesMap).filter(item => item.query)" :key="field.name"
               #[`filter_${field.name}`]="{ column }">
       <div v-for="(option, index) in column.filters" :key="index" class="condition-box">
         <filter-condition-item
@@ -1454,13 +1593,14 @@ defineExpose({
       <div class="toolbar-box">
         <!-- 查看范围 -->
         <div class="power-box">
-          <sohelp-power @change="changePower" v-if="sohelpConfig?.filter?.config?.visibleDataRange"></sohelp-power>
+          <sohelp-power @change="changePower" v-if="sohelpConfig?.filter?.config?.visibleDataRange"/>
         </div>
 
         <div class="search-box" v-if="sohelpConfig?.filter?.config?.visibleKeywords">
           <!-- 关键字 -->
           <ele-tooltip :content="getKeywordsPlaceholder" placement="top" :offset="3">
-            <sohelp-input :model-value="filterValue.keywords" @update:model-value="keywordsChange"
+            <sohelp-input
+:model-value="filterValue.keywords" @update:model-value="keywordsChange"
                           :placeholder="getKeywordsPlaceholder" clearable
                           @keyup.enter="filter" size="small" style="width: 160px;">
               <template #append>
@@ -1468,34 +1608,62 @@ defineExpose({
               </template>
             </sohelp-input>
           </ele-tooltip>
-          <el-button size="small" @click="resetFilter">{{ t("grid.toolbar.reset") }}</el-button>
+          <el-button size="small" :icon="Refresh" @click="resetFilter">{{ t("grid.toolbar.reset") }}</el-button>
         </div>
 
         <div class="tools-btns">
-          <sohelp-drop-card :title="t('grid.toolbar.sort')" :icon="Sort" ref="sohelpSortRef"
+          <sohelp-drop-card
+:title="t('grid.toolbar.sort')" :icon="Sort" ref="sohelpSortRef"
                             v-if="sohelpConfig?.filter?.config?.visibleSort && sortList.length > 0">
             <div class="sort-list">
-              <ele-card v-for="item in sortList" :key="item.title" :header="item.title"
+              <ele-card
+v-for="item in sortList" :key="item.title" :header="item.title"
                         :bodyStyle="{padding: '0'}"
                         :headerStyle="{fontSize: '14px', fontWeight: 'normal', padding: '5px 0'}">
                 <template #extra>
-                  <ele-text :icon="SortUp" style="cursor: pointer;" :underline="false" size="sm"
+                  <ele-text
+:icon="SortUp" style="cursor: pointer;" :underline="false" size="sm"
                             @click="sortCommand(item.field,'asc')" plain :type="isActiveSort(item.field,'asc')">
-                    t("grid.toolbar.asc")
+                    {{ t("grid.toolbar.asc") }}
                   </ele-text>
-                  <ele-text :icon="SortDown" style="cursor: pointer;margin-left:5px!important" :underline="false"
+                  <ele-text
+:icon="SortDown" style="cursor: pointer;margin-left:5px!important" :underline="false"
                             size="sm" @click="sortCommand(item.field,'desc')" plain
-                            :type="isActiveSort(item.field,'desc')">t("grid.toolbar.desc")
+                            :type="isActiveSort(item.field,'desc')">{{t("grid.toolbar.desc")}}
                   </ele-text>
                 </template>
               </ele-card>
             </div>
           </sohelp-drop-card>
-          <el-button :icon="Filter" size="small" @click="showFilter()"
+          <el-button
+:icon="Filter" size="small" @click="showFilter()"
             plain
                      :type="(sohelpConfig?.filter?.config?.visibleFilter && sohelpConfig?.filter?.config?.filterPosition !== 'NONE')?'primary':''"
-                     v-if="sohelpConfig?.filter?.config?._visibleFilter">
-          </el-button>
+                     v-if="sohelpConfig?.filter?.config?._visibleFilter"/>
+          <ele-tooltip :content="'批量导入数据'" placement="top" :offset="3">
+            <el-button size="small" plain :icon="ElementPlusIcons.Upload" @click="openImport" v-permission="importAuthority"/>
+          </ele-tooltip>
+          <ele-tooltip :content="'批量导出数据'" placement="top" :offset="3">
+            <el-dropdown @command="exportData" v-permission="exportAuthority">
+              <el-button size="small" plain :icon="ElementPlusIcons.Download"/>
+              <template #dropdown>
+                <el-dropdown-menu>
+                  <el-dropdown-item :command="0" :disabled="!selections || selections.length === 0">
+                    <el-icon><Memo /></el-icon>
+                    <span style="margin-left:6px;">导出选中数据</span>
+                  </el-dropdown-item>
+                  <el-dropdown-item :command="1">
+                    <el-icon><Files /></el-icon>
+                    <span style="margin-left:6px;">当前页数据</span>
+                  </el-dropdown-item>
+                  <el-dropdown-item :command="2">
+                    <el-icon><Grid /></el-icon>
+                    <span style="margin-left:6px;">全部记录数据</span>
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </template>
+            </el-dropdown>
+          </ele-tooltip>
         </div>
       </div>
     </template>
@@ -1504,7 +1672,7 @@ defineExpose({
     <!-- 未编辑状态 -->
     <template
       v-for="name in sohelpConfig?.properties?.map(item => item.name)"
-      v-slot:[`default_${name}`]="{ row, column, rowIndex }"
+      #[`default_${name}`]="{ row, column, rowIndex }"
       :key="name"
     >
 
@@ -1517,20 +1685,19 @@ defineExpose({
       />
 
       <!-- 图片 -->
-      <sohelp-image-upload v-else-if="column.type === 'SohelpImageUpload'"
+      <sohelp-image-upload
+v-else-if="column.type === 'SohelpImageUpload'"
                            v-model="row[name]"
                            v-bind="column.editRender"
                            :data="getCellValue(rowIndex,name)"
-                           :readonly="!column.editRender.edit">
-      </sohelp-image-upload>
+                           :readonly="!column.editRender.edit"/>
       <!-- 附件 -->
       <sohelp-file-upload
         v-else-if="column.type === 'SohelpFileUpload'"
         v-model="row[name]"
         v-bind="column.editRender"
         :data="getCellValue(rowIndex,name)"
-        :readonly="!column.editRender.edit">
-      </sohelp-file-upload>
+        :readonly="!column.editRender.edit"/>
 
       <!-- 下拉选择表格 -->
       <div v-else-if="column.type === 'SohelpTableSelect' || column.type === 'ORG' || column.type ==='USER'">
@@ -1555,7 +1722,7 @@ defineExpose({
         v-bind="column.editRender"
         style="width: 100%"
         :readonly="!column.editRender.edit"
-      ></sohelp-process>
+      />
 
 
       <!-- 下拉用户选择 -->
@@ -1584,7 +1751,8 @@ defineExpose({
       </div>
 
       <!-- 文本域 -->
-      <p style="margin: 0;"
+      <p
+style="margin: 0;"
          class="textarea-reference"
          @click="showTextareaModal(column, name, row)"
          v-bind="column.editRender"
@@ -1609,7 +1777,7 @@ defineExpose({
     <!-- 可编辑状态 -->
     <template
       v-for="name in sohelpConfig?.properties?.map(item => item.name)"
-      v-slot:[`edit_${name}`]="{ row, column, rowIndex }"
+      #[`edit_${name}`]="{ row, column, rowIndex }"
       :key="name"
     >
       <div v-if="column.editRender.enabled">
@@ -1660,11 +1828,12 @@ defineExpose({
         />
 
         <!-- 外键关联 -->
-        <sohelp-table-select v-else-if="column.type==='SohelpTableSelect'"
+        <sohelp-table-select
+v-else-if="column.type==='SohelpTableSelect'"
                              v-model:value="row[name]"
                              v-model:data="gridData[rowIndex][name]"
                              v-bind="column.editRender"
-        ></sohelp-table-select>
+        />
 
         <!-- 数值 -->
         <sohelp-number-input
@@ -1688,10 +1857,10 @@ defineExpose({
     </template>
 
     <!-- 操作栏 -->
-    <template #_operation="{ row }">
+    <template #_operation="{ row, column }">
       <el-space :size="10">
         <el-link
-          v-for="item in getOperationButtonsByType(row)"
+          v-for="(item) in getOperationButtonsByType(row, column)"
           :key="item.code"
           :type="item.code === 'crud.delete' ? 'danger' : 'primary'"
           v-bind="item.params"
@@ -1705,7 +1874,7 @@ defineExpose({
           {{ item.title }}
         </el-link>
         <!-- 更多 -->
-        <el-dropdown v-if="getOperationButtonsByType(row,'more')?.length > 0">
+        <el-dropdown v-if="getOperationButtonsByType(row, column,'more')?.length > 0">
           <el-link :underline="false">
             <span>更多</span>
             <el-icon style="margin-left: 4px;">
@@ -1714,7 +1883,8 @@ defineExpose({
           </el-link>
           <template #dropdown>
             <el-dropdown-menu>
-              <el-dropdown-item v-for="item in getOperationButtonsByType(row,'more')" :key="item.code"
+              <el-dropdown-item
+v-for="item in getOperationButtonsByType(row, column, 'more')" :key="item.code"
                                 @click.stop="operationHandler({item:item, row:row,$grid:sohelpVxeGridRef})"
                                 v-bind="item.props">
                 <el-icon v-if="item.icon">
@@ -1734,7 +1904,7 @@ defineExpose({
     <!-- 统计 -->
     <template
       v-for="field in footerData"
-      v-slot:[`footer_${field["field"]}`]="{ row, column,rowIndex}"
+      #[`footer_${field["field"]}`]="{ row, column,rowIndex}"
     :key="field['field']"
     >
     <div v-html="row[column.field]"></div>
@@ -1744,6 +1914,14 @@ defineExpose({
 <template #valid_slot="{content}">
   {{ content }}
 </template>
+
+
+<template v-for="(_,name) in $slots" #[name]="{row, column}">
+
+
+    <slot :name="name" :row="getRowDataByField(column,row)" :column="column"></slot>
+  </template>
+
 </vxe-grid>
 
 <!-- workflow -->
@@ -1753,7 +1931,7 @@ defineExpose({
   :showOpera="false"
   ref="todoDrawerRef"
   :key="drawerKey"
-></workflow-drawer>
+/>
 
 <!-- 提交审批 -->
 <approval-modal
@@ -1761,66 +1939,78 @@ defineExpose({
   type="submit"
   :data="approvalData"
   @confirm="reload"
-></approval-modal>
+/>
 
 <!-- SohelpTextareaInput 编辑弹窗 -->
 <ele-modal :width="460" v-model="textareaState['visible']" :title="getCurrentFieldLabel">
-<sohelp-textarea-input v-model="textareaState['value']" :rows="6"></sohelp-textarea-input>
+<sohelp-textarea-input v-model="textareaState['value']" :rows="6"/>
 <template #footer>
   <el-button @click="textareaCancel">{{ t("common.cancel") }}</el-button>
   <el-button type="primary" @click="textareaConfirm(row, column)">{{ t("common.save") }}</el-button>
 </template>
-</ele-modal>
-
-<!--实体表单-->
-<sohelp-modal
-           :title="toolbarButtonParams?.title || ''"
-           :width="toolbarButtonParams?.width || 860"
-           :draggable="false"
-           v-model="visibleEntityForm" v-loading="loading">
-           <template #setting v-if="userStore.info.is_developer">
-            <ele-dropdown
-              :items="[
-                  { title: '表单配置', command: 'form' , icon:Postcard},
-                  { title: '实体配置', command: 'entity', icon:Tickets},
-                  { title: '流程配置', command: 'workflow', icon:Files }
-              ]"
-              @command="settingClick"
-            >
-              <el-link :icon="Setting" :underline="false"></el-link>
-            </ele-dropdown>
-          </template>
+    </ele-modal>
+
+    <!--实体表单-->
+    <sohelp-modal
+               :title="toolbarButtonParams?.title || ''"
+               :width="toolbarButtonParams?.width || 860"
+               :draggable="false"
+               v-model="visibleEntityForm" v-loading="loading">
+               <template #setting v-if="userStore.info.is_developer">
+                <ele-dropdown
+                  :items="[
+                      { title: '表单配置', command: 'form' , icon:Postcard},
+                      { title: '实体配置', command: 'entity', icon:Tickets},
+                      { title: '流程配置', command: 'workflow', icon:Files },
+                       { title: '模块配置', command: 'module', icon:Grid }
+                  ]"
+                  @command="settingClick"
+                >
+                  <el-link :icon="Setting" :underline="false"/>
+                </ele-dropdown>
+              </template>
+
 
-    <sohelp-entity-form ref="entityFormRef"
-                        :refid="props.refid"
-                        v-model="entityFormValue"
-                        :data="entityFormData"
-                        :config="entityFormConfig"
-                        :readonly="toolbarButtonParams?.readonly"
-    ></sohelp-entity-form>
-    <template #footer v-if="!toolbarButtonParams?.readonly">
-      <el-button @click="closeEntityForm()">{{ t("common.close") }}</el-button>
-      <el-button type="primary" @click="saveEntityForm()" v-loading="loading">{{ t("common.save") }}</el-button>
+      <sohelp-entity-form
+ref="entityFormRef"
+                          :refid="props.refid"
+                          v-model="entityFormValue"
+                          :data="entityFormData"
+                          :config="entityFormConfig"
+                          :readonly="toolbarButtonParams?.readonly"
+      />
+      <template #footer v-if="!toolbarButtonParams?.readonly">
+        <el-button @click="closeEntityForm()">{{ t("common.close") }}</el-button>
+        <el-button type="primary" @click="saveEntityForm()" v-loading="loading">{{ t("common.save") }}</el-button>
+      </template>
+    </sohelp-modal>
+    <!--打印报表-->
+    <ele-modal
+:title="toolbarButtonParams?.title|| t('grid.report.title')" :width="toolbarButtonParams?.width|| 600"
+               v-model="visibleReport">
+
+    <ele-check-card v-model="currentReportValue" :items="reportData" :row="{ gutter: 2 }">
+      <template #item="{ item }">
+        <ele-text size="md" style="padding:10px;">{{ item.name }}</ele-text>
+      </template>
+    </ele-check-card>
+
+    <template #footer>
+      <el-button @click="closeReport()">{{ t("common.close") }}</el-button>
+      <el-button @click="designReport()" v-if="reportData && reportData.length>0">{{ t("common.design") }}</el-button>
+      <el-button type="primary" @click="openReport()" v-if="reportData && reportData.length>0">{{ t("common.print") }}
+      </el-button>
     </template>
-</sohelp-modal>
-<!--打印报表-->
-<ele-modal :title="toolbarButtonParams?.title|| t('grid.report.title')" :width="toolbarButtonParams?.width|| 600"
-           v-model="visibleReport">
-
-<ele-check-card v-model="currentReportValue" :items="reportData" :row="{ gutter: 2 }">
-  <template #item="{ item }">
-    <ele-text size="md" style="padding:10px;">{{ item.name }}</ele-text>
+    </ele-modal>
+    <!--数据导入-->
+    <sohelp-import
+      :model-value="importVisible"
+      :refid="props.refid"
+      :fields="sohelpConfig?.properties || []"
+      @update:modelValue="(v) => importVisible = v"
+      @close="closeImport"
+    />
   </template>
-</ele-check-card>
-
-<template #footer>
-  <el-button @click="closeReport()">{{ t("common.close") }}</el-button>
-  <el-button @click="designReport()" v-if="reportData && reportData.length>0">{{ t("common.design") }}</el-button>
-  <el-button type="primary" @click="openReport()" v-if="reportData && reportData.length>0">{{ t("common.print") }}
-  </el-button>
-</template>
-</ele-modal>
-</template>
 
 <style scoped lang="scss">
 .sohelp-grid-view {
@@ -1962,4 +2152,6 @@ defineExpose({
 
 
 
+
+
 </style>