sohelp-eleplus 1.1.20 → 1.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sohelp-eleplus",
-  "version": "1.1.20",
+  "version": "1.1.21",
   "description": "SohelpEleplus Extension Components",
   "public": true,
   "main": "index.js",

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

@@ -116,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"

package/sohelp-grid/index.vue

@@ -201,6 +201,18 @@ 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;
+  }
+}
+
 /**
  * 获取关键字描述
  */
@@ -414,6 +426,7 @@ const loadConfig = (param = {}) => {
       /**配置刷新功能 */
       config.gridOptions = {
         ...config.gridOptions,
+        params: gridOptions.params ?? {},
         toolbarConfig: {
           ...config.gridOptions?.toolbarConfig,
           refresh: true,
@@ -427,6 +440,7 @@ const loadConfig = (param = {}) => {
         }
       };
 
+
       //工具栏按钮权限
       Object.assign(formulaMap, config.formulaMap);
       Object.assign(gridOptions, config.gridOptions);
@@ -475,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) {
@@ -482,6 +497,7 @@ const load = async (params = {}, callback) => {
       return { results: [], total: 0 };
     }
 
+
     let pageConfig = {};
     // 是否分页
     if (gridOptions.pagerConfig?.enabled) {
@@ -499,6 +515,7 @@ const load = async (params = {}, callback) => {
     });
 
 
+
     if (res?.meta?.success) {
       if (res.data) {
         gridOptions.pagerConfig.total = Number(res.data.total);
@@ -523,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);
 };
@@ -620,7 +642,10 @@ const getOperationButtonsByType = 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} })()`);
@@ -649,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 || {};
@@ -666,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);
@@ -697,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;
@@ -755,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;
@@ -915,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
   };
 };
 
@@ -947,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: "确定",
@@ -982,7 +1021,6 @@ const toolbarClick = async ({ button }) => {
   let rowIndex = -1;
   const row = {};
 
-
   const current = $grid?.getCurrentRecord();
   if (current) {
     rowIndex = $grid?.getVTRowIndex(current);
@@ -1026,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);
@@ -1088,7 +1129,7 @@ const gridEvents = {
 
   toolbarButtonClick(config) {
     toolbarClick(config);
-    emit("toolbarButtonClick", config);
+    emit("toolbarButtonClick", config, selections.value);
   }
 
 };
@@ -1583,12 +1624,12 @@ v-for="item in sortList" :key="item.title" :header="item.title"
                   <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"
                             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>
@@ -1635,6 +1676,7 @@ v-for="item in sortList" :key="item.title" :header="item.title"
       :key="name"
     >
 
+
       <sohelp-dict
         type="text"
         v-model="row[name]"
@@ -1872,6 +1914,14 @@ v-for="item in getOperationButtonsByType(row, column, 'more')" :key="item.code"
 <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 -->
@@ -1920,9 +1970,10 @@ v-for="item in getOperationButtonsByType(row, column, 'more')" :key="item.code"
                 </ele-dropdown>
               </template>
 
+
       <sohelp-entity-form
 ref="entityFormRef"
-                          :refid="props.refid.split('!')[0]"
+                          :refid="props.refid"
                           v-model="entityFormValue"
                           :data="entityFormData"
                           :config="entityFormConfig"

package/sohelp-grid/js/useSohelpGridConfig.js

@@ -89,8 +89,9 @@ const switchVxeProperty = (property, sortList, f, formulaMap) => {
     editor.editRender.maxlength = property.length;
   }
 
-  if (property.dict) {
-    editor.editRender['code'] = property.dict;
+  // 字典
+  if (property.type === 'SohelpDict') {
+    editor.editRender['code'] = property.editRender?.code || property.dict;
   }
 
   // 取默认显示值
@@ -171,7 +172,7 @@ const filterFieldsByProperties = (_data) => {
   data.filter.field = filterArray(data.filter.field, 'name');
 
   //过滤掉不在列表中的sort属性
-  data.filter.sort = filterArray(data.filter.sort.filter((item) => data.filter.field.some((f) => f.name === item)));
+  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);
   return data;
 };
@@ -284,6 +285,23 @@ export function useSohelpGridConfig() {
    */
   const isConfigInitialized = ref(false);
   const { t } = useI18n();
+  /**
+   * placeholder占位符映射
+   */
+  const placeholderMap = {
+    SohelpSelect: '请选择ss',
+    SohelpTreeSelect: '请选择',
+    SohelpDict: '请选择',
+    SohelpUserSelect: '请选择用户',
+    SohelpDeptSelect: '请选择部门',
+    SohelpRoleSelect: '请选择角色',
+    SohelpDatePicker: '请选择日期',
+    SohelpTimePicker: '请选择时间',
+    SohelpDateTimePicker: '请选择日期时间',
+    SohelpInput: '请输入',
+    SohelpNumberInput: '请输入'
+  };
+
   /**
    * 初始化商邦网格列表配置
    */
@@ -318,6 +336,7 @@ export function useSohelpGridConfig() {
               console.error('解析editorParam失败:', e);
             }
           }
+          param.placeholder = param?.placeholder || placeholderMap[cur?.editor] || '';
           acc[cur.name] = { ...cur, editorParam: param };
           return acc;
         }, {})

package/sohelp-grid-view/filter/config/grid-filter-condition.vue

@@ -9,11 +9,7 @@
         <el-option label="满足所有条件" value="and" />
         <el-option label="满足任一条件" value="or" />
       </el-select>
-      <el-icon
-        @click="addSubCondition(0)"
-        style="margin-left: 10px; cursor: pointer"
-        size="24"
-      >
+      <el-icon @click="addSubCondition(0)" style="margin-left: 10px; cursor: pointer" size="24">
         <Fold />
       </el-icon>
       <el-dropdown trigger="click">
@@ -22,11 +18,7 @@
         </el-icon>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              @click="addCondition(item)"
-              v-for="item in fields"
-              >{{ item.label }}</el-dropdown-item
-            >
+            <el-dropdown-item @click="addCondition(item)" v-for="item in fields">{{ item.label }}</el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
@@ -35,39 +27,19 @@
       v-if="obj.children && obj.children.length"
       v-for="(item, index) in obj.children"
       :style="{
-        borderLeft:
-          obj.type === 'and' ? '4px solid #38c10b' : '4px solid #c59d0a'
+        borderLeft: obj.type === 'and' ? '4px solid #38c10b' : '4px solid #c59d0a'
       }"
     >
-      <div
-        v-if="!item.type"
-        style="
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          padding: 10px;
-        "
-      >
+      <div v-if="!item.type" style="display: flex; align-items: center; justify-content: space-between; padding: 10px">
         <div style="display: flex; align-items: center; width: 240px">
-          <div style="font-size: 16px; margin-right: 10px">{{
-            item.label
-          }}</div>
-          <select
-            v-model="item.comparison"
-            style="border: none; width: auto; background-color: #dedede"
-          >
-            <option v-for="op in options" :value="op.value">{{
-              op.label
-            }}</option>
+          <div style="font-size: 16px; margin-right: 10px">{{ item.label }}</div>
+          <select v-model="item.comparison" style="border: none; width: auto; background-color: #dedede">
+            <option v-for="op in options" :value="op.value">{{ op.label }}</option>
           </select>
         </div>
         <div style="display: flex; align-items: center">
           <el-input v-model="item.value" placeholder="请输入" />
-          <el-icon
-            @click="removeCondition(index)"
-            style="margin-left: 8px"
-            size="20"
-          >
+          <el-icon @click="removeCondition(index)" style="margin-left: 8px" size="20">
             <Delete />
           </el-icon>
         </div>
@@ -185,7 +157,6 @@
           });
         }
 
-
         data.push(row);
         this.obj.children = data.concat(datato);
       },

package/sohelp-grid-view/filter/config/index.vue

@@ -32,10 +32,7 @@
           ></grid-filter-keywords>
         </template>
         <template #scheme>
-          <grid-filter-scheme
-            v-model="filterConfig.filter.scheme"
-            :properties="propertiesArray"
-          ></grid-filter-scheme>
+          <grid-filter-scheme v-model="filterConfig.filter.scheme" :properties="propertiesArray"></grid-filter-scheme>
         </template>
         <template #config>
           <grid-filter-config v-model="filterConfig"></grid-filter-config>
@@ -50,7 +47,7 @@
   </ele-modal>
 </template>
 <script setup>
-import { defineProps, onMounted, ref, watch } from "vue";
+  import { defineProps, onMounted, ref, watch } from 'vue';
 
   import GridFilterField from './grid-filter-field.vue';
   import GridFilterSort from './grid-filter-sort.vue';
@@ -75,7 +72,6 @@ import { defineProps, onMounted, ref, watch } from "vue";
   const tabsKey = ref(0);
   const propertiesArray = ref([]);
 
-
   const gridActiveTab = ref('list');
   const gridTabs = [
     {
@@ -97,7 +93,8 @@ import { defineProps, onMounted, ref, watch } from "vue";
     {
       name: 'scheme',
       label: '筛选场景'
-    },{
+    },
+    {
       name: 'config',
       label: '基本配置'
     }
@@ -115,7 +112,7 @@ import { defineProps, onMounted, ref, watch } from "vue";
     }
   );
 
-  onMounted(()=>{
+  onMounted(() => {
     originFilterConfigValue.value = JSON.parse(JSON.stringify(props.config));
     propertiesArray.value = props.config?.properties
       ?.map(({ name, label, hidden }) => {
@@ -165,7 +162,7 @@ import { defineProps, onMounted, ref, watch } from "vue";
     if (res.meta.success) {
       emit('update:modelValue', false);
       moduleCache.clear();
-      emit('done',filterConfig.value);
+      emit('done', filterConfig.value);
       ElMessage.success(res?.meta.message || '操作成功');
     } else {
       ElMessage.error(res?.meta.message || '操作成功');

package/sohelp-grid-view/filter/filter-form.vue

@@ -32,7 +32,8 @@
         :properties="propertiesMap?.[item.name]"
         :ref="(el) => setItemRef(el, item.name)"
       ></filter-condition-item>
-
+    </div>
+    <template #footer>
       <div
         class="footer-top-right"
         v-if="filterList.length > 0 && config.filter?.config.filterPosition !== 'MODAL'"
@@ -54,7 +55,7 @@
           <ele-text size="xs" :icon="Minus" v-else> 收缩</ele-text>
         </el-link>
       </div>
-    </div>
+    </template>
   </ele-card>
 </template>
 
@@ -164,7 +165,7 @@
     if (filterPosition?.toUpperCase() === 'TOP') {
       maxRowsConfig.current.index = filterList.value.length;
       maxRowsConfig.height = advancedBoxRef.value?.offsetHeight + 'px';
-      const advancedRow = advancedBoxRef.value.querySelector('.sohelp-filter-condition');
+      const advancedRow = advancedBoxRef.value?.querySelector('.sohelp-filter-condition');
       if (advancedRow) {
         maxRowsConfig.rowHeight = advancedRow.offsetHeight;
       }
@@ -279,13 +280,11 @@
         }
       }
     }
-
-    .footer-top-right {
-      text-align: right;
-      margin-left: auto;
-    }
   }
-
+  .footer-top-right {
+    text-align: right;
+    margin-left: auto;
+  }
   .sohelp-filter {
     .footer-right {
       display: flex;
@@ -376,7 +375,7 @@
 
   .sohelp-filter.right {
     width: 100%;
-    height: calc(100% - 70px);
+    height: calc(100% - 25px);
     padding-left: 10px;
     margin-left: 0px;
     box-sizing: border-box;
@@ -393,8 +392,7 @@
 
     :deep(.ele-card-footer) {
       width: calc(100% - 30px);
-      background: #fff;
-      z-index: 99999;
+      z-index: 999;
       bottom: 0px;
       position: absolute;
     }
@@ -422,7 +420,7 @@
 
   .sohelp-filter.right :deep(.ele-card-body) {
     flex: 1;
-    max-height: calc(100% - 75px);
+    height: 100%;
   }
 
   .sohelp-filter.modal :deep(.ele-card-body) {

package/sohelp-grid-view/index.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed, nextTick, reactive, ref, watch } from "vue";
+  import { computed, nextTick, reactive, ref, watch } from 'vue';
   import { useMobile } from '@/utils/use-mobile';
   import SohelpFilter from './filter/index.vue';
   import SohelpGrid from '../sohelp-grid/index.vue';
@@ -106,8 +106,8 @@ import { computed, nextTick, reactive, ref, watch } from "vue";
   });
 
   //工具栏按钮点击事件
-  const toolbarButtonClick = (config) => {
-    emit('toolbarButtonClick', config);
+  const toolbarButtonClick = (config, rows) => {
+    emit('toolbarButtonClick', config, rows);
   };
   //右击菜单按钮点击事件
   const menuRightClick = (config) => {
@@ -138,8 +138,8 @@ import { computed, nextTick, reactive, ref, watch } from "vue";
    * @param params
    * @param callback
    */
-  const load =  (params = {}, callback) => {
-       sohelpGridRef.value.load(params, callback);
+  const load = (params = {}, callback) => {
+    sohelpGridRef.value.load(params, callback);
   };
   /**
    * 刷新数据
@@ -258,7 +258,11 @@ import { computed, nextTick, reactive, ref, watch } from "vue";
           @operationButtonClick="operationButtonClick"
           @editClosed="editClosed"
           @currentColumnChange="currentColumnChange"
-        ></sohelp-grid>
+        >
+          <template v-for="(_, name) in $slots" #[name]="slotProps">
+            <slot :name="name" v-bind="slotProps" />
+          </template>
+        </sohelp-grid>
       </template>
     </ele-split-panel>
   </div>

package/sohelp-import/index.vue

@@ -6,8 +6,8 @@
           <ele-text>支持文件格式：xls、xlsx；大小 ≤ 50MB；最多 10,000 行</ele-text>
         </div>
         <div class="actions">
-          <el-button type="primary" plain :loading="downloadingTemplate" @click="downloadTemplate">下载导入模板</el-button>
-          <el-button plain @click="openConfig">配置导入列表</el-button>
+          <el-button plain :loading="downloadingTemplate" @click="downloadTemplate">下载导入模板</el-button>
+          <el-button plain @click="openConfig" v-if="false">配置导入列表</el-button>
           <el-link :underline="false" @click="viewHistory">查看导入历史</el-link>
         </div>
       </div>

package/sohelp-modal/index.vue

@@ -38,6 +38,7 @@
   });
 
   const confirm = () => {
+    close();
     emit('confirm');
   };
   const cancel = () => {

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

@@ -326,6 +326,7 @@
       v-bind="item.props || {}"
       @="item.props || {}"
       v-model="model[item.prop]"
+      :disabled="readonly"
     >
     </SohelpRichText>
 

package/sohelp-rich-text/index.vue

@@ -5,15 +5,7 @@
 </template>
 
 <script setup>
-  import {
-    watch,
-    onMounted,
-    onBeforeUnmount,
-    onActivated,
-    onDeactivated,
-    nextTick,
-    useAttrs
-  } from 'vue';
+  import { watch, onMounted, onBeforeUnmount, onActivated, onDeactivated, nextTick, useAttrs } from 'vue';
   import tinymce from 'tinymce/tinymce';
   import 'tinymce/themes/silver';
   import 'tinymce/icons/default';
@@ -46,13 +38,7 @@
   import 'tinymce/plugins/emoticons/js/emojis';
   import { storeToRefs } from 'pinia';
   import { useThemeStore } from '@/store/modules/theme';
-  import {
-    DEFAULT_CONFIG,
-    DARK_CONFIG,
-    uuid,
-    bindHandlers,
-    openAlert
-  } from './util';
+  import { DEFAULT_CONFIG, DARK_CONFIG, uuid, bindHandlers, openAlert } from './util';
 
   const props = defineProps({
     /** 编辑器唯一id */
@@ -106,11 +92,7 @@
 
   /** 修改内容 */
   const setContent = (value) => {
-    if (
-      editorIns &&
-      typeof value === 'string' &&
-      value !== editorIns.getContent()
-    ) {
+    if (editorIns && typeof value === 'string' && value !== editorIns.getContent()) {
       editorIns.setContent(value);
     }
   };

package/sohelp-vxe-grid/index.vue

@@ -6,6 +6,7 @@
       @page-change="pageChangeEvent"
       ref="sohelpVxeGridRef"
       @menuClick="menuEvents"
+      :id="getId()"
       @toolbarButtonClick="onToolbarButtonClick"
       @checkboxChange="onCheckboxChange"
       @checkboxAll="onCheckboxAllChange"
@@ -53,6 +54,7 @@
   import { merge, cloneDeep } from 'lodash-es'; // 正确导入
   import DefaultProps from './DefaultProps';
   import { Search } from '@element-plus/icons-vue';
+  import { uuid } from '../utils/core.js';
   import DefaultGridOptions from './DefaultGridOptions';
 
   /**判断配置是否初始化完毕*/
@@ -78,6 +80,11 @@
   const keywords = ref('');
   const props = defineProps(cloneDeep(DefaultProps));
 
+  /** 自动生成ID */
+  const getId = () => {
+    return 'sohelp-grid-' + uuid();
+  };
+
   /**列表实例*/
   const sohelpVxeGridRef = ref(null);