sohelp-eleplus 1.1.17 → 1.1.19

package/README.md

@@ -3,6 +3,30 @@
 * 2) npm install sohelp-eleplus
 
 # 相关依赖
+* 1) Element-Plus
+* 2) Admin-Element-Plus
+
+
+# 如何开发调试
+
+通过npm link进行安装关联
+
+```
+# 关联连接
+npm link sohelp-eleplus
+
+# 导入组件库
+import SohelpEleplus from 'sohelp-eleplus';
+
+# 导入样式
+import 'sohelp-eleplus/style/index.scss';
+
+
+# 全局安装注册组件库
+app.use(SohelpEleplus);
+
+```
+
 
 
 # 如何发布

package/cache/ModuleCache.js

@@ -71,16 +71,6 @@ class ModuleCache {
       }
     }
 
-    /**初始化实体列表*/
-    const entityGrid = moduleData?.entityGrid;
-    if (entityGrid) {
-      for (const key in entityGrid) {
-        const grid = entityGrid[key];
-        if (grid && grid.refid) {
-          this.setEntityGrid(grid.refid, grid);
-        }
-      }
-    }
 
     /**初始化工作流列表*/
     const workflowList = moduleData?.workflow;
@@ -142,16 +132,7 @@ class ModuleCache {
     this.gridCache.set(refid, value);
   }
 
-  /**
-   * 设置实体网格缓存
-   *
-   * @param {string} refid - 实体网格的引用ID
-   * @param {any} value - 要设置的缓存值
-   */
-  setEntityGrid(refid, value) {
-    if (!refid) return;
-    this.entityGridCache.set(refid, value);
-  }
+
 
   /**
    * 设置实体表单的值
@@ -214,18 +195,7 @@ class ModuleCache {
     return this.layoutCache.has(refid) ? this.layoutCache.get(refid) : null;
   }
 
-  /**
-   * 异步获取实体网格数据
-   *
-   * @param refid 模块引用ID
-   * @returns 返回对应refid的实体网格数据，如果不存在则返回null
-   */
-  async getEntityGrid(refid) {
-    if (!this.hasModule(refid)) {
-      await this.init(refid);
-    }
-    return this.entityGridCache.has(refid) ? this.entityGridCache.get(refid) : null;
-  }
+
 
   /**
    * 获取实体表单

package/package.json

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

package/sohelp-entity-grid/index.vue

@@ -1,12 +1,12 @@
 <template>
-  <sohelp-vxe-grid v-bind="$attrs" ref="sohelpEntityGridRef" :refid="refid" :isEntityGrid="true"></sohelp-vxe-grid>
+  <sohelp-grid-view v-bind="$attrs" ref="sohelpEntityGridRef" :refid="refid" :isEntityGrid="true"></sohelp-grid-view>
 </template>
 <script>
-import SohelpVxeGrid from '../sohelp-vxe-grid/index.vue'
+import SohelpGridView from '../sohelp-grid-view/index.vue'
 import {ref} from "vue";
 export default {
   name: "SohelpEntityGrid",
-  components: {SohelpVxeGrid},
+  components: {SohelpGridView},
   props:{
     modelValue: Object,
     /** 实体配置 */

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,Tickets,Postcard, Files, Grid} from "@element-plus/icons-vue";
 import { useMobile } from "@/utils/use-mobile";
 import { usePermission } from "@/utils/use-permission";
 import DefaultProps from "./js/DefaultProps";
@@ -11,8 +11,11 @@ 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 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";
@@ -21,7 +24,10 @@ import { useI18n } from "vue-i18n";
 import SohelpEntityForm from "../sohelp-entity-form/index.vue";
   import * as ElementPlusIcons from '@element-plus/icons-vue';
   import * as EleAdminPlusIcons from '@/components/icons';
-
+import { moduleCache } from "../cache/ModuleCache.js";
+import SohelpModal from "../sohelp-modal/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,6 +42,7 @@ const current = ref(null);
 const isPage = ref(false);
 const approvalModalVisible = ref(false);
 const approvalData = ref({});
+const userStore = useUserStore();
 
 //报表打印
 const currentReportValue = ref(null);
@@ -130,7 +137,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("");
 /**
@@ -1160,7 +1167,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 +1207,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 +1251,10 @@ const handleCustom = async ({ type, $grid }) => {
       EleMessage.success(message);
     }
 
+    //清除缓存
+    moduleCache?.clear();
+    loadConfig();
+
     localStorage.setItem("VXE_CUSTOM_STORE", "");
     loading.close();
   }
@@ -1310,6 +1322,28 @@ 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=${name}&name=${extendEntity}&refid=${refid}`,
+      entity: baseUrl + `/dev/index.html#/dev/module/entity?datasource=${name}&name=${extendEntity}`,
+      workflow: baseUrl + `/dev/index.html#/dev/form?datasource=${name}&name=${extendEntity}&refid=${refid}`,
+      grid: baseUrl + `/dev/index.html#/dev/module/grid?refid=${refid}`
+    }
+    window.open(url[command],'_blank');
+  }
+}
+
 /**
  * 监听是否被选中，更新工具栏批量操作
  */
@@ -1366,6 +1400,22 @@ 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"></el-link>
+        </template>
+        <template #dropdown>
+          <ele-text @click="settingClick('grid')">数据列表配置</ele-text>
+          <ele-text @click="settingClick('entity')">实体配置</ele-text>
+        </template>
+      </vxe-pulldown>
+      </div>
+    </template>
+
     <!--定义国际化I18n-->
     <template
       v-for="item in sohelpConfig?.properties?.map(item => item)"
@@ -1442,6 +1492,7 @@ defineExpose({
             </div>
           </sohelp-drop-card>
           <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>
@@ -1457,6 +1508,7 @@ defineExpose({
       :key="name"
     >
 
+
       <sohelp-dict
         type="text"
         v-model="row[name]"
@@ -1663,7 +1715,7 @@ defineExpose({
           <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})"
+                                @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]" />
@@ -1721,21 +1773,36 @@ defineExpose({
 </ele-modal>
 
 <!--实体表单-->
-<ele-modal :title="toolbarButtonParams?.title || ''"
+<sohelp-modal
+           :title="toolbarButtonParams?.title || ''"
            :width="toolbarButtonParams?.width || 860"
+           :draggable="false"
            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>
+           <template #setting v-if="userStore.info.is_developer">
+            <ele-dropdown
+              :items="[
+                  { title: '表单配置', command: 'form' , icon:Postcard},
+                  { title: '实体配置', command: 'entity', icon:Tickets},
+                  { title: '流程配置', command: 'workflow', icon:Files }
+              ]"
+              @command="settingClick"
+            >
+              <el-link :icon="Setting" :underline="false"></el-link>
+            </ele-dropdown>
+          </template>
+
+    <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>
+</sohelp-modal>
 <!--打印报表-->
 <ele-modal :title="toolbarButtonParams?.title|| t('grid.report.title')" :width="toolbarButtonParams?.width|| 600"
            v-model="visibleReport">
@@ -1886,5 +1953,13 @@ defineExpose({
   }
 }
 
+.column-setting{
+  padding: 5px 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+
 
 </style>

package/sohelp-grid/js/DefaultGridOptions.js

@@ -1,6 +1,8 @@
 export default {
   id: 'sohelp-grid',
   customConfig: {
+    //默认不会将列设置保存到本地存储中
+    storage: false,
     placement: 'top-right' // 自定义列工具栏位置
   },
   rowConfig: {
@@ -82,13 +84,15 @@ export default {
       resizable: true, // 保存列宽调整
       sort: true, // 保存列排序
       fixed: true
+    },
+    slots: {
+      header: 'setting'
     }
   },
   columnConfig: {
     isCurrent: true,
     resizable: true
   },
-
   sortConfig: {
     remote: true
   },

package/sohelp-grid/js/DefaultProps.js

@@ -2,18 +2,18 @@ export default {
   /**网格列表配置ID*/
   refid: {
     type: String,
-    defaultValue: '',
+    default: '',
     required: true
   },
   /**自动加载数据*/
   autoLoad: {
     type: Boolean,
-    defaultValue: true
+    default: true
   },
   /**数据源URL**/
   url: {
     type: String,
-    defaultValue: ''
+    default: ''
   },
   /**允许行拖动*/
   rowDrag: Boolean,

package/sohelp-grid/js/useSohelpGridConfig.js

@@ -93,7 +93,13 @@ const switchVxeProperty = (property, sortList, f, formulaMap) => {
     editor.editRender["code"] = property.dict;
   }
 
-  // 编辑
+  // 取默认显示值
+  if (property.type === "RELATION" && editor.labelField === "") {
+    const fields = property.relationList?.split(",");
+    editor.labelField = fields.includes("id") && fields.length > 1 ? fields[1] : fields[0];
+  }
+
+  // 自定义编辑插槽
   if (property.edit) {
     editor.slots.edit = "edit_" + property.name;
   }

package/sohelp-grid-select/index.vue

@@ -15,7 +15,7 @@
       </template>
 
       <el-option style="height: auto; padding: 0; height: 262px; overflow: hidden; align-items: flex-start">
-        <sohelp-vxe-grid
+        <sohelp-grid-view
           :refid="refid"
           ref="tableRef"
           class="vxe-grid-main"
@@ -25,7 +25,7 @@
           v-model:data="selectedData"
           :url="url"
         >
-        </sohelp-vxe-grid>
+        </sohelp-grid-view>
       </el-option>
 
       <template #footer>

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

@@ -163,7 +163,7 @@
   import { ref, watch, computed, toRaw } from 'vue';
   import VueDraggable from 'vuedraggable';
   import { ArrowLeft, ArrowRight } from '@element-plus/icons-vue';
-  import { DragOutlined } from '@/components/icons';
+  import { DragOutlined } from '../../../sohelp-icon-select/icons';
 
   const CondictionOptions = [
     {

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

@@ -163,7 +163,7 @@
   import { ref, watch, computed } from 'vue';
   import VueDraggable from 'vuedraggable';
   import { ArrowLeft, ArrowRight } from '@element-plus/icons-vue';
-  import { DragOutlined } from '@/components/icons';
+  import { DragOutlined } from '../../../sohelp-icon-select/icons';
 
   const props = defineProps({
     modelValue: {

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

@@ -165,7 +165,7 @@
   import { ref, watch, computed } from 'vue';
   import VueDraggable from 'vuedraggable';
   import { ArrowLeft, ArrowRight } from '@element-plus/icons-vue';
-  import { DragOutlined } from '@/components/icons';
+  import { DragOutlined } from '../../../sohelp-icon-select/icons';
 
   const props = defineProps({
     modelValue: {

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

@@ -163,7 +163,7 @@
   import { ref, watch, computed } from 'vue';
   import VueDraggable from 'vuedraggable';
   import { ArrowLeft, ArrowRight } from '@element-plus/icons-vue';
-  import { DragOutlined } from '@/components/icons';
+  import { DragOutlined } from '../../../sohelp-icon-select/icons';
 
   const props = defineProps({
     modelValue: {

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

@@ -58,7 +58,7 @@
 </template>
 
 <script setup>
-  import { computed, nextTick, onMounted, reactive, ref, onBeforeUnmount } from 'vue';
+  import { computed, nextTick, onMounted, reactive, ref, onBeforeUnmount, watch } from 'vue';
   import FilterConditionItem from '../../sohelp-grid/components/filter-condition-item.vue';
   import { useMobile } from '@/utils/use-mobile';
   import { useI18n } from 'vue-i18n';
@@ -159,16 +159,10 @@
   });
 
   const load = () => {
-    maxRowsConfig.width = advancedBoxRef.value?.offsetWidth || 160;
-    maxRowsConfig.current = findAccumulateIndex(maxRowsConfig.itemWidth, maxRowsConfig.width * maxRowsConfig.maxRows);
-  };
-
-  onMounted(() => {
-    loading.value = true;
-    nextTick(() => {
-      loading.value = false;
-      // 高级筛选高度
-      maxRowsConfig.height = advancedBoxRef.value.offsetHeight + 'px';
+    const { filterPosition } = config.value.filter?.config;
+    if (filterPosition?.toUpperCase() === 'TOP') {
+      maxRowsConfig.current.index = filterList.value.length;
+      maxRowsConfig.height = advancedBoxRef.value?.offsetHeight + 'px';
       const advancedRow = advancedBoxRef.value.querySelector('.sohelp-filter-condition');
       if (advancedRow) {
         maxRowsConfig.rowHeight = advancedRow.offsetHeight;
@@ -176,8 +170,22 @@
       nextTick(() => {
         maxRowsConfig.searchButtonWidth = searchButtonRef.value?.offsetWidth + 35;
         maxRowsConfig.itemWidth = getAllHeights();
-        load();
+
+        maxRowsConfig.width = advancedBoxRef.value?.offsetWidth || 160;
+        maxRowsConfig.current = findAccumulateIndex(
+          maxRowsConfig.itemWidth,
+          maxRowsConfig.width * maxRowsConfig.maxRows
+        );
       });
+    }
+  };
+
+  onMounted(() => {
+    loading.value = true;
+    nextTick(() => {
+      loading.value = false;
+      // 高级筛选高度
+      load();
     });
   });
 
@@ -229,6 +237,17 @@
   onBeforeUnmount(() => {
     removeEventListener('resize', () => {});
   });
+
+  watch(
+    () => config.value.filter.config.filterPosition,
+    (val) => {
+      if (val.toUpperCase() === 'TOP') {
+        nextTick(() => {
+          load();
+        });
+      }
+    }
+  );
 </script>
 <script>
   export default {

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

@@ -73,7 +73,7 @@
     }"
     :class="['sohelp-filter-card', config.filter.config.filterPosition]"
     :header="t('grid.toolbar.adv_filter')"
-    :headerStyle="{ padding: '0 10px 10px 0' }"
+    :headerStyle="{ padding: '0 0 5px 0', fontWeight: 'normal', fontSize: '14px' }"
     :bodyStyle="{ padding: '0', height: 'calc(100% - 40px)', background: '#fff' }"
   >
     <template #extra>

package/sohelp-icon-select/index.vue

@@ -4,9 +4,9 @@
     placeholder="请选择图标"
     filterable
     class="sohelp-icon-select"
-    width="100%"
-    style="min-width: 60px"
     clearable
+    fit-input-width
+    style="min-width: 60px; width: 100%"
   >
     <template #prefix>
       <el-icon :size="14" color="#666" style="margin-right: 5px">
@@ -40,7 +40,7 @@
 <script setup>
   import { ref } from 'vue';
   import * as ElementPlusIcons from '@element-plus/icons-vue';
-  import * as EleAdminPlusIcons from '@/components/icons';
+  import * as EleAdminPlusIcons from './icons';
   import { VxeIcon } from './vxeui-icon.js';
   const modelValue = defineModel('modelValue');
   const iconData = ref([]);

package/sohelp-modal/index.vue

@@ -1,20 +1,26 @@
 <template>
   <ele-modal v-bind="$attrs" v-model="modelValue">
-    <div class="modal__container">
-      <!-- 主内容插槽 -->
-      <slot>
-        <template v-for="(slotProps, slotName) in $scopedSlots" :key="slotName">
-          <slot :name="slotName" v-bind="slotProps" />
-        </template>
-      </slot>
-      <!-- 底部插槽 -->
-      <div class="modal__footer" v-if="showFooter">
-        <slot name="footer">
-          <el-button type="primary" @click="confirm">确认</el-button>
-          <el-button @click="cancel">关闭</el-button>
+    <template #header>
+      <div class="modal-header">
+        <slot name="header">
+          {{ $attrs.title }}
         </slot>
+        <div class="right">
+          <slot name="setting"></slot>
+        </div>
       </div>
-    </div>
+    </template>
+
+    <!-- 主内容插槽 -->
+    <slot></slot>
+    <!-- 底部插槽 -->
+
+    <template #footer>
+      <slot name="footer" v-if="showFooter">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="cancel">关闭</el-button>
+      </slot>
+    </template>
   </ele-modal>
 </template>
 <script setup>
@@ -52,14 +58,15 @@
     name: 'SohelpModal'
   };
 </script>
-<style scoped>
-  /* 可选：添加样式 */
-  .modal__container {
-    /* 样式定义 */
-    height: 100%;
-  }
+<style scoped lang="scss">
+  .modal-header {
+    display: flex;
 
-  .modal__footer {
-    /* 样式定义 */
+    .right {
+      margin-left: auto;
+      padding: 0 10px;
+      display: flex;
+      align-items: center;
+    }
   }
 </style>

package/sohelp-module/useSohelpModule.js

@@ -1,17 +1,15 @@
-import { useRouter } from "vue-router";
 import { usePageTab } from "@/utils/use-page-tab";
 
 function objectToUrlParams(obj) {
   if (!obj) {
-    return '';
+    return "";
   }
-  return "&"+Object.keys(obj)
+  return "&" + Object.keys(obj)
     .map((key) => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`)
-    .join('&');
+    .join("&");
 }
 
-export function useSohelpModule(sohelpModuleRef) {
-  const { push } = useRouter();
+export function useSohelpModule(sohelpModuleRef, push){
   return {
     /**
      * 打开抽屉
@@ -19,8 +17,8 @@ export function useSohelpModule(sohelpModuleRef) {
      * @param params 参数
      * @param props 属性
      */
-    openDrawer: (refid,params={}, props={}) => {
-      sohelpModuleRef.value.openDrawer(refid,params,props);
+    openDrawer: (refid, params = {}, props = {}) => {
+      sohelpModuleRef.value.openDrawer(refid, params, props);
     },
     /**
      *打开对话框
@@ -28,8 +26,8 @@ export function useSohelpModule(sohelpModuleRef) {
      * @param params
      * @param props
      */
-    openModal: (refid, params= {},props={},callback) => {
-      sohelpModuleRef.value.openModal(refid, params,props,callback);
+    openModal: (refid, params = {}, props = {}, callback) => {
+      sohelpModuleRef.value.openModal(refid, params, props, callback);
     },
     /**
      * 关闭对话框
@@ -59,7 +57,7 @@ export function useSohelpModule(sohelpModuleRef) {
      * @param refid 模块地址
      */
     closeTab: (refid) => {
-      const { finishPageTab, setPageTabTitle,addPageTab  } = usePageTab();
+      const { finishPageTab, setPageTabTitle, addPageTab } = usePageTab();
       finishPageTab();
     }
   };