sohelp-eleplus 1.1.17 → 1.1.19

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-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,11 +1,14 @@
+/**
+ * VxeGrid默认值选项
+ */
 export default {
   loading: false,
   customConfig: {
+    //默认不会将列设置保存到本地存储中
+    storage: false,
     placement: "top-right" // 自定义列工具栏位置
   },
-
   params: {},
-
   rowConfig: {
     useKey: true,
     //sortable 排序
@@ -68,28 +71,16 @@ 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: []

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;