sohelp-eleplus 1.1.22 → 1.1.25

package/sohelp-grid/index.vue

@@ -35,7 +35,7 @@ const { t } = useI18n();
 const { mobile } = useMobile();
 const permission = usePermission();
 const props = defineProps({ ...JSON.parse(JSON.stringify(DefaultProps)) });
-const emit = defineEmits(["resetFilter", "checkboxAll", "checkboxChange", "toolbarButtonClick", "operationButtonClick", "menuRightClick", "showFilter", "editClosed", "currentColumnChange"]);
+const emit = defineEmits(["resetFilter", "checkboxAll", "checkboxChange","radioChange", "toolbarButtonClick", "operationButtonClick", "menuRightClick", "showFilter", "editClosed", "currentColumnChange"]);
 const drawerKey = ref(0);
 const todoDrawerRef = ref(null);
 const drawerVisible = ref(false);
@@ -57,6 +57,17 @@ const getId = () => {
   return 'sohelp-grid-' + uuid();
 }
 
+/** 对齐方式映射 */
+const getAlign = (align) => {
+  const alignMap = {
+    'left': 'flex-start',
+    'center': 'center',
+    'right': 'flex-end',
+    '': 'flex-start'
+  };
+  return alignMap[align] || 'flex-start';
+}
+
 const loadReport = () => {
   SohelpHttp.get("/engine/web/report/list", { refid: props.refid }).then(res => {
     if (res.meta.success) {
@@ -120,7 +131,7 @@ const saveEntityForm = async () => {
   const v = await entityFormRef.value.validate();
   if(v){
     loading.value = true;
-      entityFormRef.value.save({}, (res) => {
+      entityFormRef.value.save(props.saveParams, (res) => {
         loading.value = false;
         if (res.meta.success) {
           refresh();
@@ -129,7 +140,7 @@ const saveEntityForm = async () => {
           EleMessage.error(res.meta.message);
         }
       });
-  }  
+  }
 };
 
 //配置加载状态
@@ -450,6 +461,8 @@ const loadConfig = (param = {}) => {
       //工具栏按钮权限
       Object.assign(formulaMap, config.formulaMap);
       Object.assign(gridOptions, config.gridOptions);
+
+
       // 过滤位置
       config.sohelpConfig.filter.config._visibleFilter = config.sohelpConfig?.filter.config.visibleFilter || false;
       sohelpConfig.value = { ...config.sohelpConfig };
@@ -524,13 +537,10 @@ const load = async (params = {}, callback) => {
 
     if (res?.meta?.success) {
       if (res.data) {
-        gridOptions.pagerConfig.total = Number(res.data?.total); 
-        
-        const _data = res.data?.results || res.data || [];
+        gridOptions.pagerConfig.total = Number(res.data?.total);
 
+        const _data = res.data?.results || res.data || [];
         Object.assign(gridData, JSON.parse(JSON.stringify(_data)));
-
-
         gridValue.value = switchGridValue(_data);
         $grid.loadData(gridValue.value);
         Object.assign(summaryData, res.data?.summary || {});
@@ -552,18 +562,15 @@ const load = async (params = {}, callback) => {
     }
   }
 
+  emit('pageChange', gridOptions.pagerConfig);
 };
 
 /**
  * 重新加载数据
  */
 const reload = async (params = {}) => {
-  //取消选中
-  selections.value = [];
-  sohelpVxeGridRef.value?.clearCheckboxRow();
-
   Object.assign(gridOptions.params, params);
-  load(gridOptions.params);
+  await load(gridOptions.params);
 };
 
 
@@ -612,11 +619,12 @@ const updateSummary = (data, summaryMap = {}) => {
 /**
  * 分页事件
  */
-const pageChangeEvent = (page) => {
+const pageChangeEvent = async (page) => {
   isPage.value = true;
   gridOptions.pagerConfig.currentPage = page.currentPage;
   gridOptions.pagerConfig.pageSize = page.pageSize;
-  reload();
+  await reload();
+  emit('pageChange',gridOptions.pagerConfig)
 };
 
 
@@ -635,12 +643,14 @@ const getOperationButtonsByType = computed(() => {
       } 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 common.map((button) => {
+        // 创建新对象，避免修改原按钮配置
+        const newButton = { ...button };
+        if(newButton.render && newButton.render?.length > 0) {
+          const func = new Function("$row","$button","$column","$grid", `return (async () => { ${newButton.render} })()`);
+          func.call(undefined, row, newButton, column, $grid);
         }
-        return item;
+        return newButton;
       });
     }
     return [];
@@ -652,14 +662,15 @@ const getOperationButtonsByType = computed(() => {
  * @param row
  * @param item
  */
-const operationHandler = ({ item, row, $grid }) => {
+const operationHandler = ({ button, row, $grid }) => {
+
 
   //操作栏事件执行
   $grid.reload = reload;
   $grid.refresh = refresh;
-  if (item.handler && typeof item.handler === "string") {
+  if (button.handler && typeof button.handler === "string") {
     try {
-      const func = new Function("row", "$grid", `return (async () => { ${item.handler} })()`);
+      const func = new Function("$row", "$grid", `return (async () => { ${button.handler} })()`);
       (async () => {
         const context = {
           $message: EleMessage,
@@ -681,22 +692,22 @@ const operationHandler = ({ item, row, $grid }) => {
     } catch (e) {
       EleMessage.error(`操作栏事件出错:${e.message}`);
     }
-  } else if (item.refid) {
-    if (item.openType === "tab") {
-      window.$SohelpModule.openTab(item.refid, { id: row.id }, item.params || {});
-    } else if (item.openType === "drawer") {
-      window.$SohelpModule.openDrawer(item.refid, { id: row.id }, item.params || {});
+  } else if (button.refid) {
+    if (button.openType === "tab") {
+      window.$SohelpModule.openTab(button.refid, { id: row.id }, button.params || {});
+    } else if (button.openType === "drawer") {
+      window.$SohelpModule.openDrawer(button.refid, { id: row.id }, button.params || {});
     } else {
-      window.$SohelpModule.openModal(item.refid, { id: row.id }, item.params || {});
+      window.$SohelpModule.openModal(button.refid, { id: row.id }, button.params || {});
     }
   } else {
-    switch (item.code) {
+    switch (button.code) {
       case "row.delete":
         $grid?.remove(row)
         break;
       case "crud.edit":
         visibleEntityForm.value = true;
-        toolbarButtonParams.value = item.params || {};
+        toolbarButtonParams.value = button.params || {};
         if (!toolbarButtonParams.value["title"]) {
           toolbarButtonParams.value["title"] = t("grid.toolbar.edit");
         }
@@ -717,7 +728,7 @@ const operationHandler = ({ item, row, $grid }) => {
         break;
       case "crud.view":
         visibleEntityForm.value = true;
-        toolbarButtonParams.value = item.params || {};
+        toolbarButtonParams.value = button.params || {};
         if (!toolbarButtonParams.value["title"]) {
           toolbarButtonParams.value["title"] = t("grid.toolbar.view");
         }
@@ -753,9 +764,10 @@ const operationHandler = ({ item, row, $grid }) => {
         break;
     }
   }
-  emit("operationButtonClick", { item, row, $grid });
+  emit("operationButtonClick", { button, row, $grid });
 };
 
+
 /**
  * 获取表格数据
  */
@@ -920,11 +932,18 @@ const textareaCancel = () => {
 /**
  * checkbox复选框
  */
-const onCheckboxChange = () => {
+const onCheckboxChange = (checked, type) => {
   selections.value = sohelpVxeGridRef.value?.getCheckboxRecords() || [];
-  emit("checkbox-change", selections.value);
+  emit("checkbox-change", selections.value, checked, type);
 };
 
+/**
+ *
+ */
+const radioChange = (config) => {
+  emit('radio-change', config)
+}
+
 
 /**
  * 确定 SohelpTextareaInput 弹窗
@@ -1141,8 +1160,7 @@ const gridEvents = {
   toolbarButtonClick(config) {
     toolbarClick(config);
     emit("toolbarButtonClick", config, selections.value);
-  }
-
+  },
 };
 
 /**
@@ -1236,13 +1254,6 @@ const filterVisible = ({ column, field, visible }) => {
       }]);
     }
 
-    // $grid.updateFilterOptionStatus({
-    //   label: field,
-    //   value: "123",
-    //   data: 456
-    // }, true);
-
-
   }
 };
 
@@ -1487,6 +1498,39 @@ const settingClick = (command) => {
     window.open(url[command],'_blank');
   }
 }
+/**
+ * 设置复选框行键
+ * @param row 行数据
+ * @param checked 是否选中
+ */
+const setCheckboxRowKey = (row, checked) => {
+  nextTick(() => {
+    sohelpVxeGridRef.value?.setCheckboxRowKey(row, checked);
+  })
+}
+
+
+const setRadioRowKey = (key, checked) => {
+  nextTick(() => {
+    sohelpVxeGridRef.value?.setRadioRowKey(key, checked);
+  })
+}
+
+/**
+ * 获取选中的记录
+ */
+const getCheckboxRecords = () => {
+  return sohelpVxeGridRef.value?.getCheckboxRecords();
+};
+/**
+ * 获取保留的记录
+ */
+const getCheckboxReserveRecords  = (isFull="false") => {
+  return sohelpVxeGridRef.value?.getCheckboxReserveRecords(isFull);
+}
+
+
+
 
 /**
  * 监听是否被选中，更新工具栏批量操作
@@ -1511,6 +1555,8 @@ watch(
     immediate: true
   });
 
+
+
 defineExpose({
   getData,
   getCrudUpdater,
@@ -1520,6 +1566,10 @@ defineExpose({
   reload,
   load,
   validate,
+  setCheckboxRowKey,
+  getCheckboxRecords,
+  getCheckboxReserveRecords,
+  setRadioRowKey,
   selections
 });
 </script>
@@ -1529,8 +1579,11 @@ defineExpose({
     v-bind="gridOptions"
     ref="sohelpVxeGridRef"
     @menuClick="menuRightClick"
-    @checkboxChange="onCheckboxChange"
-    @checkboxAll="onCheckboxChange"
+
+    @checkboxChange="({checked}) => onCheckboxChange(checked,'row')"
+    @checkboxAll="({checked}) => onCheckboxChange(checked,'all')"
+    @radioChange="radioChange"
+
     class="sohelp-grid-view"
     :id="getId()"
     v-on="gridEvents"
@@ -1607,7 +1660,7 @@ v-for="field in Object.values(propertiesMap).filter(item => item.query)" :key="f
           <sohelp-power @change="changePower" v-if="sohelpConfig?.filter?.config?.visibleDataRange"/>
         </div>
 
-        <div class="search-box" v-if="sohelpConfig?.filter?.config?.visibleKeywords">
+        <div class="search-box" v-if="sohelpConfig?.filter?.config?.visibleKeywords && sohelpConfig?.filter?.keywords.length>0 ">
           <!-- 关键字 -->
           <ele-tooltip :content="getKeywordsPlaceholder" placement="top" :offset="3">
             <sohelp-input
@@ -1646,16 +1699,16 @@ v-for="item in sortList" :key="item.title" :header="item.title"
               </ele-card>
             </div>
           </sohelp-drop-card>
-          <el-button
-:icon="Filter" size="small" @click="showFilter()"
-            plain
+          <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"/>
-          <ele-tooltip :content="'批量导入数据'" placement="top" :offset="3">
-            <el-button size="small" plain :icon="ElementPlusIcons.Upload" @click="openImport" v-permission="importAuthority"/>
+          <ele-tooltip :content="'批量导入数据'" placement="top" :offset="3" v-permission="importAuthority">
+            <el-button size="small" plain :icon="ElementPlusIcons.Upload" @click="openImport" />
           </ele-tooltip>
-          <ele-tooltip :content="'批量导出数据'" placement="top" :offset="3">
-            <el-dropdown @command="exportData" v-permission="exportAuthority">
+          <ele-tooltip :content="'批量导出数据'" placement="top" :offset="3" v-permission="exportAuthority">
+            <el-dropdown @command="exportData" >
               <el-button size="small" plain :icon="ElementPlusIcons.Download"/>
               <template #dropdown>
                 <el-dropdown-menu>
@@ -1686,103 +1739,105 @@ v-for="item in sortList" :key="item.title" :header="item.title"
       #[`default_${name}`]="{ row, column, rowIndex }"
       :key="name"
     >
+      <div style=" display: flex; justify-content: right;" :style="{ justifyContent: getAlign(propertiesMap[name].align)}">
+        
+        <!-- 字典 -->
+        <sohelp-dict
+          type="text"
+          v-model="row[name]"
+          v-if="column.type === 'SohelpDict'"
+          v-bind="column.editRender"
+        />
+        <!-- 图片 -->
+        <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-file-upload
+          v-else-if="column.type === 'SohelpFileUpload'"
+          v-model="row[name]"
+          v-bind="column.editRender"
+          :data="getCellValue(rowIndex,name)"
+          :readonly="!column.editRender.edit" 
+        />
 
+        <!-- 下拉选择表格 -->
+        <div v-else-if="column.type === 'SohelpTableSelect' || column.type === 'ORG' || column.type ==='USER'">
+          <span>{{ getTableSelectLabel(row[name], rowIndex, name, column) }}</span>
+        </div>
 
-      <sohelp-dict
-        type="text"
-        v-model="row[name]"
-        v-if="column.type === 'SohelpDict'"
-        v-bind="column.editRender"
-      />
-
-      <!-- 图片 -->
-      <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-file-upload
-        v-else-if="column.type === 'SohelpFileUpload'"
-        v-model="row[name]"
-        v-bind="column.editRender"
-        :data="getCellValue(rowIndex,name)"
-        :readonly="!column.editRender.edit"/>
-
-      <!-- 下拉选择表格 -->
-      <div v-else-if="column.type === 'SohelpTableSelect' || column.type === 'ORG' || column.type ==='USER'">
-        <span>{{ getTableSelectLabel(row[name], rowIndex, name, column) }}</span>
-      </div>
-
-      <!-- 评分 -->
-      <sohelp-rate
-        v-else-if="column.type==='SohelpRate'"
-        v-model="row[name]"
-        v-bind="column.editRender"
-        :disabled="!column.editRender.edit"
-        show-score
-        score-template="{value} 分"
-        style="width: 100%;"
-      />
-
-      <!-- 进度 -->
-      <sohelp-process
-        v-else-if="column.type==='SohelpProcess'"
-        v-model="row[name]"
-        v-bind="column.editRender"
-        style="width: 100%"
-        :readonly="!column.editRender.edit"
-      />
-
-
-      <!-- 下拉用户选择 -->
-      <div v-else-if="column.type === 'SohelpUserSelect'">
-        {{ gridData[rowIndex][name]?.["user_name"] }}
-      </div>
-
-      <!-- 下拉组织选择 -->
-      <div v-else-if="column.type === 'SohelpOrgTreeSelect'">
-        {{ gridData[rowIndex][name]?.["org_name"] }}
-      </div>
+        <!-- 评分 -->
+        <sohelp-rate
+          v-else-if="column.type==='SohelpRate'"
+          v-model="row[name]"
+          v-bind="column.editRender"
+          :disabled="!column.editRender.edit"
+          show-score
+          score-template="{value} 分"
+          style="min-width: 150px"
+        />
 
-      <!-- 开关 -->
-      <div v-else-if="column.type==='SohelpSwitch' || column.type === 'SohelpCheckbox'">
-        <span v-if="!column.editRender.edit">
-          {{ !!row[name] ? "V" : "" }}
-        </span>
-        <sohelp-switch
+        <!-- 进度 -->
+        <sohelp-process
+          v-else-if="column.type==='SohelpProcess'"
           v-model="row[name]"
           v-bind="column.editRender"
-          style="width: 100%;"
-          v-else
-          :activeValue="1"
-          :inactiveValue="0"
+          style="width: 100%"
+          :readonly="!column.editRender.edit"
         />
-      </div>
 
-      <!-- 文本域 -->
-      <p
-style="margin: 0;"
-         class="textarea-reference"
-         @click="showTextareaModal(column, name, row)"
-         v-bind="column.editRender"
-         v-else-if="column.type === 'SohelpTextarea'"
-      >{{ row[name] }}
-      </p>
-
-      <!-- 外键关联 -->
-      <div v-else-if="column.type === 'RELATION' || column.type === 'SohelpTableSelect'">
-        {{ gridData[rowIndex][name]?.[column?.editRender?.labelField] || "" }}
-      </div>
 
-      <!-- 富文本 -->
-      <div v-else-if="column.type === 'SohelpRichText'" v-html="row[name]"></div>
+        <!-- 下拉用户选择 -->
+        <div v-else-if="column.type === 'SohelpUserSelect'">
+          {{ gridData[rowIndex][name]?.["user_name"] }}
+        </div>
 
-      <div v-else>
-        {{ row[name] }}
-      </div>
+        <!-- 下拉组织选择 -->
+        <div v-else-if="column.type === 'SohelpOrgTreeSelect'">
+          {{ gridData[rowIndex][name]?.["org_name"] }}
+        </div>
 
+        <!-- 开关 -->
+        <div v-else-if="column.type==='SohelpSwitch' || column.type === 'SohelpCheckbox'">
+          <span v-if="!column.editRender.edit">
+            {{ !!row[name] ? "V" : "" }}
+          </span>
+          <sohelp-switch
+            v-model="row[name]"
+            v-bind="column.editRender"
+            style="width: 100%;"
+            v-else
+            :activeValue="1"
+            :inactiveValue="0"
+          />
+        </div>
+
+        <!-- 文本域 -->
+        <p
+          style="margin: 0;"
+          class="textarea-reference"
+          @click="showTextareaModal(column, name, row)"
+          v-bind="column.editRender"
+          v-else-if="column.type === 'SohelpTextarea'"
+        >{{ row[name] }}
+        </p>
+
+        <!-- 外键关联 -->
+        <div v-else-if="column.type === 'RELATION' || column.type === 'SohelpTableSelect'">
+          {{ gridData[rowIndex][name]?.[column?.editRender?.labelField] || "" }}
+        </div>
+
+        <!-- 富文本 -->
+        <div v-else-if="column.type === 'SohelpRichText'" v-html="row[name]"></div>
+
+        <div v-else>
+          {{ row[name] }}
+        </div>
+      </div>
     </template>
 
     <!-- 可编辑状态 -->
@@ -1793,17 +1848,15 @@ style="margin: 0;"
     >
       <div v-if="column.editRender.enabled">
         <!-- 字典 -->
-        <!--        <sohelp-dict-->
-        <!--          v-model="row[name]"-->
-        <!--          :code="column.dict"-->
-        <!--          v-if="column.type === 'SohelpDict'"-->
-        <!--          v-bind="column.editRender"-->
-        <!--          style="width: 100%;"-->
-        <!--          :visible="true"-->
-        <!--        />-->
-        <div v-if="column.type === 'SohelpDict'">
-          {{ column }}
-        </div>
+        <sohelp-dict
+          v-model="row[name]"
+          :code="column.dict"
+          v-if="column.type === 'SohelpDict'"
+          v-bind="column.editRender"
+          style="width: 100%;"
+          :visible="true"
+        />
+
 
         <!-- 下拉用户选择 -->
         <sohelp-number-input
@@ -1838,12 +1891,11 @@ style="margin: 0;"
           :datasource="orgDatasource"
         />
 
-        <!-- 外键关联 -->
-        <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 v-else-if="column.type==='SohelpTableSelect'"
+          v-model="row[name]"
+          v-model:data="gridData[rowIndex][name]"
+          v-bind="column.editRender"
         />
 
         <!-- 数值 -->
@@ -1875,7 +1927,7 @@ v-else-if="column.type==='SohelpTableSelect'"
           :key="item.code"
           :type="item.code === 'crud.delete' ? 'danger' : 'primary'"
           v-bind="item.params"
-          @click="operationHandler({item:item, row:row,$grid:sohelpVxeGridRef})"
+          @click="operationHandler({button:item, row:row,$grid:sohelpVxeGridRef})"
         >
           <el-icon v-if="item.icon" style="margin-right: 5px;">
             <component :is="ElementPlusIcons[item.icon]" v-if="ElementPlusIcons[item.icon]" />
@@ -1896,7 +1948,7 @@ v-else-if="column.type==='SohelpTableSelect'"
             <el-dropdown-menu>
               <el-dropdown-item
 v-for="item in getOperationButtonsByType(row, column, 'more')" :key="item.code"
-                                @click.stop="operationHandler({item:item, row:row,$grid:sohelpVxeGridRef})"
+                                @click.stop="operationHandler({button: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]" />
@@ -1928,8 +1980,6 @@ v-for="item in getOperationButtonsByType(row, column, 'more')" :key="item.code"
 
 
 <template v-for="(_,name) in $slots" #[name]="{row, column}">
-
-
     <slot :name="name" :row="getRowDataByField(column,row)" :column="column"></slot>
   </template>
 
@@ -1982,14 +2032,8 @@ v-for="item in getOperationButtonsByType(row, column, 'more')" :key="item.code"
               </template>
 
 
-      <sohelp-entity-form
-ref="entityFormRef"
-                          :refid="props.refid.split('!')[0]"
-                          v-model="entityFormValue"
-                          :data="entityFormData"
-                          :config="entityFormConfig"
-                          :readonly="toolbarButtonParams?.readonly"
-      />
+      <sohelp-entity-form ref="entityFormRef" :refid="props.refid.split('!')[0]" v-model="entityFormValue"
+      :data="entityFormData" :config="entityFormConfig" :readonly="toolbarButtonParams?.readonly" :saveParams="saveParams" />
       <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>
@@ -2171,8 +2215,8 @@ ref="entityFormRef"
         text-align: left;
       }
     }
-    
-   } 
+
+   }
   }
 }
 

package/sohelp-grid/js/DefaultGridOptions.js

@@ -40,7 +40,7 @@ export default {
   editConfig: {
     trigger: 'click',
     mode: 'cell',
-    autoClear: false,
+    autoClear: true,
     autoFocus: true,
     showInsertStatus: true,
     showUpdateStatus: true

package/sohelp-grid/js/DefaultProps.js

@@ -23,5 +23,9 @@ export default {
   isEntityGrid: {
     type: Boolean,
     default: false
+  },
+  saveParams: {
+    type: Object,
+    default: () => ({})
   }
-}
+};