sohelp-eleplus 1.1.18 → 1.1.20

package/sohelp-grid/index.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { Filter, Search, Sort, SortDown, SortUp } 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";
@@ -11,17 +11,25 @@ import { ElMessageBox } from "element-plus/es";
 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";
+
 import SohelpTextareaInput from "../sohelp-textarea-input/index.vue";
 import SohelpPower from "../sohelp-power/index.vue";
 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 '../sohelp-icon-select/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();
 const { t } = useI18n();
 const { mobile } = useMobile();
@@ -36,12 +44,19 @@ const current = ref(null);
 const isPage = ref(false);
 const approvalModalVisible = ref(false);
 const approvalData = ref({});
+const userStore = useUserStore();
 
 //报表打印
 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) {
@@ -82,6 +97,9 @@ const closeReport = () => {
   visibleReport.value = false;
 };
 
+// 操作栏按钮配置
+const operationsButtons = reactive({});
+
 const loading = ref(false);
 //显示实体表单
 const visibleEntityForm = ref(false);
@@ -130,7 +148,7 @@ const propertiesMap = defineModel("propertiesMap");
 // Grid实例
 const sohelpVxeGridRef = ref(null);
 // GridOptions配置
-const gridOptions = reactive(JSON.parse(JSON.stringify(DefaultGridOptions)));
+const gridOptions = reactive(cloneDeep(DefaultGridOptions));
 const batchButtonsIndex = ref(2);
 const sortValue = ref("");
 /**
@@ -188,7 +206,7 @@ const getCellValue = (rowIndex, name) => {
  */
 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");
 });
@@ -201,6 +219,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,
@@ -321,6 +440,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 = [];
       }
@@ -468,55 +591,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 [];
+  };
+})
 
 /**
  * 行操作栏点击事件
@@ -1058,7 +1154,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, [{
@@ -1160,7 +1255,7 @@ const updateProperties = (obj, properties, key, propertiesMap) => {
  */
 const sortPropertiesInPlace = (properties, sortData) => {
   const sortOrder = {};
-  Object.entries(sortData)
+  Object.entries(sortData || {})
     .sort((a, b) => a[1] - b[1])
     .forEach(([key], index) => {
       sortOrder[key] = index;
@@ -1200,6 +1295,7 @@ const handleCustom = async ({ type, $grid }) => {
   if (type === "confirm") {
     //获取当前列配置
     const { sortData, ...columnsData } = filterUnderscoreProps($grid?.getCustomStoreData());
+
     const properties = JSON.parse(JSON.stringify([...sohelpConfig.value.properties])).map(item => {
       return {
         ...item,
@@ -1243,6 +1339,10 @@ const handleCustom = async ({ type, $grid }) => {
       EleMessage.success(message);
     }
 
+    //清除缓存
+    moduleCache?.clear();
+    loadConfig();
+
     localStorage.setItem("VXE_CUSTOM_STORE", "");
     loading.close();
   }
@@ -1310,6 +1410,32 @@ const currentColumnChange = (props) => {
   emit("currentColumnChange", props);
 };
 
+const columnCheckbox = ref(false);
+const toggleAllEvent = () => {
+  const $grid = sohelpVxeGridRef.value
+  if ($grid) {
+    $grid.toggleCustomAllCheckbox()
+  }
+}
+
+const settingClick = (command) => {
+  const baseUrl = SohelpHttp.getBaseUrl();
+  const { refid,extendEntity,name } = sohelpConfig.value;
+  if(refid && extendEntity && name){
+    const url = {
+      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');
+  }
+}
+
 /**
  * 监听是否被选中，更新工具栏批量操作
  */
@@ -1354,7 +1480,7 @@ defineExpose({
     @checkboxChange="onCheckboxChange"
     @checkboxAll="onCheckboxChange"
     class="sohelp-grid-view"
-    id="sohelp-grid"
+    :id="getId()"
     v-on="gridEvents"
     @filter-change="handleFilterChange"
     @custom="handleCustom"
@@ -1366,10 +1492,32 @@ defineExpose({
     @currentColumnChange="currentColumnChange"
     @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"/>
+          </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 }}
@@ -1382,12 +1530,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
@@ -1404,13 +1552,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>
@@ -1418,22 +1567,26 @@ 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")
                   </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")
                   </ele-text>
@@ -1441,10 +1594,35 @@ defineExpose({
               </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>
@@ -1453,7 +1631,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"
     >
 
@@ -1465,20 +1643,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'">
@@ -1503,7 +1680,7 @@ defineExpose({
         v-bind="column.editRender"
         style="width: 100%"
         :readonly="!column.editRender.edit"
-      ></sohelp-process>
+      />
 
 
       <!-- 下拉用户选择 -->
@@ -1532,7 +1709,8 @@ defineExpose({
       </div>
 
       <!-- 文本域 -->
-      <p style="margin: 0;"
+      <p
+style="margin: 0;"
          class="textarea-reference"
          @click="showTextareaModal(column, name, row)"
          v-bind="column.editRender"
@@ -1557,7 +1735,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">
@@ -1608,11 +1786,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
@@ -1636,10 +1815,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"
@@ -1653,7 +1832,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;">
@@ -1662,8 +1841,9 @@ defineExpose({
           </el-link>
           <template #dropdown>
             <el-dropdown-menu>
-              <el-dropdown-item v-for="item in getOperationButtonsByType(row,'more')" :key="item.code"
-                                @click="operationHandler({item:item, row:row,$grid:sohelpVxeGridRef})"
+              <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">
                   <component :is="ElementPlusIcons[item.icon]" v-if="ElementPlusIcons[item.icon]" />
@@ -1682,7 +1862,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>
@@ -1701,7 +1881,7 @@ defineExpose({
   :showOpera="false"
   ref="todoDrawerRef"
   :key="drawerKey"
-></workflow-drawer>
+/>
 
 <!-- 提交审批 -->
 <approval-modal
@@ -1709,51 +1889,77 @@ 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>
-
-<!--实体表单-->
-<ele-modal :title="toolbarButtonParams?.title || ''"
-           :width="toolbarButtonParams?.width || 860"
-           v-model="visibleEntityForm" v-loading="loading">
-<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>
-</template>
-</ele-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>
+    </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>
 
-<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>
+      <sohelp-entity-form
+ref="entityFormRef"
+                          :refid="props.refid.split('!')[0]"
+                          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>
+    </ele-modal>
+    <!--数据导入-->
+    <sohelp-import
+      :model-value="importVisible"
+      :refid="props.refid"
+      :fields="sohelpConfig?.properties || []"
+      @update:modelValue="(v) => importVisible = v"
+      @close="closeImport"
+    />
+  </template>
 
 <style scoped lang="scss">
 .sohelp-grid-view {
@@ -1886,5 +2092,15 @@ defineExpose({
   }
 }
 
+.column-setting{
+  padding: 5px 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+
+
+
 
 </style>