vue2-client 1.18.22 → 1.18.24

package/src/utils/authority-utils.js

@@ -1,85 +1,85 @@
-/**
- * 判断是否有路由的权限
- * @param authority 路由权限配置
- * @param permissions 用户权限集合
- * @returns {boolean|*}
- */
-function hasPermission (authority, permissions) {
-  let required = '*'
-  if (typeof authority === 'string') {
-    required = authority
-  } else if (Array.isArray(authority)) {
-    required = authority
-  } else if (typeof authority === 'object') {
-    required = authority.permission
-  }
-  return required === '*' || hasAnyItem(required, permissions, (r, t) => !!(r === t || r === t.id))
-}
-
-/**
- * 判断是否有路由需要的角色
- * @param authority 路由权限配置
- * @param roles 用户角色集合
- */
-function hasRole (authority, roles) {
-  let required
-  if (typeof authority === 'object') {
-    required = authority.role
-  }
-  return authority === '*' || hasAnyItem(required, roles, (r, t) => !!(r === t || r === t.id))
-}
-
-/**
- * 判断目标数组是否有所需元素
- * @param {String | String[]}required 所需元素，数组或单个元素
- * @param {String[]|Object[]} source 目标数组
- * @param {Function} filter 匹配条件
- * (r: String, s: String|Object) => boolean
- * @returns {boolean}
- */
-function hasAnyItem (required, source, filter) {
-  if (!required) {
-    return false
-  }
-  const checkedList = Array.isArray(required) ? required : [required]
-  return !!source.find(s => checkedList.find(r => filter(r, s)))
-}
-
-/**
- * 路由权限校验
- * @param route 路由
- * @param permissions 用户权限集合
- * @param roles 用户角色集合
- * @returns {boolean}
- */
-function hasAuthority (route, permissions, roles) {
-  const authorities = [...route.meta.pAuthorities, route.meta.authority]
-  for (const authority of authorities) {
-    if (!hasPermission(authority, permissions) && !hasRole(authority, roles)) {
-      return false
-    }
-  }
-  return true
-}
-
-/**
- * 根据权限配置过滤菜单数据
- * @param menuData
- * @param permissions
- * @param roles
- */
-function filterMenu (menuData, permissions, roles) {
-  return menuData.filter(menu => {
-    if (menu.meta && menu.meta.invisible === undefined) {
-      if (!hasAuthority(menu, permissions, roles)) {
-        return false
-      }
-    }
-    if (menu.children && menu.children.length > 0) {
-      menu.children = filterMenu(menu.children, permissions, roles)
-    }
-    return true
-  })
-}
-
-export { filterMenu, hasAuthority }
+/**
+ * 判断是否有路由的权限
+ * @param authority 路由权限配置
+ * @param permissions 用户权限集合
+ * @returns {boolean|*}
+ */
+function hasPermission (authority, permissions) {
+  let required = '*'
+  if (typeof authority === 'string') {
+    required = authority
+  } else if (Array.isArray(authority)) {
+    required = authority
+  } else if (typeof authority === 'object') {
+    required = authority.permission
+  }
+  return required === '*' || hasAnyItem(required, permissions, (r, t) => !!(r === t || r === t.id))
+}
+
+/**
+ * 判断是否有路由需要的角色
+ * @param authority 路由权限配置
+ * @param roles 用户角色集合
+ */
+function hasRole (authority, roles) {
+  let required
+  if (typeof authority === 'object') {
+    required = authority.role
+  }
+  return authority === '*' || hasAnyItem(required, roles, (r, t) => !!(r === t || r === t.id))
+}
+
+/**
+ * 判断目标数组是否有所需元素
+ * @param {String | String[]}required 所需元素，数组或单个元素
+ * @param {String[]|Object[]} source 目标数组
+ * @param {Function} filter 匹配条件
+ * (r: String, s: String|Object) => boolean
+ * @returns {boolean}
+ */
+function hasAnyItem (required, source, filter) {
+  if (!required) {
+    return false
+  }
+  const checkedList = Array.isArray(required) ? required : [required]
+  return !!source.find(s => checkedList.find(r => filter(r, s)))
+}
+
+/**
+ * 路由权限校验
+ * @param route 路由
+ * @param permissions 用户权限集合
+ * @param roles 用户角色集合
+ * @returns {boolean}
+ */
+function hasAuthority (route, permissions, roles) {
+  const authorities = [...route.meta.pAuthorities, route.meta.authority]
+  for (const authority of authorities) {
+    if (!hasPermission(authority, permissions) && !hasRole(authority, roles)) {
+      return false
+    }
+  }
+  return true
+}
+
+/**
+ * 根据权限配置过滤菜单数据
+ * @param menuData
+ * @param permissions
+ * @param roles
+ */
+function filterMenu (menuData, permissions, roles) {
+  return menuData.filter(menu => {
+    if (menu.meta && menu.meta.invisible === undefined) {
+      if (!hasAuthority(menu, permissions, roles)) {
+        return false
+      }
+    }
+    if (menu.children && menu.children.length > 0) {
+      menu.children = filterMenu(menu.children, permissions, roles)
+    }
+    return true
+  })
+}
+
+export { filterMenu, hasAuthority }

package/src/utils/errorCode.js

@@ -1,6 +1,6 @@
-export default {
-  401: '认证失败，无法访问系统资源',
-  403: '当前操作没有权限',
-  404: '访问资源不存在',
-  default: '系统未知错误，请反馈给管理员'
-}
+export default {
+  401: '认证失败，无法访问系统资源',
+  403: '当前操作没有权限',
+  404: '访问资源不存在',
+  default: '系统未知错误，请反馈给管理员'
+}

package//350/277/201/347/247/273/346/227/245/345/277/227.md

@@ -1,15 +1,15 @@
-# vue2迁移vue3
-
-1. 完成vue-cli，webpack，babel，eslint的升级
-   - core-js 3.30.1 -> 3.33.0
-   - add regenerator-runtime
-   - @babel/core 7.21.4 -> 7.22.20
-   - babel-eslint 10.1.0 -> @babel/eslint-parser 7.22.15
-   - @vue/cli 4.5.19 -> 5.0.8
-   - babel-jest 25.5.1 -> 26.6.3
-   - eslint 6.8.0 -> 7.32.0
-   - jest 24.0.0 -> 26.6.3
-   - webpack 4.46.0 -> 5.88.2
-2. 完成vue2的2.7升级
-   - vue 2.6.14 -> 2.7.14
-   - eslint 7.32.0 -> 8.51.0
+# vue2迁移vue3
+
+1. 完成vue-cli，webpack，babel，eslint的升级
+   - core-js 3.30.1 -> 3.33.0
+   - add regenerator-runtime
+   - @babel/core 7.21.4 -> 7.22.20
+   - babel-eslint 10.1.0 -> @babel/eslint-parser 7.22.15
+   - @vue/cli 4.5.19 -> 5.0.8
+   - babel-jest 25.5.1 -> 26.6.3
+   - eslint 6.8.0 -> 7.32.0
+   - jest 24.0.0 -> 26.6.3
+   - webpack 4.46.0 -> 5.88.2
+2. 完成vue2的2.7升级
+   - vue 2.6.14 -> 2.7.14
+   - eslint 7.32.0 -> 8.51.0

package/src-base-client/components/common/HIS/HForm/HForm.vue

@@ -1,347 +0,0 @@
-<script setup lang="ts">
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { ref, computed, useAttrs } from 'vue'
-
-const xAddNativeFormRef = ref()
-
-const attrs = useAttrs()
-const wrapperClassObject = computed(() => {
-  const a = attrs
-  const classes = {}
-
-  // 1) 多个布尔型样式开关（存在且为真则生效）
-  const booleanStyleKeys = [
-    'query-conditions',
-    'padding-50',
-    'label-text-horizontal',
-    'label-text-justify',
-    'charge-form'
-  ]
-  for (const key of booleanStyleKeys) {
-    const val = a[key]
-    const truthy = val === true || val === '' || val === 'true'
-    if (truthy) classes[`h-form-${key}`] = true
-  }
-  return classes
-})
-
-defineExpose({
-  getXAddNativeFormInstance: () => xAddNativeFormRef.value,
-  init: (params) => xAddNativeFormRef.value && xAddNativeFormRef.value.init && xAddNativeFormRef.value.init(params),
-  asyncSubmit: () => xAddNativeFormRef.value && xAddNativeFormRef.value.asyncSubmit && xAddNativeFormRef.value.asyncSubmit(),
-  validateForm: () => xAddNativeFormRef.value && xAddNativeFormRef.value.validateForm && xAddNativeFormRef.value.validateForm()
-})
-
-</script>
-
-<template>
-  <div
-    class="h-form-wrapper"
-    :class="[
-      wrapperClassObject
-    ]"
-  >
-
-    <x-add-native-form
-      ref="xAddNativeFormRef"
-      v-bind="$attrs"
-      v-on="$listeners"
-    >
-      <template v-for="(_, name) in $slots" #[name]="slotData">
-        <slot :name="name" v-bind="slotData" />
-      </template>
-    </x-add-native-form>
-  </div>
-</template>
-
-<style scoped lang="less">
-.h-form-wrapper {
-  // 基础样式
-  :deep(.ant-form-item) {
-    margin-bottom: 4px;
-  }
-
-  // query-conditions 样式
-  &.h-form-query-conditions {
-    // ant-card-body 样式
-    :deep(.ant-card-body) {
-      padding: 0px;
-    }
-
-    // ant-row-flex 样式
-    :deep(.ant-row-flex) {
-      // x-form-col-wrapper 样式
-      .x-form-col-wrapper {
-        .ant-form-item {
-          display: flex;
-          width: 100%;
-          margin-bottom: 4px;
-          justify-content: space-between;
-
-          .ant-form-item-label {
-            padding-left: 4px;
-            width: 100%;
-          }
-
-          .ant-form-item-control-wrapper {
-            padding-left: -6px;
-          }
-        }
-      }
-
-      // ant-col-24 样式
-      .ant-col-24 {
-        padding: 0px 4px !important;
-      }
-    }
-  }
-
-  &.h-form-padding-50 {
-    // ant-row-flex 样式
-    :deep(.ant-row-flex) {
-      padding-left: 50px;
-      padding-right: 50px
-    }
-  }
-
-  // charge-form 样式
-  &.h-form-charge-form {
-    margin-top: 2px !important;
-    // 定义变量
-    @font-common: {
-      font-family: 'Source Han Sans', sans-serif;
-      font-size: 16px;
-      font-weight: normal;
-      letter-spacing: 0em;
-      font-variation-settings: "opsz" auto;
-      font-feature-settings: "kern" on;
-    };
-
-    @color-primary: #313131;
-    @color-placeholder: #999999;
-
-    // 定义混合宏
-    .input-base() {
-      width: 100%;
-      height: 30px;
-      line-height: 30px;
-      vertical-align: top;
-      margin: 0;
-      text-align: left;
-      color: @color-primary;
-      opacity: 1;
-      @font-common();
-    }
-
-    .placeholder-base() {
-      color: @color-placeholder;
-      opacity: 1;
-      @font-common();
-    }
-
-    .option-group-base() {
-      height: 30px;
-      line-height: 30px;
-      display: flex;
-      align-items: center;
-
-      .ant-radio-wrapper,
-      .ant-checkbox-wrapper {
-        height: 30px;
-        line-height: 30px;
-        margin-right: 16px;
-      }
-    }
-
-    :deep(.ant-form-item) {
-      margin-bottom: 16px;
-      margin-top: 0;
-      padding: 0;
-      display: flex;
-      align-items: center;
-
-      .ant-form-item-label {
-        text-align: left;
-        margin: 0 16px 0 0 !important;
-        width: 64px;
-        min-width: 64px;
-        max-width: 64px;
-        flex-shrink: 0;
-
-        label {
-          height: 23px;
-          opacity: 1;
-          line-height: 23px;
-          color: @color-primary;
-          margin: 0;
-          padding: 0;
-          white-space: nowrap;
-          display: block;
-          @font-common();
-
-          // 移除冒号
-          &::after {
-            content: '';
-          }
-        }
-      }
-
-      .ant-form-item-control-wrapper {
-        margin: 0;
-        padding: 0;
-        flex: 1;
-        min-width: 0;
-        display: flex;
-        align-items: center;
-
-        .ant-form-item-control {
-          margin: 0;
-          padding: 0;
-          width: 100%;
-          text-align: left;
-          line-height: 30px !important;
-
-          // 输入框样式统一
-          .ant-input,
-          .ant-input-affix-wrapper,
-          .ant-select,
-          .ant-input-number,
-          .ant-picker,
-          .ant-radio-group,
-          .ant-checkbox-group {
-            .input-base();
-          }
-
-          // 选择器样式
-          .ant-select {
-            .ant-select-selector {
-              .input-base();
-              height: 30px;
-              line-height: 30px;
-
-              .ant-select-selection-item {
-                .input-base();
-                line-height: 30px;
-              }
-
-              .ant-select-selection-placeholder {
-                .placeholder-base();
-                line-height: 30px;
-              }
-            }
-          }
-
-          // 日期选择器样式
-          .ant-picker {
-            height: 30px;
-
-            .ant-picker-input {
-              height: 30px;
-              line-height: 30px;
-              .input-base();
-
-              input {
-                .input-base();
-                height: 30px;
-                line-height: 30px;
-              }
-            }
-          }
-
-          // 数字输入框样式
-          .ant-input-number {
-            height: 30px;
-
-            .ant-input-number-input {
-              .input-base();
-              height: 30px;
-              line-height: 30px;
-            }
-          }
-
-          // 单选框组样式
-          .ant-radio-group {
-            .option-group-base();
-          }
-
-          // 复选框组样式
-          .ant-checkbox-group {
-            .option-group-base();
-          }
-        }
-      }
-    }
-
-    // 重置可能的容器边距
-    :deep(.ant-row) {
-      margin: 0;
-      padding: 0;
-
-      .ant-col {
-        margin: 0;
-        padding: 0;
-      }
-    }
-
-    // 强制重置所有可能的表单项样式
-    :deep(.ant-form-item) {
-      margin: 0 0 16px 0 !important;
-
-      // 重置可能的内部边距
-      .ant-form-item-control-input,
-      .ant-form-item-control-input-content {
-        margin: 0 !important;
-        padding: 0 !important;
-      }
-    }
-  }
-
-  // label-text-horizontal 样式 - 只控制label文字从左到右排列
-  &.h-form-label-text-horizontal {
-    :deep(.ant-form-item-label) {
-      text-align: left;
-      direction: ltr;
-
-      // 标签文字水平排列
-      .ant-form-item-label-text {
-        display: inline-block;
-        text-align: left;
-        direction: ltr;
-        unicode-bidi: normal;
-      }
-
-      // 必填标识水平排列
-      .ant-form-item-required::before {
-        margin-right: 4px;
-        margin-left: 0;
-      }
-    }
-  }
-
-  // label-text-justify 样式 - 标签文字两端对齐分散占满 必填*可能会有问题
-  &.h-form-label-text-justify {
-    :deep(.ant-form-item-label) {
-      padding-left: 0;
-      padding-right: 8px;
-      label {
-        position: relative;
-        display: block;
-        width: 100%;
-        white-space: nowrap;
-        margin: 0;
-        text-indent: 0;
-        text-align: justify;
-        text-align-last: justify;
-        text-justify: inter-ideograph;
-        box-sizing: border-box;
-        padding-right: 12px; // 给绝对定位的冒号留出空间
-      }
-      // 将冒号绝对定位到最右侧，避免参与两端对齐计算
-      label::after {
-        position: absolute;
-        right: 0;
-      }
-    }
-  }
-}
-</style>