Merge remote-tracking branch 'origin/master'

2024-11-22 23:31:52 +08:00 · 2022-12-29 00:10:06 +08:00 · 2022-12-29 00:10:06 +08:00 · 3afa09bd98
commit 3afa09bd98
parent 3443aa6f5f 258c1ddb70
15 changed files with 82 additions and 68 deletions
--- a/yudao-ui-admin-vue3/package.json
+++ b/yudao-ui-admin-vue3/package.json
@ -25,7 +25,7 @@
  },
  "dependencies": {
    "@iconify/iconify": "^3.0.1",
-    "@vueuse/core": "^9.8.2",
+    "@vueuse/core": "^9.9.0",
    "@wangeditor/editor": "^5.1.23",
    "@wangeditor/editor-for-vue": "^5.1.10",
    "@zxcvbn-ts/core": "^2.1.0",
@ -57,7 +57,7 @@
  "devDependencies": {
    "@commitlint/cli": "^17.3.0",
    "@commitlint/config-conventional": "^17.3.0",
-    "@iconify/json": "^2.1.156",
+    "@iconify/json": "^2.1.157",
    "@intlify/unplugin-vue-i18n": "^0.8.1",
    "@purge-icons/generated": "^0.9.0",
    "@types/intro.js": "^5.1.0",
@ -104,7 +104,7 @@
    "vite-plugin-svg-icons": "^2.0.1",
    "vite-plugin-vue-setup-extend": "^0.4.0",
    "vite-plugin-windicss": "^1.8.10",
-    "vue-tsc": "^1.0.16",
+    "vue-tsc": "^1.0.17",
    "windicss": "^3.5.6"
  },
  "engines": {
--- a/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts
+++ b/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts
@ -7,7 +7,7 @@ import { useI18n } from '@/hooks/web/useI18n'
 import { FormSchema } from '@/types/form'
 import { TableColumn } from '@/types/table'
 import { DescriptionsSchema } from '@/types/descriptions'
-import { ComponentOptions } from '@/types/components'
+import { ComponentOptions, ComponentProps } from '@/types/components'

 export type CrudSchema = Omit<TableColumn, 'children'> & {
  isSearch?: boolean // 是否在查询显示
@ -98,7 +98,7 @@ const filterSearchSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): F
    if (schemaItem?.isSearch || schemaItem.search?.show) {
      let component = schemaItem?.search?.component || 'Input'
      const options: ComponentOptions[] = []
-      let comonentProps = {}
+      let comonentProps: ComponentProps = {}
      if (schemaItem.dictType) {
        const allOptions: ComponentOptions = { label: '全部', value: '' }
        options.push(allOptions)
@ -187,7 +187,7 @@ const filterFormSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): For
          defaultValue = 0
        }
      }
-      let comonentProps = {}
+      let comonentProps: ComponentProps = {}
      if (schemaItem.dictType) {
        const options: ComponentOptions[] = []
        if (schemaItem.dictClass && schemaItem.dictClass === 'number') {
@ -264,7 +264,8 @@ const filterDescriptionsSchema = (crudSchema: CrudSchema[]): DescriptionsSchema[
        descriptionsSchemaItem.dictType = schemaItem.dictType
      }
      if (schemaItem.detail?.dateFormat || schemaItem.formatter == 'formatDate') {
-        descriptionsSchemaItem.dateFormat = schemaItem.dateFormat
+        // 优先使用 detail 下的配置，如果没有默认为 YYYY-MM-DD HH:mm:ss
+        descriptionsSchemaItem.dateFormat = schemaItem?.detail?.dateFormat
          ? schemaItem?.detail?.dateFormat
          : 'YYYY-MM-DD HH:mm:ss'
      }
--- a/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts
+++ b/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts
@ -314,7 +314,8 @@ const filterDescriptionsSchema = (crudSchema: VxeCrudSchema): DescriptionsSchema
        descriptionsSchemaItem.dictType = schemaItem.dictType
      }
      if (schemaItem.detail?.dateFormat || schemaItem.formatter == 'formatDate') {
-        descriptionsSchemaItem.dateFormat = schemaItem.dateFormat
+        // 优先使用 detail 下的配置，如果没有默认为 YYYY-MM-DD HH:mm:ss
+        descriptionsSchemaItem.dateFormat = schemaItem?.detail?.dateFormat
          ? schemaItem?.detail?.dateFormat
          : 'YYYY-MM-DD HH:mm:ss'
      }
--- a/yudao-ui-admin/package.json
+++ b/yudao-ui-admin/package.json
@ -47,7 +47,7 @@
    "clipboard": "2.0.8",
    "core-js": "^3.26.0",
    "crypto-js": "^4.0.0",
-    "echarts": "4.9.0",
+    "echarts": "5.4.0",
    "element-ui": "2.15.10",
    "file-saver": "2.0.5",
    "fuse.js": "6.6.2",
@ -89,7 +89,7 @@
    "fs-extra": "^8.1.0",
    "lint-staged": "12.5.0",
    "runjs": "4.4.2",
-    "sass": "1.3.0",
+    "sass": "1.32.13",
    "sass-loader": "10.2.0",
    "script-ext-html-webpack-plugin": "2.1.5",
    "svg-sprite-loader": "5.1.1",
--- a/yudao-ui-admin/src/assets/styles/ruoyi.scss
+++ b/yudao-ui-admin/src/assets/styles/ruoyi.scss
@ -60,6 +60,10 @@
  color: inherit;
 }

+.el-message-box__status + .el-message-box__message{
+  word-break: break-word;
+}
+
 .el-dialog:not(.is-fullscreen) {
  margin-top: 6vh !important;
 }
--- a/yudao-ui-admin/src/components/HeaderSearch/index.vue
+++ b/yudao-ui-admin/src/components/HeaderSearch/index.vue
@ -88,7 +88,6 @@ export default {
        threshold: 0.4,
        location: 0,
        distance: 100,
-        maxPatternLength: 32,
        minMatchCharLength: 1,
        keys: [{
          name: 'title',
--- a/yudao-ui-admin/src/components/RightPanel/index.vue
+++ b/yudao-ui-admin/src/components/RightPanel/index.vue
@ -53,7 +53,6 @@ export default {
    }
  },
  mounted() {
-    this.insertToBody()
    this.addEventClick()
  },
  beforeDestroy() {
@ -70,11 +69,6 @@ export default {
        this.show = false
        window.removeEventListener('click', this.closeSidebar)
      }
-    },
-    insertToBody() {
-      const elx = this.$refs.rightPanel
-      const body = document.querySelector('body')
-      body.insertBefore(elx, body.firstChild)
    }
  }
 }
--- a/yudao-ui-admin/src/components/TopNav/index.vue
+++ b/yudao-ui-admin/src/components/TopNav/index.vue
@ -1,14 +1,14 @@
 <template>
  <el-menu
-      :default-active="activeMenu"
-      mode="horizontal"
-      @select="handleSelect"
+    :default-active="activeMenu"
+    mode="horizontal"
+    @select="handleSelect"
  >
    <template v-for="(item, index) in topMenus">
-      <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber"
-      ><svg-icon :icon-class="item.meta.icon" />
-        {{ item.meta.title }}</el-menu-item
-      >
+      <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber">
+        <svg-icon :icon-class="item.meta.icon"/>
+        {{ item.meta.title }}
+      </el-menu-item>
    </template>

    <!-- 顶部菜单超出数量折叠 -->
@ -16,12 +16,13 @@
      <template slot="title">更多菜单</template>
      <template v-for="(item, index) in topMenus">
        <el-menu-item
-            :index="item.path"
-            :key="index"
-            v-if="index >= visibleNumber"
-        ><svg-icon :icon-class="item.meta.icon" />
-          {{ item.meta.title }}</el-menu-item
+          :index="item.path"
+          :key="index"
+          v-if="index >= visibleNumber"
        >
+          <svg-icon :icon-class="item.meta.icon"/>
+          {{ item.meta.title }}
+        </el-menu-item>
      </template>
    </el-submenu>
  </el-menu>
@ -92,7 +93,9 @@ export default {
      if (path !== undefined && path.lastIndexOf("/") > 0 && hideList.indexOf(path) === -1) {
        const tmpPath = path.substring(1, path.length);
        activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"));
-        this.$store.dispatch('app/toggleSideBarHide', false);
+        if (!this.$route.meta.link) {
+          this.$store.dispatch('app/toggleSideBarHide', false)
+        }
      } else if(!this.$route.children) {
        activePath = path;
        this.$store.dispatch('app/toggleSideBarHide', true);
@ -145,6 +148,8 @@ export default {
      }
      if(routes.length > 0) {
        this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
+      } else {
+        this.$store.dispatch("app/toggleSideBarHide", true);
      }
    },
    ishttp(url) {
--- a/yudao-ui-admin/src/components/Verifition/Verify.vue
+++ b/yudao-ui-admin/src/components/Verifition/Verify.vue
@ -139,7 +139,6 @@ export default {
      let slider = 'slider' + '-' + s.join('')
      let point = 'point' + '-' + s.join('')
      // 判断下是否存在 slider
-      console.log(localStorage.getItem('slider'))
      if (!localStorage.getItem('slider')) {
        localStorage.setItem('slider', slider)
      }
--- a/yudao-ui-admin/src/layout/components/TagsView/index.vue
+++ b/yudao-ui-admin/src/layout/components/TagsView/index.vue
@ -239,7 +239,7 @@ export default {

 <style lang="scss" scoped>
 .tags-view-container {
-  height: 34px;
+  height: 36px;
  width: 100%;
  background: #fff;
  border-bottom: 1px solid #d8dce5;
@ -249,15 +249,16 @@ export default {
      display: inline-block;
      position: relative;
      cursor: pointer;
-      height: 26px;
-      line-height: 26px;
+      height: 28px;
+      line-height: 28px;
      border: 1px solid #d8dce5;
      color: #495060;
      background: #fff;
-      padding: 0 8px;
+      padding: 0 6px;
      font-size: 12px;
-      margin-left: 5px;
+      margin-left: 4px;
      margin-top: 4px;
+      border-radius: 3px 3px 3px 3px;
      &:first-of-type {
        margin-left: 15px;
      }
--- a/yudao-ui-admin/src/views/dashboard/BarChart.vue
+++ b/yudao-ui-admin/src/views/dashboard/BarChart.vue
@ -3,7 +3,7 @@
 </template>

 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'

--- a/yudao-ui-admin/src/views/dashboard/LineChart.vue
+++ b/yudao-ui-admin/src/views/dashboard/LineChart.vue
@ -3,7 +3,7 @@
 </template>

 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'

--- a/yudao-ui-admin/src/views/dashboard/PieChart.vue
+++ b/yudao-ui-admin/src/views/dashboard/PieChart.vue
@ -3,7 +3,7 @@
 </template>

 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'

--- a/yudao-ui-admin/src/views/dashboard/RaddarChart.vue
+++ b/yudao-ui-admin/src/views/dashboard/RaddarChart.vue
@ -3,7 +3,7 @@
 </template>

 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'

--- a/yudao-ui-admin/yarn.lock
+++ b/yudao-ui-admin/yarn.lock
@ -2775,6 +2775,21 @@ check-types@^8.0.3:
  resolved "https://registry.npmmirror.com/check-types/-/check-types-8.0.3.tgz"
  integrity sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==

+"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1:
+  version "3.5.3"
+  resolved "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 chokidar@^2.1.8:
  version "2.1.8"
  resolved "https://registry.npmmirror.com/chokidar/-/chokidar-2.1.8.tgz"
@ -2794,21 +2809,6 @@ chokidar@^2.1.8:
  optionalDependencies:
    fsevents "^1.2.7"

-chokidar@^3.4.1:
-  version "3.5.3"
-  resolved "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz"
-  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
 chownr@^1.1.1:
  version "1.1.4"
  resolved "https://registry.npmmirror.com/chownr/-/chownr-1.1.4.tgz"
@ -3942,12 +3942,13 @@ ecc-jsbn@~0.1.1:
    jsbn "~0.1.0"
    safer-buffer "^2.1.0"

-echarts@4.9.0:
-  version "4.9.0"
-  resolved "https://registry.npmmirror.com/echarts/-/echarts-4.9.0.tgz"
-  integrity sha512-+ugizgtJ+KmsJyyDPxaw2Br5FqzuBnyOWwcxPKO6y0gc5caYcfnEUIlNStx02necw8jmKmTafmpHhGo4XDtEIA==
+echarts@5.4.0:
+  version "5.4.0"
+  resolved "https://registry.npmmirror.com/echarts/-/echarts-5.4.0.tgz#a9a8e5367293a397408d3bf3e2638b869249ce04"
+  integrity sha512-uPsO9VRUIKAdFOoH3B0aNg7NRVdN7aM39/OjovjO9MwmWsAkfGyeXJhK+dbRi51iDrQWliXV60/XwLA7kg3z0w==
  dependencies:
-    zrender "4.3.2"
+    tslib "2.3.0"
+    zrender "5.4.0"

 editorconfig@^0.15.3:
  version "0.15.3"
@ -8527,10 +8528,12 @@ sass-loader@10.2.0:
    schema-utils "^3.0.0"
    semver "^7.3.2"

-sass@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.npmmirror.com/sass/-/sass-1.3.0.tgz#570f2ac1c868dacf2101648056f40423284a557c"
-  integrity sha512-YdPvqr6GCzh70dB0NMdQ+95YS5WxdCSrJ1eql3+o+t/GOQQTNgb4qXAY+b8e6dIHx7fa3LT73EpsjeZTXdCZkQ==
+sass@1.32.13:
+  version "1.32.13"
+  resolved "https://registry.npmmirror.com/sass/-/sass-1.32.13.tgz#8d29c849e625a415bce71609c7cf95e15f74ed00"
+  integrity sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA==
+  dependencies:
+    chokidar ">=3.0.0 <4.0.0"

 sax@^1.2.4, sax@~1.2.4:
  version "1.2.4"
@ -9586,6 +9589,11 @@ tsconfig-paths@^3.14.1:
    minimist "^1.2.6"
    strip-bom "^3.0.0"

+tslib@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
+  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
+
 tslib@^1.9.0:
  version "1.14.1"
  resolved "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz"
@ -10370,7 +10378,9 @@ yorkie@^2.0.0:
    normalize-path "^1.0.0"
    strip-indent "^2.0.0"

-zrender@4.3.2:
-  version "4.3.2"
-  resolved "https://registry.npmmirror.com/zrender/-/zrender-4.3.2.tgz"
-  integrity sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g==
+zrender@5.4.0:
+  version "5.4.0"
+  resolved "https://registry.npmmirror.com/zrender/-/zrender-5.4.0.tgz#d4f76e527b2e3bbd7add2bdaf27a16af85785576"
+  integrity sha512-rOS09Z2HSVGFs2dn/TuYk5BlCaZcVe8UDLLjj1ySYF828LATKKdxuakSZMvrDz54yiKPDYVfjdKqcX8Jky3BIA==
+  dependencies:
+    tslib "2.3.0"