sohelp-eleplus 1.1.24 → 1.1.25

package/http/SohelpHttp.js

@@ -1,7 +1,7 @@
 /**
  * axios实例
  */
-import { ElMessageBox } from 'element-plus/es';
+import { ElMessageBox } from "element-plus/es";
 
 export const SohelpHttp = {
   /**
@@ -12,7 +12,7 @@ export const SohelpHttp = {
   },
 
   /**
-   * 下载文件
+   * 通过Get请求，下载文件
    * @param _url
    * @param param
    * @param fileName
@@ -20,9 +20,9 @@ export const SohelpHttp = {
    * @param config
    * @returns {Promise<never>}
    */
-  download: async function (_url, param, fileName, onProgress, config = {}) {
+  download: async function(_url, param, fileName, onProgress, config = {}) {
     if (window.$axios == null) {
-      console.error('请在配置main.js中配置window.$axios实例！！');
+      console.error("请在配置main.js中配置window.$axios实例！！");
       return;
     }
     try {
@@ -33,10 +33,10 @@ export const SohelpHttp = {
       const response = await window.$axios
         .get(_url, {
           params: param || {},
-          responseType: 'blob',
+          responseType: "blob",
           ...config,
           onDownloadProgress: (evt) => {
-            if (typeof onProgress === 'function') {
+            if (typeof onProgress === "function") {
               const total = evt?.total || 0;
               const loaded = evt?.loaded || 0;
               onProgress(loaded, total);
@@ -47,7 +47,7 @@ export const SohelpHttp = {
           return Promise.reject(e.message);
         });
 
-      if (response.type === 'application/json') {
+      if (response.type === "application/json") {
         try {
           const text = await response.text();
           const res = JSON.parse(text);
@@ -55,7 +55,7 @@ export const SohelpHttp = {
             return res.data;
           } else {
             if (res?.meta?.error) {
-              console.log('SohelpHttp.download:', res.meta.error);
+              console.log("SohelpHttp.download:", res.meta.error);
             }
             return Promise.reject(new Error(res.meta.message));
           }
@@ -65,12 +65,12 @@ export const SohelpHttp = {
         return;
       }
       // 创建一个链接元素用于下载
-      const url = _url + '?' + new URLSearchParams(param).toString();
+      const url = _url + "?" + new URLSearchParams(param).toString();
       // const url = window.URL.createObjectURL(response.data);
-      const link = document.createElement('a');
+      const link = document.createElement("a");
       link.href = url;
-      link.target = '_blank';
-      link.setAttribute('download', fileName); // 设置下载的文件名
+      link.target = "_blank";
+      link.setAttribute("download", fileName); // 设置下载的文件名
       document.body.appendChild(link);
 
       // 触发下载
@@ -82,22 +82,22 @@ export const SohelpHttp = {
       return Promise.reject(error);
     }
   },
-  get: function (url, param, callback) {
+  get: function(url, param, callback) {
     if (window.$axios == null) {
-      console.error('请在配置main.js中配置window.$axios实例！！');
+      console.error("请在配置main.js中配置window.$axios实例！！");
       return;
     }
     for (const key in param) {
-      if (typeof param[key] === 'object' && param[key] !== null) {
+      if (typeof param[key] === "object" && param[key] !== null) {
         param[key] = JSON.stringify(param[key]); // 转换为 JSON 字符串
       }
     }
     let promise = window.$axios.get(url, { params: param });
     return promise.then((r) => {
       if (!r.meta.success && r.meta.error) {
-        console.error('(GET请求URL):', url, '(请求参数):', param, '(返回结果):', r.meta.error);
+        console.error("(GET请求URL):", url, "(请求参数):", param, "(返回结果):", r.meta.error);
       }
-      if (typeof callback === 'function') {
+      if (typeof callback === "function") {
         callback.call(this, r);
       }
       return Promise.resolve(r);
@@ -112,17 +112,17 @@ export const SohelpHttp = {
    * @param {Function} [error] 错误回调函数（目前未使用）
    * @returns {Promise<any>} 返回Promise对象
    */
-  post: function (url, param, callback, error) {
+  post: function(url, param, callback, error) {
     if (window.$axios == null) {
-      console.error('请在配置main.js中配置window.$axios实例！');
+      console.error("请在配置main.js中配置window.$axios实例！");
       return;
     }
     let promise = window.$axios.post(url, param);
     return promise.then((r) => {
       if (!r.meta.success && r.meta.error) {
-        console.error('(GET请求URL):', url, '(请求参数):', param, '(返回结果):', r.meta.error);
+        console.error("(GET请求URL):", url, "(请求参数):", param, "(返回结果):", r.meta.error);
       }
-      if (typeof callback === 'function') {
+      if (typeof callback === "function") {
         callback.call(this, r);
       }
       return Promise.resolve(r);

package/package.json

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

package/sohelp-grid/index.vue

@@ -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) {
@@ -653,12 +664,13 @@ const getOperationButtonsByType = computed(() => {
  */
 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,
@@ -680,22 +692,22 @@ const operationHandler = ({ button, 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");
         }
@@ -716,7 +728,7 @@ const operationHandler = ({ button, 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");
         }
@@ -752,9 +764,10 @@ const operationHandler = ({ button, row, $grid }) => {
         break;
     }
   }
-  emit("operationButtonClick", { item, row, $grid });
+  emit("operationButtonClick", { button, row, $grid });
 };
 
+
 /**
  * 获取表格数据
  */
@@ -1647,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
@@ -1686,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>
@@ -1726,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-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>
 
-      <div v-else>
-        {{ row[name] }}
-      </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>
 
     <!-- 可编辑状态 -->

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/useSohelpGridConfig.js

@@ -185,7 +185,7 @@ const filterFieldsByProperties = (_data) => {
   };
 
   let validProperties = Object.fromEntries(
-    data.properties.filter((item) => item.name && !item.hidden)?.map((item) => [item.name, item.label])
+    data.properties?.filter((item) => item.name && !item.hidden)?.map((item) => [item.name, item.label])
   );
 
   data.list = filterArray(data.list).filter((item) => {
@@ -196,7 +196,7 @@ const filterFieldsByProperties = (_data) => {
 
   //过滤掉不在列表中的sort属性
   data.filter.sort = filterArray(data.filter.sort.filter((item) => data.list.some((f) => f === item)));
-  data.properties = data.properties.filter((item) => item.name && !item.hidden);
+  data.properties = data.properties?.filter((item) => item.name && !item.hidden);
 
   data.filter.field = data.filter.field.filter((item) => {
     return item.name in validProperties;
@@ -346,7 +346,7 @@ export function useSohelpGridConfig() {
     var batchButtonsIndex = -1;
     const DefaultGridOptions = reactive(deepClone(_DefaultGridOptions));
     /**获取列表配置*/
-    const config = isGridConfig ? await moduleCache.getGrid(_refid) : await moduleCache.getEntityGrid(_refid);
+    const config = await moduleCache.getGrid(_refid);
 
     if (!config) {
       throw new Error(_refid + ' : 没有发现网格列表配置!');