sohelp-eleplus 1.1.15 → 1.1.17

package/components.js

@@ -43,3 +43,4 @@ export { default as SohelpDrawer } from './sohelp-drawer/index.vue';
 export { default as SohelpTenantSelect } from './sohelp-tenant-select/index.vue';
 export { default as SohelpVxeGridSelect } from './sohelp-vxe-grid-select/index.vue';
 export { default as SohelpIconSelect } from './sohelp-icon-select/index.vue';
+export { default as SohelpModal } from './sohelp-modal/index.vue';

package/package.json

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

package/sohelp-dict/index.vue

@@ -14,7 +14,7 @@
       "
       v-for="(item, index) in valueData"
       :key="item.value"
-    >{{ item.label }}
+      >{{ item.label }}
     </el-text>
   </template>
   <template v-else-if="type === 'tag'">
@@ -69,139 +69,138 @@
     @change="change"
     ref="dictSelectRef"
   >
-    <el-option v-for="item in data.value" :key="item.id" :value="item.value" :label="item.label"
-               :style="`color:${item.fontColor}`">
-      <component style="width:15px;height:15px;padding-right:5px;"
-                 :is="ElementPlusIcons[item.icon]"
-                 v-if="ElementPlusIcons[item.icon]" />
-      <component style="width:15px;height:15px;padding-right:5px;"
-                 :is="EleAdminPlusIcons[item.icon]"
-                 v-else-if="EleAdminPlusIcons[item.icon]" />
-      <span style="width:15px;height:15px;padding-right:5px;"
-            :class="item.icon" v-else></span>
+    <template #prefix v-if="icon">
+      <el-icon :size="18" style="margin-right: 5px">
+        <component :is="ElementPlusIcons[icon]" v-if="ElementPlusIcons[icon]" />
+        <component :is="EleAdminPlusIcons[icon]" v-else-if="EleAdminPlusIcons[icon]" />
+        <span :class="icon" v-else></span>
+      </el-icon>
+    </template>
+    <el-option
+      v-for="item in data.value"
+      :key="item.id"
+      :value="item.value"
+      :label="item.label"
+      :style="`color:${item.fontColor}`"
+    >
+      <el-icon :size="18" v-if="item.icon" style="margin-right: 5px">
+        <component :is="ElementPlusIcons[item.icon]" v-if="ElementPlusIcons[item.icon]" />
+        <component :is="EleAdminPlusIcons[item.icon]" v-else-if="EleAdminPlusIcons[item.icon]" />
+        <span :class="item.icon" v-else></span>
+      </el-icon>
       {{ item.label }}
     </el-option>
-    <template #prefix>
-      <component style="width:15px;height:15px;padding-right:5px;"
-                 :is="ElementPlusIcons[icon]"
-                 v-if="ElementPlusIcons[icon]" />
-      <component style="width:15px;height:15px;padding-right:5px;"
-                 :is="EleAdminPlusIcons[icon]"
-                 v-else-if="EleAdminPlusIcons[icon]" />
-      <span style="width:15px;height:15px;padding-right:5px;"
-            :class="icon" v-else></span>
-    </template>
   </el-select>
 </template>
 
 <script setup>
-import { computed, nextTick, onMounted, reactive, ref } from "vue";
-import { dictCache } from "../cache/DictCache";
-import * as ElementPlusIcons from "@element-plus/icons-vue";
-import * as EleAdminPlusIcons from "@/components/icons";
+  import { computed, nextTick, onMounted, reactive, ref } from 'vue';
+  import { dictCache } from '../cache/DictCache';
+  import * as ElementPlusIcons from '@element-plus/icons-vue';
+  import * as EleAdminPlusIcons from '../sohelp-icon-select/icons';
 
-const modelValue = defineModel("modelValue", { type: [String, Number, Array], default: "" });
-const emit = defineEmits("change");
-const props = defineProps({
-  /** 字典类型 */
-  code: {
+  const modelValue = defineModel('modelValue', { type: [String, Number, Array], default: '' });
+  const emit = defineEmits('change');
+  const props = defineProps({
+    /** 字典类型 */
+    code: {
+      type: String,
+      required: true
+    },
+    /** 组件类型 */
     type: String,
-    required: true
-  },
-  /** 组件类型 */
-  type: String,
-  /** 是否禁用 */
-  disabled: Boolean,
-  /** 提示文本 */
-  placeholder: String,
-  /** select的下拉是否插入到body下 */
-  teleported: {
-    type: Boolean,
-    default: true
-  },
-  autoFocus: {
-    type: Boolean,
-    default: false
-  }
-});
+    /** 是否禁用 */
+    disabled: Boolean,
+    /** 提示文本 */
+    placeholder: String,
+    /** select的下拉是否插入到body下 */
+    teleported: {
+      type: Boolean,
+      default: true
+    },
+    autoFocus: {
+      type: Boolean,
+      default: false
+    }
+  });
+
+  /** 字典数据 */
+  const data = reactive({});
+  const dictSelectRef = ref(null);
 
-/** 字典数据 */
-const data = reactive({});
-const dictSelectRef = ref(null);
+  const icon = computed(() => {
+    const item = data.value?.find((item) => item.value === modelValue.value);
+    return item?.icon;
+  });
 
-const icon = computed(() => {
-  const item = data.value?.find((item) => item.value === modelValue.value);
-  return item?.icon;
-});
+  //初始化菜单数据
+  onMounted(async () => {
+    data.value = (await dictCache.get(props.code)) || [];
+    //设置默认值
+    nextTick(() => {
+      if (!modelValue.value && (props.type === 'select' || props.type === undefined) && data.value[0]) {
+        modelValue.value = data.value[0].value;
+      }
+      if (props.autoFocus) {
+        dictSelectRef.value?.focus();
+      }
+    });
+  });
 
-//初始化菜单数据
-onMounted(async () => {
-  data.value = (await dictCache.get(props.code)) || [];
-  //设置默认值
-  nextTick(() => {
-    if (!modelValue.value && (props.type === "select" || props.type === undefined) && data.value[0]) {
-      modelValue.value = data.value[0].value;
+  /**
+   * 获取样式
+   * @param item
+   */
+  const getStyle = (item) => {
+    const styles = [];
+    if (item?.fontColor) {
+      styles.push(`color:${item.fontColor};`);
     }
-    if (props.autoFocus) {
-      dictSelectRef.value?.focus();
+    if (item?.backgroundColor) {
+      styles.push(`background-color:${item.backgroundColor};`);
     }
-  });
-});
+    return styles.join('');
+  };
 
-/**
- * 获取样式
- * @param item
- */
-const getStyle = (item) => {
-  const styles = [];
-  if (item?.fontColor) {
-    styles.push(`color:${item.fontColor};`);
-  }
-  if (item?.backgroundColor) {
-    styles.push(`background-color:${item.backgroundColor};`);
-  }
-  return styles.join("");
-};
+  /**
+   * change
+   * @param val
+   */
+  const change = (val) => {
+    emit('change', val);
+  };
 
-/**
- * change
- * @param val
- */
-const change = (val) => {
-  emit("change", val);
-};
+  /**
+   *  显示标签数据
+   */
+  const valueData = computed(() => {
+    const val = props.modelValue;
+    if (val == null || val === '') return [];
+    const values = Array.isArray(val)
+      ? val
+      : typeof val === 'number'
+        ? [val]
+        : val
+            .split(',')
+            .map((v) => v.trim())
+            .filter(Boolean);
 
-/**
- *  显示标签数据
- */
-const valueData = computed(() => {
-  const val = props.modelValue;
-  if (val == null || val === "") return [];
-  const values = Array.isArray(val)
-    ? val
-    : typeof val === "number"
-      ? [val]
-      : val
-        .split(",")
-        .map((v) => v.trim())
-        .filter(Boolean);
-
-  return (data.value || [])
-    .map((d) => (values.includes(d.value) ? d : null))
-    .filter(Boolean)
-    .concat(
-      values.filter((v) => !(data.value || []).some((d) => d.value === v)).map((v) => ({ value: v, label: v }))
-    );
-});
-/** 更新选中数据 */
-// const updateValue = (value) => {
-//   emit('update:modelValue', value);
-// };
+    return (data.value || [])
+      .map((d) => (values.includes(d.value) ? d : null))
+      .filter(Boolean)
+      .concat(
+        values.filter((v) => !(data.value || []).some((d) => d.value === v)).map((v) => ({ value: v, label: v }))
+      );
+  });
+  /** 更新选中数据 */
+  // const updateValue = (value) => {
+  //   emit('update:modelValue', value);
+  // };
 </script>
 
 <script>
-export default {
-  name: "SohelpDict",
-  inheritAttrs: false
-};
+  export default {
+    name: 'SohelpDict',
+    inheritAttrs: false
+  };
 </script>

package/sohelp-drawer/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <ele-drawer v-bind="$attrs" style="max-width: 100%" class="sohelp-drawer">
+  <ele-drawer v-bind="$attrs" style="max-width: 100%" class="sohelp-drawer" v-model="modelValue">
     <div class="drawer__container">
       <!-- 主内容插槽 -->
       <slot></slot>
@@ -13,6 +13,25 @@
     </template>
   </ele-drawer>
 </template>
+
+<script setup>
+  const modelValue = defineModel('modelValue', {
+    type: Boolean,
+    default: false
+  });
+
+  const show = () => {
+    modelValue.value = true;
+  };
+  const close = () => {
+    modelValue.value = false;
+  };
+
+  defineExpose({
+    show,
+    close
+  });
+</script>
 <script>
   export default {
     name: 'SohelpDrawer'

package/sohelp-grid/index.vue

@@ -9,15 +9,18 @@ import { calcSummary, switchGridValue } from "./js/SohelpGridConfig";
 import { EleMessage } from "@/components/ele-admin-plus/components";
 import { ElMessageBox } from "element-plus/es";
 import { useFormData } from "@/utils/use-form-data";
-import { CrudHttp, resetCommonConfig, updateCommonConfig } from "@/components/sohelp-eleplus";
-import ApprovalModal from "@/views/user/todo/components/approval-modal.vue";
-import WorkflowDrawer from "@/views/user/todo/components/workflow-drawer.vue";
-import SohelpTextareaInput from "@/components/sohelp-eleplus/sohelp-textarea-input/index.vue";
-import SohelpPower from "@/components/sohelp-eleplus/sohelp-power/index.vue";
-import FilterConditionItem from "@/components/sohelp-eleplus/sohelp-grid/components/filter-condition-item.vue";
+import { resetCommonConfig, updateCommonConfig } from "../http/ModuleHttp.js";
+import CrudHttp from "../http/CrudHttp.js";
+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";
 import { useSohelpGridConfig } from "./js/useSohelpGridConfig.js";
 import { useI18n } from "vue-i18n";
-import SohelpEntityForm from "@/components/sohelp-eleplus/sohelp-entity-form/index.vue";
+import SohelpEntityForm from "../sohelp-entity-form/index.vue";
+  import * as ElementPlusIcons from '@element-plus/icons-vue';
+  import * as EleAdminPlusIcons from '@/components/icons';
 
 const { initial, isConfigDone } = useSohelpGridConfig();
 const { t } = useI18n();
@@ -1634,45 +1637,46 @@ defineExpose({
 
     <!-- 操作栏 -->
     <template #_operation="{ row }">
-      <div class="flex gap-10 justify-center" style="padding: 0 10px;">
-        <template v-if="getOperationButtonsByType(row)?.length > 0">
-          <el-link
-            v-for="item in getOperationButtonsByType(row)"
-            :key="item.code"
-            :type="item.code === 'crud.delete' ? 'danger' : 'primary'"
-            v-bind="item.params"
-            :icon="item.icon"
-            @click="operationHandler({item:item, row:row,$grid:sohelpVxeGridRef})"
-          >
-            {{ item.title }}
-          </el-link>
-        </template>
+      <el-space :size="10">
+        <el-link
+          v-for="item in getOperationButtonsByType(row)"
+          :key="item.code"
+          :type="item.code === 'crud.delete' ? 'danger' : 'primary'"
+          v-bind="item.params"
+          @click="operationHandler({item: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]" />
+            <component :is="EleAdminPlusIcons[item.icon]" v-else-if="EleAdminPlusIcons[item.icon]" />
+            <span :class="item.icon" v-else></span>
+          </el-icon>
+          {{ item.title }}
+        </el-link>
         <!-- 更多 -->
-        <template v-if="getOperationButtonsByType(row,'more')?.length > 0">
-          <el-dropdown>
-            <el-link :underline="false">
-              <span>更多</span>
-              <el-icon style="margin-left: 4px;">
-                <arrow-down />
-              </el-icon>
-            </el-link>
-            <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})"
-                                  v-bind="item.props">
-                  <el-icon :size="16" style="margin-right: 6px; vertical-align: -5px" v-if="item.icon">
-                    <component :is="eleIcons[item.icon]" />
-                  </el-icon>
-                  {{ item.title }}
-                </el-dropdown-item>
-              </el-dropdown-menu>
-            </template>
-          </el-dropdown>
-        </template>
-
+        <el-dropdown v-if="getOperationButtonsByType(row,'more')?.length > 0">
+          <el-link :underline="false">
+            <span>更多</span>
+            <el-icon style="margin-left: 4px;">
+              <arrow-down />
+            </el-icon>
+          </el-link>
+          <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})"
+                                v-bind="item.props">
+                <el-icon v-if="item.icon">
+                  <component :is="ElementPlusIcons[item.icon]" v-if="ElementPlusIcons[item.icon]" />
+                  <component :is="EleAdminPlusIcons[item.icon]" v-else-if="EleAdminPlusIcons[item.icon]" />
+                  <span :class="item.icon" v-else></span>
+                </el-icon>
+                {{ item.title }}
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
         <slot name="_operation" :row="row"></slot>
-      </div>
+      </el-space>
     </template>
 
     <!-- 统计 -->

package/sohelp-grid/js/useSohelpGridConfig.js

@@ -1,6 +1,6 @@
 import { reactive, ref } from "vue";
-import _DefaultGridOptions from "@/components/sohelp-eleplus/sohelp-grid/js/DefaultGridOptions";
-import { moduleCache } from "@/components/sohelp-eleplus/cache/ModuleCache";
+import _DefaultGridOptions from "../js/DefaultGridOptions";
+import { moduleCache } from "../../cache/ModuleCache";
 import { usePermission } from "@/utils/use-permission";
 import { useMobile } from "@/utils/use-mobile";
 import { useI18n } from "vue-i18n";

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

@@ -59,8 +59,8 @@ import { defineProps, onMounted, ref, watch } from "vue";
   import GridFilterList from './grid-filter-list.vue';
   import GridFilterConfig from './grid-filter-config.vue';
 
-  import { moduleCache } from '@/components/sohelp-eleplus/cache/ModuleCache.js';
-  import { EleMessage } from '@/components/ele-admin-plus/components';
+  import { moduleCache } from '../../../cache/ModuleCache.js';
+  import { ElMessage } from 'element-plus';
   const props = defineProps({
     modelValue: Boolean,
     config: Object
@@ -159,16 +159,16 @@ import { defineProps, onMounted, ref, watch } from "vue";
   const save = async () => {
     loading.value = true;
     const res = await moduleCache.saveFilterFields(filterConfig.value).catch((e) => {
-      EleMessage.error(e?.message || 'error');
+      ElMessage.error(e?.message || 'error');
     });
     loading.value = false;
     if (res.meta.success) {
       emit('update:modelValue', false);
       moduleCache.clear();
       emit('done',filterConfig.value);
-      EleMessage.success(res?.meta.message || '操作成功');
+      ElMessage.success(res?.meta.message || '操作成功');
     } else {
-      EleMessage.error(res?.meta.message || '操作成功');
+      ElMessage.error(res?.meta.message || '操作成功');
     }
   };
 </script>

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

@@ -159,7 +159,7 @@
   });
 
   const load = () => {
-    maxRowsConfig.width = advancedBoxRef.value.offsetWidth;
+    maxRowsConfig.width = advancedBoxRef.value?.offsetWidth || 160;
     maxRowsConfig.current = findAccumulateIndex(maxRowsConfig.itemWidth, maxRowsConfig.width * maxRowsConfig.maxRows);
   };
 
@@ -174,7 +174,7 @@
         maxRowsConfig.rowHeight = advancedRow.offsetHeight;
       }
       nextTick(() => {
-        maxRowsConfig.searchButtonWidth = searchButtonRef.value.offsetWidth + 35;
+        maxRowsConfig.searchButtonWidth = searchButtonRef.value?.offsetWidth + 35;
         maxRowsConfig.itemWidth = getAllHeights();
         load();
       });

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

@@ -1,8 +1,8 @@
 <script setup>
-  import FilterForm from '@/components/sohelp-eleplus/sohelp-grid-view/filter/filter-form.vue';
-  import FilterToolbar from '@/components/sohelp-eleplus/sohelp-grid-view/filter/filter-toolbar.vue';
+  import FilterForm from './filter-form.vue';
+  import FilterToolbar from './filter-toolbar.vue';
   import { computed, ref } from 'vue';
-  import FilterConfig from '@/components/sohelp-eleplus/sohelp-grid-view/filter/config/index.vue';
+  import FilterConfig from './config/index.vue';
   import { useI18n } from 'vue-i18n';
 
   const emit = defineEmits('change', 'filter', 'update:modelValue', 'close', 'reset', 'save', 'changeFilterScheme');

package/sohelp-grid-view/index.vue

@@ -2,7 +2,7 @@
   import { computed, reactive, ref, watch } from 'vue';
   import { useMobile } from '@/utils/use-mobile';
   import SohelpFilter from './filter/index.vue';
-  import SohelpGrid from '@/components/sohelp-eleplus/sohelp-grid/index.vue';
+  import SohelpGrid from '../sohelp-grid/index.vue';
   // 属性映射
   const propertiesMap = ref({});
   const { mobile } = useMobile();

package/sohelp-icon-select/icons/AnalysisOutlined.vue

@@ -0,0 +1,22 @@
+<template>
+  <svg
+    viewBox="0 0 48 48"
+    fill="none"
+    stroke="currentColor"
+    stroke-width="4"
+    stroke-linejoin="round"
+  >
+    <path d="M0.3 7H47.7M6 7V34H42V7M19 34 12 45M29 34 36 45" />
+    <path d="M16 22V27" />
+    <path d="M24 18V27" />
+    <path d="M32 14V27" />
+  </svg>
+</template>
+
+<script lang="ts">
+  import { defineComponent } from 'vue';
+
+  export default defineComponent({
+    name: 'AnalysisOutlined'
+  });
+</script>

package/sohelp-icon-select/icons/ApplicationOutlined.vue

@@ -0,0 +1,21 @@
+<template>
+  <svg viewBox="0 0 48 48" fill="currentColor">
+    <circle cx="9" cy="9" r="4" />
+    <circle cx="9" cy="24" r="4" />
+    <circle cx="9" cy="39" r="4" />
+    <circle cx="24" cy="9" r="4" />
+    <circle cx="24" cy="24" r="4" />
+    <circle cx="24" cy="39" r="4" />
+    <circle cx="39" cy="9" r="4" />
+    <circle cx="39" cy="24" r="4" />
+    <circle cx="39" cy="39" r="4" />
+  </svg>
+</template>
+
+<script lang="ts">
+  import { defineComponent } from 'vue';
+
+  export default defineComponent({
+    name: 'ApplicationOutlined'
+  });
+</script>

package/sohelp-icon-select/icons/AppstoreAddOutlined.vue

@@ -0,0 +1,28 @@
+<template>
+  <svg
+    viewBox="0 0 48 48"
+    fill="none"
+    stroke="currentColor"
+    stroke-width="4"
+    stroke-linecap="round"
+  >
+    <path
+      d="M18 6H8C7 6 6 7 6 8V18C6 19 7 20 8 20H18C19 20 20 19 20 18V8C20 7 19 6 18 6Z"
+    />
+    <path
+      d="M40 6H30C29 6 28 7 28 8V18C28 19 29 20 30 20H40C41 20 42 19 42 18V8C42 7 41 6 40 6Z"
+    />
+    <path
+      d="M40 28H30C29 28 28 29 28 30V40C28 41 29 42 30 42H40C41 42 42 41 42 40V30C42 29 41 28 40 28Z"
+    />
+    <path d="M12 27V45M3 36H21" />
+  </svg>
+</template>
+
+<script lang="ts">
+  import { defineComponent } from 'vue';
+
+  export default defineComponent({
+    name: 'AppstoreAddOutlined'
+  });
+</script>

package/sohelp-icon-select/icons/AppstoreOutlined.vue

@@ -0,0 +1,30 @@
+<template>
+  <svg
+    viewBox="0 0 48 48"
+    fill="none"
+    stroke="currentColor"
+    stroke-width="4"
+    stroke-linecap="round"
+  >
+    <path
+      d="M18 6H8C7 6 6 7 6 8V18C6 19 7 20 8 20H18C19 20 20 19 20 18V8C20 7 19 6 18 6Z"
+    />
+    <path
+      d="M40 6H30C29 6 28 7 28 8V18C28 19 29 20 30 20H40C41 20 42 19 42 18V8C42 7 41 6 40 6Z"
+    />
+    <path
+      d="M40 28H30C29 28 28 29 28 30V40C28 41 29 42 30 42H40C41 42 42 41 42 40V30C42 29 41 28 40 28Z"
+    />
+    <path
+      d="M18 28H8C7 28 6 29 6 30V40C6 41 7 42 8 42H18C19 42 20 41 20 40V30C20 29 19 28 18 28Z"
+    />
+  </svg>
+</template>
+
+<script lang="ts">
+  import { defineComponent } from 'vue';
+
+  export default defineComponent({
+    name: 'AppstoreOutlined'
+  });
+</script>

package/sohelp-icon-select/icons/ArrowDown.vue

@@ -0,0 +1,21 @@
+<template>
+  <svg
+    viewBox="0 0 48 48"
+    fill="none"
+    stroke="currentColor"
+    stroke-width="4"
+    stroke-linecap="round"
+    stroke-linejoin="round"
+    class="ele-arrow-down"
+  >
+    <path d="M10 17 24 31 38 17" />
+  </svg>
+</template>
+
+<script lang="ts">
+  import { defineComponent } from 'vue';
+
+  export default defineComponent({
+    name: 'ArrowDown'
+  });
+</script>