sohelp-eleplus 1.1.18 → 1.1.20

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>
+  <ele-modal v-bind="$attrs" v-model="modelValue" :close-on-click-modal="closeOnClickModal">
+    <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 @click="cancel">关闭</el-button>
+        <el-button type="primary" @click="confirm">确认</el-button>
+      </slot>
+    </template>
   </ele-modal>
 </template>
 <script setup>
@@ -24,6 +30,10 @@
     showFooter: {
       type: Boolean,
       default: true
+    },
+    closeOnClickModal: {
+      type: Boolean,
+      default: false
     }
   });
 
@@ -52,14 +62,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();
     }
   };

package/sohelp-org-user-tree/index.vue

@@ -10,7 +10,7 @@ export default {
   props: {
     url: {
       type: String,
-      defaultValue: "/engine/web/org/list",
+      default: "/engine/web/org/list",
       required: true
     }
   },

package/sohelp-page/index.vue

@@ -0,0 +1,13 @@
+<script setup>
+
+</script>
+
+<template>
+  <ele-page :flex-table="true" :hide-footer="true" v-bind="$attrs" v-on="$attrs">
+    <slot></slot>
+  </ele-page>
+</template>
+
+<style scoped lang="scss">
+
+</style>

package/sohelp-table/index.vue

@@ -36,18 +36,18 @@ export default {
     /**网格列表配置ID*/
     refid: {
       type: String,
-      defaultValue: "",
+      default: "",
       required: true
     },
     /**数据源URL**/
     url: {
       type: String,
-      defaultValue: ""
+      default: ""
     },
     /**数据源URL**/
     where: {
       type: Object,
-      defaultValue: {}
+      default: {}
     }
   },
   setup(props, {emit}) {

package/sohelp-vform-drawer/index.vue

@@ -13,7 +13,7 @@
   </sohelp-drawer>
 </template>
 <script lang="ts">
-import SohelpVform from "../sohelp-vform/index.vue"
+import SohelpVform from "../sohelp-vform-eleplus/index.vue"
 import SohelpDrawer from "../sohelp-drawer/index.vue"
 import {ref} from "vue";
 export default {

package/sohelp-vxe-grid/DefaultGridOptions.js

@@ -1,54 +1,75 @@
+/**
+ * VxeGrid默认值选项
+ */
 export default {
   loading: false,
+  showFooter: false,
+  round: true,
+  border: true,
+  stripe: true,
+  maxHeight: '100%',
+  size: 'mini',
+  minHeight: 200,
+  params: {},
+  columnConfig: {
+    resizable: true
+  },
   customConfig: {
-    placement: "top-right" // 自定义列工具栏位置
+    immediate: false,
+    isCurrent: false,
+    resizable: true,
+    storage: {
+      visible: true, // 保存列显示/隐藏状态
+      resizable: true, // 保存列宽调整
+      sort: true, // 保存列排序
+      fixed: true
+    },
+    slots: {
+      header: 'setting'
+    }
   },
-
-  params: {},
-
   rowConfig: {
-    useKey: true,
-    //sortable 排序
-    // sHover: true,
-    // isCurrent: true,
-    drag: true,
-    keyField: "id"
+    useKey: true, //sortable 排序
+    isHover: true,
+    isCurrent: true,
+    resizable: false,
+    drag: true
   },
   rowDragConfig: {
-    trigger: "cell",
     showGuidesStatus: true
   },
+  editConfig: {
+    trigger: 'click',
+    mode: 'cell',
+    autoClear: false,
+    autoFocus: true,
+    showInsertStatus: true,
+    showUpdateStatus: true
+  },
   keyboardConfig: {
     isEdit: true,
     isArrow: true,
     isEnter: true,
     isTab: true,
     isDel: true,
-    isBack: true
+    isBack: true,
+    editMode: 'insert'
   },
   mouseConfig: {
     selected: true
   },
   checkboxConfig: {
-    checkRowKey: "id",
     highlight: true,
     range: true,
-    trigger: "row", // 关键配置：点击行触发选中
-    reserve: true // 跨页保留选中状态
+    reserve: true
   },
   radioConfig: {
     strict: false,
     checkRowKey: "id",
     highlight: true,
     reserve: true,
-    trigger: "row" // 关键配置：点击行触发选中
+    trigger: "cell" // 关键配置：点击行触发选中
   },
-  border: true,
-  stripe: true,
-  loading: false,
-  minHeight: 200,
-  maxHeight: "100%",
-  size: "mini",
   pagerConfig: {
     enabled: true,
     total: 0,
@@ -56,10 +77,7 @@ export default {
     pageSize: 50,
     align: "right"
   },
-  columnConfig: {
-    resizable: true,
-    isCurrent: false
-  },
+
   formConfig: {
     data: {},
     items: []
@@ -68,32 +86,30 @@ export default {
     refresh: true,
     custom: true, //是否开启自定义列工具栏
     slots: {
-      buttons: "searchSlot"
+      tools: "keywords"
     }
   },
-  proxyConfig: {
-    response: {
-      result: "result",
-      total: "page.total"
-    },
-    ajax: {}
-  },
   menuConfig: {
     //右键菜单配置
     header: {
       options: []
     },
     body: {
-      options: [
-        [
-          { code: "insert", name: "插入行", visible: true, disabled: false },
-          { code: "copy", name: "复制行", prefixIcon: "vxe-icon-copy", visible: true, disabled: false }
-        ]
-      ]
+      options: []
     },
     footer: {
       options: []
     }
   },
+  scrollX: {
+    gt: 0,
+    //自动启用纵向虚拟滚动
+    enabled: true
+  },
+  scrollY: {
+    gt: 0,
+    //自动启用纵向虚拟滚动
+    enabled: true
+  },
   columns: []
 };

package/sohelp-vxe-grid/DefaultProps.js

@@ -1,37 +1,27 @@
+/**
+ * SohelpVxeGrid对外默认属性
+ */
 export default {
   value: [Array, String],
-  data: Array,
-  /**网格列表配置ID*/
-  refid: {
+  /**读取数据源URL**/
+  url: {
     type: String,
-    defaultValue: '',
-    required: true
+    default: ""
   },
   /**自动加载数据*/
   autoLoad: {
     type: Boolean,
-    defaultValue: false
-  },
-  gridOptions:Object,
-  /**数据源URL**/
-  url: {
-    type: String,
-    defaultValue: ''
+    default: true
   },
+  gridOptions: Object,
   /**允许拖动记录*/
   drag: {
     type: Boolean,
     default: false
   },
-  /**
-   * 是否实体列表
-   */
-  isEntityGrid: {
-    type: Boolean,
-    default: false
-  },
+  /**是否可以多选*/
   multiple: {
     type: Boolean,
     default: true
   }
-}
+};

package/sohelp-vxe-grid/SohelpGridConfig.js

@@ -1,7 +1,7 @@
-import DefaultGridOptions from './DefaultGridOptions';
-import { nextTick, reactive, ref } from 'vue';
-import Sortable from 'sortablejs';
-import { moduleCache } from '../cache/ModuleCache';
+import DefaultGridOptions from "./DefaultGridOptions";
+import { nextTick, reactive, ref } from "vue";
+import Sortable from "sortablejs";
+import { moduleCache } from "../cache/ModuleCache";
 
 /**列转换*/
 const switchVxeProperty = (property) => {
@@ -12,14 +12,14 @@ const switchVxeProperty = (property) => {
     showOverflow: true
   };
 
-  if (property.name === 'id') {
-    editor['width'] = 50;
+  if (property.name === "id") {
+    editor["width"] = 50;
   }
 
   if (property.edit) {
-    editor['editRender'] = {
+    editor["editRender"] = {
       enabled: true,
-      name: property.editor || 'input'
+      name: property.editor || "input"
     };
   }
   return editor;
@@ -30,9 +30,10 @@ const sortable = ref();
 const rowDrop = (sohelpVxeGridRef) => {
   nextTick(() => {
     const xGTable = sohelpVxeGridRef.value;
-    sortable.value = Sortable.create(xGTable.$el.querySelector('.body--wrapper>.vxe-table--body tbody'), {
-      handle: '.drag-btn',
-      onEnd: ({ newIndex, oldIndex }) => {}
+    sortable.value = Sortable.create(xGTable.$el.querySelector(".body--wrapper>.vxe-table--body tbody"), {
+      handle: ".drag-btn",
+      onEnd: ({ newIndex, oldIndex }) => {
+      }
     });
   });
 };
@@ -55,7 +56,7 @@ const filterFieldsByProperties = (_filter) => {
   filter.list = filterArray(filter.list);
   filter.filter.keywords = filterArray(filter.filter.keywords);
   filter.filter.sort = filterArray(filter.filter.sort);
-  filter.filter.field = filterArray(filter.filter.field, 'name');
+  filter.filter.field = filterArray(filter.filter.field, "name");
   return filter;
 };
 
@@ -63,10 +64,10 @@ const filterFieldsByProperties = (_filter) => {
 export async function initial(sohelpVxeGridRef, props) {
   var data = null;
   if (props.refid) {
-    data = props.isEntityGrid ? await moduleCache.getEntityGrid(props.refid) : await moduleCache.getGrid(props.refid);
+    data = await moduleCache.getGrid(props.refid);
 
     if (!data) {
-      throw new Error('Invalid config data or missing code');
+      throw new Error(props.refid+" 不存在!");
     }
 
     try {
@@ -88,17 +89,17 @@ export async function initial(sohelpVxeGridRef, props) {
       //初始化属性列表配置
       DefaultGridOptions.columns = [
         {
-          field: props.multiple ? 'checkbox' : 'radio',
-          fixed: 'left',
-          type: props.multiple ? 'checkbox' : 'radio',
+          field: props.multiple ? "checkbox" : "radio",
+          fixed: "left",
+          type: props.multiple ? "checkbox" : "radio",
           width: 35,
-          align: 'center'
+          align: "center"
         },
         {
-          type: 'seq',
-          title: '#',
-          fixe: 'left',
-          align: 'center',
+          type: "seq",
+          title: "#",
+          fixe: "left",
+          align: "center",
           width: 40
         }
       ];
@@ -118,13 +119,13 @@ export async function initial(sohelpVxeGridRef, props) {
 
       if (drag) {
         DefaultGridOptions.columns.unshift({
-          title: '',
-          fixed: 'left',
+          title: "",
+          fixed: "left",
           width: 40,
-          align: 'center',
+          align: "center",
           dragSort: true,
           slots: {
-            default: 'draggableDefault'
+            default: "draggableDefault"
           }
         });
       }
@@ -136,7 +137,7 @@ export async function initial(sohelpVxeGridRef, props) {
   }
   const gridOptions = props.refid ? DefaultGridOptions : props.gridOptions || DefaultGridOptions;
 
-  return { gridOptions, sohelpConfig: SohelpConfig, propertiesMap};
+  return { gridOptions, sohelpConfig: SohelpConfig, propertiesMap };
 }
 
 export default initial;