Skip to content

Commit

Permalink
Merge branch 'dev' into daterange
Browse files Browse the repository at this point in the history
  • Loading branch information
discreted66 authored Feb 7, 2025
2 parents 0fa2da7 + f4fcf7a commit 8e19ff1
Show file tree
Hide file tree
Showing 1,397 changed files with 2,877 additions and 22,000 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/auto-all-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,14 @@ jobs:
- name: Run Build ThemeMobile
run: pnpm build:themeMobile

- name: Run Build Utils
run: pnpm build:utils

- name: Run Build Runtime
run: pnpm build:runtime

- name: Publish Vue3 And Vue2 components
run: pnpm pub:all
run: pnpm pub:all && pnpm pub:utils
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/dispatch-all-publish-alpha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,16 @@ jobs:
- name: Run Build ThemeMobile
run: pnpm build:themeMobile

- name: Run Build Utils
run: pnpm build:utils

- name: Run Build Runtime
run: pnpm build:runtime

- name: Run Release alpha
run: pnpm release:alpha

- name: Publish Vue3 And Vue2 components
run: pnpm pub:all && pnpm pub:site
run: pnpm pub:all && pnpm pub:utils && pnpm pub:site
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_OPENTINY_VUE_TOKEN }}
16 changes: 14 additions & 2 deletions .github/workflows/dispatch-renderless-theme-publish-alpha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
components:
description: |
输入需要打包的模块名称,多个以英文逗号分隔,
例如: `theme,renderless,runtime,docs`
例如: `theme,renderless,runtime,docs,utils`
required: true
type: string
concurrency:
Expand All @@ -25,8 +25,9 @@ jobs:
script: |
const branchName = `${{ github.ref_name }}`
const moduleName = `${{ inputs.components }}`
const validModuleNames = ['theme', 'renderless', 'runtime', 'docs','utils']
if (!moduleName.includes('theme') && !moduleName.includes('renderless') && !moduleName.includes('docs') && !moduleName.includes('runtime')) {
if (!validModuleNames.some(name => moduleName.includes(name))) {
throw new Error('请输入正确的包名称')
}
Expand Down Expand Up @@ -80,6 +81,10 @@ jobs:
if: contains(inputs.components, 'runtime') == true
run: pnpm build:runtime

- name: Run Build Utils
if: contains(inputs.components, 'utils') == true
run: pnpm build:utils

- name: Run Release alpha
run: pnpm release:alpha -u

Expand All @@ -89,6 +94,13 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_OPENTINY_VUE_TOKEN }}

- name: Publish Utils
if: contains(inputs.components, 'utils') == true
run: |
pnpm pub:utils
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_OPENTINY_VUE_TOKEN }}

- name: Publish Docs
if: contains(inputs.components, 'docs') == true
run: |
Expand Down
6 changes: 4 additions & 2 deletions examples/nuxt/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,19 @@
},
"devDependencies": {
"@opentiny-internal/unplugin-virtual-template": "workspace:*",
"@opentiny/utils": "workspace:~",
"@opentiny/vue": "workspace:~",
"@opentiny/vue-common": "workspace:~",
"@opentiny/vue-directive": "workspace:~",
"@opentiny/vue-hooks": "workspace:~",
"@opentiny/vue-icon": "workspace:~",
"@opentiny/vue-locale": "workspace:~",
"@opentiny/vue-renderless": "workspace:~",
"@opentiny/vue-theme": "workspace:~",
"@opentiny/vue-theme-mobile": "workspace:~",
"@opentiny/vue-vite-import": "workspace:~",
"@opentiny/vue-vite-import": "~1.2.0",
"@tiptap/vue-3": "^2.1.0",
"@vitejs/plugin-vue-jsx": "^3.0.0",
"js-sha256": "^0.9.0",
"onigasm": "^2.2.5",
"postcss": "^8.4.16",
"typescript": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/nuxt/playground/pages/InfiniteScroll.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</template>

<script setup lang="ts">
import InfiniteScroll from '@opentiny/vue-renderless/common/deps/infinite-scroll'
import { InfiniteScroll } from '@opentiny/vue-directive'
import { ref } from 'vue'
const count = ref(0)
Expand Down
14 changes: 1 addition & 13 deletions examples/sites/demos/apis/grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -2490,24 +2490,12 @@ export default {
defaultValue: '',
desc: {
'zh-CN':
'表格校验函数,如果指定 row 或 rows 则校验指定一行或多行,否则校验整个表格。该回调函数会在校验结束后被调用,并传入两个参数:(是否校验成功,最近一列未通过校验的字段)。若不传入回调函数,则会返回一个 promise',
'表格校验函数,如果指定 row 或 rows 则校验指定一行或多行,否则校验整个表格。该回调函数会在校验结束后被调用,并传入两个参数:(是否校验成功,最近一列未通过校验的字段)。若不传入回调函数,则会返回一个 promise, 校验成功返回 true (3.22.0新增),校验失败返回错误信息对象',
'en-US':
'Table verification function. If a row or rows is specified, the specified row or multiple rows are verified. Otherwise, the entire table is verified. This callback function is called after the verification is complete and the following parameters are transferred: (Whether the verification is successful. The fields in the latest column fail the verification.) If no callback function is passed in, a promise is returned'
},
mode: ['pc', 'mobile-first'],
pcDemo: 'grid-validation#validation-before-submit-validation'
},
{
name: 'validate(rows, callback)',
type: '',
defaultValue: '',
desc: {
'zh-CN':
'表格校验函数,如果指定 row 或 rows 则校验指定一行或多行,否则校验整个表格。该回调函数会在校验结束后被调用,并传入两个参数:(是否校验成功,最近一列未通过校验的字段)。若不传入回调函数,则会返回一个 promise',
'en-US': ''
},
mode: ['mobile-first'],
mfDemo: ''
}
],
slots: [
Expand Down
8 changes: 6 additions & 2 deletions examples/sites/demos/apis/modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -330,12 +330,16 @@ export default {
{
name: 'show-close',
type: 'Boolean',
defaultValue: '',
defaultValue: 'true',
desc: {
'zh-CN': '是否显示关闭按钮,默认值为 true',
'en-US': ''
},
mode: ['mobile-first'],
meta: {
stable: '3.22.0'
},
mode: ['pc', 'mobile-first'],
pcDemo: 'modal-other',
mfDemo: ''
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<script>
import { TinySelect, TinyOption } from '@opentiny/vue'
import Memorize from '@opentiny/vue-renderless/common/deps/memorize'
import { Memorize } from '@opentiny/utils'
const MemorizeInstance = new Memorize({ key: 'test456' })
Expand Down
50 changes: 0 additions & 50 deletions examples/sites/demos/mobile-first/app/time-line-new/auto-slot.vue

This file was deleted.

This file was deleted.

29 changes: 0 additions & 29 deletions examples/sites/demos/mobile-first/app/time-line-new/fold-time.vue

This file was deleted.

This file was deleted.

This file was deleted.

26 changes: 0 additions & 26 deletions examples/sites/demos/mobile-first/app/time-line-new/node-max.vue

This file was deleted.

32 changes: 0 additions & 32 deletions examples/sites/demos/mobile-first/app/time-line-new/node-toset.vue

This file was deleted.

Loading

0 comments on commit 8e19ff1

Please sign in to comment.