Merge branch 'dev' of https://github.com/opentiny/tiny-vue into feat-tree-menu

Author: jieliu52

examples/sites/demos/pc/app/grid/custom-style/class-name-composition-api.vue

@@ -75,6 +75,6 @@ const tableData = ref([
 
 <style>
 .gridClassName {
-  background: #e6f7ff;
+  background-color: #2db7f5;
 }
 </style>

examples/sites/demos/pc/app/grid/custom-style/class-name.spec.js

@@ -3,5 +3,5 @@ import { test, expect } from '@playwright/test'
 test('自定义列样式', async ({ page }) => {
   page.on('pageerror', (exception) => expect(exception).toBeNull())
   await page.goto('grid-custom-style#custom-style-class-name')
-  await expect(page.locator('.gridClassName').first()).toHaveCSS('background-color', 'rgb(230, 247, 255)')
+  await expect(page.locator('.gridClassName').first()).toHaveCSS('background-color', 'rgb(45, 183, 245)')
 })

examples/sites/demos/pc/app/grid/custom-style/class-name.vue

@@ -84,6 +84,6 @@ export default {
 
 <style>
 .gridClassName {
-  background: #e6f7ff;
+  background-color: #2db7f5;
 }
 </style>

examples/sites/demos/pc/app/grid/editor/active-strictly-composition-api.vue

@@ -78,6 +78,6 @@ function cellClassName({ row, column }) {
 
 <style>
 .disable-cell-edit {
-  background-color: #e8ebef;
+  background-color: var(--tv-color-bg-disabled);
 }
 </style>

examples/sites/demos/pc/app/grid/editor/active-strictly.vue

@@ -87,6 +87,6 @@ export default {
 
 <style>
 .disable-cell-edit {
-  background-color: #e8ebef;
+  background-color: var(--tv-color-bg-disabled);
 }
 </style>

examples/sites/demos/pc/app/grid/editor/editor-bg-composition-api.vue

@@ -73,6 +73,6 @@ function cellClassName({ row, column }) {
 
 <style>
 .disable-cell-edit {
-  background-color: #e8ebef;
+  background-color: var(--tv-color-bg-disabled);
 }
 </style>

examples/sites/demos/pc/app/grid/editor/editor-bg.vue

@@ -82,6 +82,6 @@ export default {
 
 <style>
 .disable-cell-edit {
-  background-color: #e8ebef;
+  background-color: var(--tv-color-bg-disabled);
 }
 </style>

examples/sites/demos/pc/app/grid/loading/grid-custom-loading-composition-api.vue

@@ -70,6 +70,6 @@ const loadingComponent = () => (
   display: flex;
   align-items: center;
   justify-content: center;
-  background: rgba(0, 0, 0, 0.3);
+  background: var(--tv-color-bg-mask);
 }
 </style>

examples/sites/demos/pc/app/grid/loading/grid-custom-loading.vue

@@ -83,6 +83,6 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  background: rgba(0, 0, 0, 0.3);
+  background: var(--tv-color-bg-mask);
 }
 </style>

examples/sites/demos/pc/webdoc/faq.md

@@ -73,3 +73,15 @@ export default defineConfig({
   }
 </style>
 ```
+
+## 4、`webpack` 无法解析富文本组件相关依赖包
+
+`webpack`、`vue-cli` 默认不会解析转换 `node_modules` 中的依赖包，导致在工程中无法识别 `quill` 和 `@opentiny/fluent-editor` 包中的 `javascript` 高级语法。
+
+可以通过在 `vue.config.js` 文件中增加如下配置解决：
+
+```js
+module.exports = {
+  transpileDependencies: ['@opentiny/fluent-editor', 'quill']
+}
+```

packages/renderless/src/grid/utils/dom.ts

@@ -188,11 +188,15 @@ export const colToVisible = ($table, column, move) => {
 }
 
 export const hasDataTag = (el, value) => {
-  // el可能为shadow-root，shadow-root没有getAttribute方法
-  if (!el || !value || !el.getAttribute) {
+  if (!el || !value) {
     return false
   }
 
+  // 处理遇到 shadowRoot的情况
+  if (el.host) {
+    el = el.host
+  }
+
   return (' ' + el.getAttribute('data-tag') + ' ').includes(' ' + value + ' ')
 }
 

packages/renderless/src/ip-address/index.ts

@@ -89,32 +89,31 @@ export const getValue =
 export const setValue =
   ({ api, props, state }: { api: IIpAddressApi; props: IIpAddressProps; state: IIpAddressState }) =>
   (value: string) => {
-    if (value) {
-      /* istanbul ignore else */
-      if (api?.ipValidator?.(value)) {
-        if (api.isIP6(props.type)) {
-          state.address = value.split(':').map((item) => ({ value: item }))
-          if (state.address.length < 8) {
-            let insertIndex = 0
-            state.address.forEach((item, index) => {
-              if (item.value === '') {
-                item.value = '0000'
-                insertIndex = index
-              }
-            })
-            for (let i = 0; i <= 8 - state.address.length; i++) {
-              state.address.splice(insertIndex, 0, { value: '0000' })
-            }
-          }
-        } else {
-          state.address = value.split('.').map((item) => ({ value: item }))
+    if (!value || !api?.ipValidator?.(value)) {
+      const createValue = () => ({ value: '' })
+      state.address = api.isIP6(props.type)
+        ? Array.from({ length: 8 }, createValue)
+        : Array.from({ length: 4 }, createValue)
+
+      return
+    }
+
+    if (api.isIP6(props.type)) {
+      state.address = value.split(':').map((item) => ({ value: item }))
+      if (state.address.length < 8) {
+        const missingCount = 8 - state.address.length
+        const emptyIndex = state.address.findIndex((item) => item.value === '')
+        const insertIndex = emptyIndex >= 0 ? emptyIndex : 0
+
+        if (emptyIndex >= 0) {
+          state.address[emptyIndex].value = '0000'
         }
+
+        const newItems = Array(missingCount).fill({ value: '0000' })
+        state.address.splice(insertIndex, 0, ...newItems)
       }
     } else {
-      const createValue = () => ({ value: '' })
-      state.address = api.isIP6(props.type)
-        ? new Array(8).fill('').map(createValue)
-        : new Array(4).fill('').map(createValue)
+      state.address = value.split('.').map((item) => ({ value: item }))
     }
   }
 

packages/renderless/src/year-table/index.ts

@@ -26,7 +26,7 @@ export const getIsDefault =
 export const getIsDisabled =
   ({ props }) =>
   (year) => {
-    return props.selectionMode.startsWith('year') && typeof props.disabledDate === 'function'
+    return typeof props.disabledDate === 'function'
       ? props.disabledDate(new Date(year, 0, 1, 0))
       : false
   }

packages/theme/build/buildVarToObj.js

@@ -0,0 +1,13 @@
+import fs from 'node:fs'
+
+export default () => {
+  let varsString = fs.readFileSync('../src/base/vars.less', {encoding: 'utf-8'})
+
+  varsString = varsString.replace(':root', 'export const mapVar =')
+  .replaceAll('  --tv', '  "--tv')
+  .replaceAll(': ', ':')
+  .replaceAll(':', '": "')
+  .replaceAll(';', '",')
+
+  fs.writeFileSync('./mapVar.js', varsString)
+}

packages/theme/build/gulp-dist.js

@@ -9,6 +9,11 @@ import svgInline from 'gulp-svg-inline'
 import prefixer from 'gulp-autoprefixer'
 import fg from 'fast-glob'
 import fs from 'node:fs'
+import buildVarToObj from './buildVarToObj.js'
+import writeDefaultValue from './writeDefaultValue.js'
+
+buildVarToObj()
+writeDefaultValue()
 
 const source = '../src'
 const dist = '../dist'