From 875a70c59995936bbacced66a3ec347d22f8893c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Mon, 28 Oct 2024 19:57:24 +0800 Subject: [PATCH 1/9] =?UTF-8?q?style:=20=E7=BC=96=E8=BE=91=E5=99=A8?= =?UTF-8?q?=E5=AF=B9=E9=BD=90=E3=80=81=E8=A1=8C=E9=AB=98=E3=80=81=E6=8D=A2?= =?UTF-8?q?=E8=A1=8C=E7=BB=9F=E4=B8=80=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ibiz-picker-select-view.scss | 11 +++++++++++ .../ibiz-dropdown-list/ibiz-dropdown-list.scss | 1 + .../dropdown-list/ibiz-dropdown/ibiz-dropdown.scss | 7 ------- .../quill-editor-preview/quill-editor-preview.tsx | 1 + src/editor/html/quill-editor/quill-editor.scss | 8 ++++++++ 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.scss b/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.scss index 7dbdfe85..a61e4b26 100644 --- a/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.scss +++ b/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.scss @@ -10,9 +10,20 @@ } .van-field__button { + height: getCssVar(form-item, line-height); + display: flex; + align-items: center; button { color: var(--van-field-right-icon-color); border: none; + height: getCssVar(form-item, line-height); + border-radius: 0; + --van-button-default-line-height: 1; + } + .van-button__text { + display: flex; + align-items: center; + height: 100%; } } diff --git a/src/editor/dropdown-list/ibiz-dropdown-list/ibiz-dropdown-list.scss b/src/editor/dropdown-list/ibiz-dropdown-list/ibiz-dropdown-list.scss index ff222c54..2566d0e6 100644 --- a/src/editor/dropdown-list/ibiz-dropdown-list/ibiz-dropdown-list.scss +++ b/src/editor/dropdown-list/ibiz-dropdown-list/ibiz-dropdown-list.scss @@ -85,6 +85,7 @@ display: flex; flex-direction: row; justify-content: getCssVar(form-item-container, editor-align); + flex-wrap: wrap; } &.#{bem('dropdown-list','','readonly')} { display: flex; diff --git a/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.scss b/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.scss index a3fdfe75..210e885f 100644 --- a/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.scss +++ b/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.scss @@ -34,13 +34,6 @@ border-radius: getCssVar(spacing, base); } - .van-cell { - line-height: getCssVar(form-item, line-height); - .van-field__control--custom { - min-height: getCssVar(form-item, line-height); - } - } - .van-picker { .van-picker__mask { background-image: getCssVar(color, overlay, bg); diff --git a/src/editor/html/quill-editor-preview/quill-editor-preview.tsx b/src/editor/html/quill-editor-preview/quill-editor-preview.tsx index 17606341..c9ed4b7b 100644 --- a/src/editor/html/quill-editor-preview/quill-editor-preview.tsx +++ b/src/editor/html/quill-editor-preview/quill-editor-preview.tsx @@ -31,6 +31,7 @@ const IBizQuillPreview: any = defineComponent({ theme: 'bubble', modules: c.modules, readOnly: true, + placeholder: c.placeHolder, }); if (c.valueMode === 'text') { quill.setText(props.value || ''); diff --git a/src/editor/html/quill-editor/quill-editor.scss b/src/editor/html/quill-editor/quill-editor.scss index c4b71840..c4f7b749 100644 --- a/src/editor/html/quill-editor/quill-editor.scss +++ b/src/editor/html/quill-editor/quill-editor.scss @@ -37,6 +37,14 @@ height: 0; } } + .ql-editor.ql-blank { + padding: 0; + &::before { + font-style: normal; + color: getCssVar('form-item', 'placeholder-color'); + left: 0; + } + } // quill多语言特殊处理,后续补充多语言 @include m(zh-cn) { .ql-snow { -- Gitee From 449558f802f8e0943ca3c4ae309a06aa009b6fc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Mon, 28 Oct 2024 19:57:51 +0800 Subject: [PATCH 2/9] =?UTF-8?q?style:=20=E6=B7=BB=E5=8A=A0=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E5=AE=89=E5=85=A8=E8=B7=9D=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mob-app/App.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mob-app/App.scss b/src/mob-app/App.scss index 614c6996..4b8d52cb 100644 --- a/src/mob-app/App.scss +++ b/src/mob-app/App.scss @@ -2,4 +2,6 @@ width: 100vw; height: 100vh; background: getCssVar(color, bg, 0); + // 移动端安全距离 + padding: env(safe-area-inset-top) env(safe-area-inset-right) env(safe-area-inset-bottom) env(safe-area-inset-left); } \ No newline at end of file -- Gitee From dd7bb5e3c5dda56acaccd9f84cce5359421fe663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Mon, 28 Oct 2024 19:59:05 +0800 Subject: [PATCH 3/9] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0dingtalk-jsapi?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + pnpm-lock.yaml | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/package.json b/package.json index d1f97958..8814de2b 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "@ibiz-template/mob-theme": "^0.2.17", "async-validator": "^4.2.5", "cherry-markdown": "^0.8.26", + "dingtalk-jsapi": "^3.0.38", "dayjs": "^1.11.10", "echarts": "^5.4.3", "lodash-es": "^4.17.21", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2e121553..e12be28a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -41,6 +41,9 @@ dependencies: dayjs: specifier: ^1.11.10 version: 1.11.10 + dingtalk-jsapi: + specifier: ^3.0.38 + version: 3.0.38 echarts: specifier: ^5.4.3 version: 5.4.3 @@ -3629,6 +3632,12 @@ packages: engines: {node: '>=0.10.0'} dev: true + /dingtalk-jsapi@3.0.38: + resolution: {integrity: sha512-Hm77aRq2k3KPyBF0lGi0Nk9qjdABF0fp+m4gsnEKGJ+0Iyu+rimwfxkRSjFd/HF2OvFbYVNBOKhqj9NitC46ig==} + dependencies: + promise-polyfill: 7.1.2 + dev: false + /dir-glob@3.0.1: resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} engines: {node: '>=8'} @@ -6860,6 +6869,10 @@ packages: /process-nextick-args@2.0.1: resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} + /promise-polyfill@7.1.2: + resolution: {integrity: sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ==} + dev: false + /proxy-from-env@1.1.0: resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} dev: false -- Gitee From 6ca87994d70db4bb89e8d6bd2c0aa42837483db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Mon, 28 Oct 2024 20:00:16 +0800 Subject: [PATCH 4/9] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=92=89?= =?UTF-8?q?=E9=92=89=E5=B9=B3=E5=8F=B0=E9=80=82=E9=85=8D=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mob-app/main.ts | 3 +++ src/platform/ding-talk-platform-provider.ts | 26 +++++++++++++++++++++ src/platform/index.d.ts | 1 + src/platform/index.ts | 1 + 4 files changed, 31 insertions(+) create mode 100644 src/platform/ding-talk-platform-provider.ts create mode 100644 src/platform/index.d.ts diff --git a/src/mob-app/main.ts b/src/mob-app/main.ts index 1cffdfaf..21c1ef35 100644 --- a/src/mob-app/main.ts +++ b/src/mob-app/main.ts @@ -10,6 +10,9 @@ import { PluginFactory, } from '@ibiz-template/vue3-util'; import { Plugin } from 'vue'; +// 此处必须要引入,否则无法使用 +// eslint-disable-next-line import/no-extraneous-dependencies, unused-imports/no-unused-imports, @typescript-eslint/no-unused-vars, no-unused-vars +import dd from 'dingtalk-jsapi'; import App from './App'; import { attachEnvironmentConfig } from './attach-environment-config'; import { createVueApp } from './create-vue-app'; diff --git a/src/platform/ding-talk-platform-provider.ts b/src/platform/ding-talk-platform-provider.ts new file mode 100644 index 00000000..8224f941 --- /dev/null +++ b/src/platform/ding-talk-platform-provider.ts @@ -0,0 +1,26 @@ +/* eslint-disable import/no-extraneous-dependencies */ +import { PlatformProviderBase } from '@ibiz-template/runtime'; +import * as dd from 'dingtalk-jsapi'; + +/** + * @description 钉钉搭载平台适配器 + * @export + * @class DingTalkPlatformProvider + * @extends {PlatformProviderBase} + */ +export class DingTalkPlatformProvider extends PlatformProviderBase { + /** + * @description 设置浏览器标签页标题 + * @param {string} title + * @memberof PlatformProviderBase + */ + setBrowserTitle(title: string): void { + if (dd) { + dd.setNavigationTitle({ + title, + }); + } else { + super.setBrowserTitle(title); + } + } +} diff --git a/src/platform/index.d.ts b/src/platform/index.d.ts new file mode 100644 index 00000000..4851baca --- /dev/null +++ b/src/platform/index.d.ts @@ -0,0 +1 @@ +declare module 'dingtalk-jsapi'; diff --git a/src/platform/index.ts b/src/platform/index.ts index 555b7e12..cea95bb8 100644 --- a/src/platform/index.ts +++ b/src/platform/index.ts @@ -1 +1,2 @@ export { VueBrowserPlatformProvider } from './vue-browser-platform-provider'; +export { DingTalkPlatformProvider } from './ding-talk-platform-provider'; -- Gitee From 5997b3ab609253912dc23edf5c076609210f4279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Mon, 28 Oct 2024 20:02:39 +0800 Subject: [PATCH 5/9] =?UTF-8?q?style:=20=E8=A1=A8=E5=8D=95=E5=88=86?= =?UTF-8?q?=E7=BB=84=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=20=20style2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0padding=E9=98=B4=E5=BD=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form-group-panel/form-group-panel.scss | 16 +++++++++++++--- .../form-item-container/form-item-container.scss | 9 ++++++++- .../form-page/form-page-item/form-page-item.scss | 4 ---- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/control/form/form-detail/form-group-panel/form-group-panel.scss b/src/control/form/form-detail/form-group-panel/form-group-panel.scss index 658d00d6..b02875a9 100644 --- a/src/control/form/form-detail/form-group-panel/form-group-panel.scss +++ b/src/control/form/form-detail/form-group-panel/form-group-panel.scss @@ -3,7 +3,6 @@ $form-group: ( footer-padding: getCssVar(spacing, tight) getCssVar(spacing, base), show-more-color: getCssVar(color-primary), padding: getCssVar(spacing-extra-tight), - border-radius: getCssVar('border-radius', 'large'), ); $form-group-header: ( @@ -35,7 +34,6 @@ $form-group-content: ( @include b(form-group) { overflow: hidden; background-color: getCssVar('form-group', 'bg-color'); - padding: getCssVar('form-group', 'padding'); // 分组标题 @include e(caption) { @@ -53,7 +51,19 @@ $form-group-content: ( @include m(style2) { background-color: getCssVar(color, bg, 0); - border-radius: getCssVar('form-group', 'border-radius'); + padding: getCssVar('form-group', 'padding'); + >.#{bem(form-group-header)} { + border-radius: getCssVar('border-radius', 'large') getCssVar('border-radius', 'large') 0 0; + } + .#{bem(form-group, content)} { + padding: getCssVar('border-radius', 'large') 0; + border-radius: getCssVar('border-radius', 'large'); + background-color: getCssVar('form-group-content', 'bg-color'); + } + >.#{bem(form-group-header)} + .#{bem(form-group, content)} { + padding-top: 0; + border-radius: 0 0 getCssVar('border-radius', 'large') getCssVar('border-radius', 'large'); + } } } diff --git a/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss b/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss index bf9cba79..8af1af17 100644 --- a/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss +++ b/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss @@ -71,7 +71,7 @@ $form-item-label: (line-height: 1, width: getCssVar(form-item-container, label-width); overflow: visible; color: getCssVar(form-item-label, text-color); - + height: getCssVar(form-item, line-height); span { @include utils-ellipsis; @@ -87,10 +87,17 @@ $form-item-label: (line-height: 1, width: 100%; text-align: getCssVar(form-item-container, editor-align); min-height: calc(getCssVar(form-item, line-height) + 2 * getCssVar(spacing, tight)); + #{--van-cell-line-height}: getCssVar(form-item, line-height); + #{--van-cell-line-height}: getCssVar(form-item, line-height); .van-cell { padding-bottom: 0; } + + ::placeholder { + color: getCssVar('form-item', 'placeholder-color'); + -webkit-text-fill-color: getCssVar('form-item', 'placeholder-color'); + } } // 必填图标 * diff --git a/src/control/form/form-detail/form-page/form-page-item/form-page-item.scss b/src/control/form/form-detail/form-page/form-page-item/form-page-item.scss index efce6af5..8dfbe859 100644 --- a/src/control/form/form-detail/form-page/form-page-item/form-page-item.scss +++ b/src/control/form/form-detail/form-page/form-page-item/form-page-item.scss @@ -5,8 +5,4 @@ $form-page-item: ('margin': 0 0 getCssVar('spacing', 'tight') 0, @include set-component-css-var('form-page-item', $form-page-item); border-radius: getCssVar('border-radius', 'small'); - - >.van-col { - margin: getCssVar('form-page-item', 'margin'); - } } \ No newline at end of file -- Gitee From 55aad95b3781f877b5fbea2852069b4cfdd4c434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Mon, 28 Oct 2024 20:03:33 +0800 Subject: [PATCH 6/9] =?UTF-8?q?style:=20=E4=BF=AE=E5=A4=8D=E9=97=A8?= =?UTF-8?q?=E6=88=B7=E8=A7=86=E5=9B=BE=E6=A0=B7=E5=BC=8F=E6=9D=83=E9=87=8D?= =?UTF-8?q?=E4=BD=8E=E5=AF=BC=E8=87=B4=E6=9C=AA=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/view/portal-view/portal-view.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/view/portal-view/portal-view.scss b/src/view/portal-view/portal-view.scss index 05efbf8e..47622756 100644 --- a/src/view/portal-view/portal-view.scss +++ b/src/view/portal-view/portal-view.scss @@ -1,7 +1,7 @@ @include b(portal-view) { display: flex; flex-direction: column; - .#{bem(view)} { - #{getCssVarName(view, bg, color)}: getCssVar(color, bg, 0); - } +} +.#{bem(portal-view)}.#{bem(view)} { + #{getCssVarName(view, bg, color)}: getCssVar(color, bg, 0); } \ No newline at end of file -- Gitee From a5d57175a365d1aed01c37ad1a47c8040b338e7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Mon, 28 Oct 2024 20:04:23 +0800 Subject: [PATCH 7/9] =?UTF-8?q?feat:=20=E5=A4=9A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E5=BC=95=E6=93=8E=E6=94=AF=E6=8C=81=E5=8D=95?= =?UTF-8?q?=E9=80=89=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/view-engine/mob-md-view-engine.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/view-engine/mob-md-view-engine.ts b/src/view-engine/mob-md-view-engine.ts index ad42924b..5c463132 100644 --- a/src/view-engine/mob-md-view-engine.ts +++ b/src/view-engine/mob-md-view-engine.ts @@ -78,7 +78,6 @@ export class MobMDViewEngine extends MDViewEngine { */ async onMounted(): Promise { await super.onMounted(); - this.xdataControl.state.singleSelect = this.view.state.singleSelect; this.xdataControl.evt.on('onSelectionChange', async event => { this.view.evt.emit('onSelectionChange', { ...event }); }); -- Gitee From e1c887b55beb41254cdac9a7e3a6a586f974a714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Mon, 28 Oct 2024 20:04:46 +0800 Subject: [PATCH 8/9] =?UTF-8?q?feat:=20=E6=B3=A8=E5=86=8C=E9=92=89?= =?UTF-8?q?=E9=92=89=E5=B9=B3=E5=8F=B0=E9=80=82=E9=85=8D=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ibiz-vue3.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ibiz-vue3.ts b/src/ibiz-vue3.ts index b424109b..59b1b1f3 100644 --- a/src/ibiz-vue3.ts +++ b/src/ibiz-vue3.ts @@ -33,7 +33,10 @@ import { } from './control'; import { iBizI18n } from './locale'; import IBizPanelComponents from './panel-component'; -import { VueBrowserPlatformProvider } from './platform'; +import { + VueBrowserPlatformProvider, + DingTalkPlatformProvider, +} from './platform'; import { IBizPortalView } from './view/portal-view'; import { IBizViewEngine } from './view-engine'; import IBizEditor from './editor'; @@ -44,10 +47,15 @@ export default { ibiz.i18n = iBizI18n; // vue 浏览器搭载平台 const browserPlatformProvider = new VueBrowserPlatformProvider(); + const dingTalkPlatformProvider = new DingTalkPlatformProvider(); registerPlatformProvider( PlatformType.BROWSER, () => browserPlatformProvider, ); + registerPlatformProvider( + PlatformType.DINGTALK, + () => dingTalkPlatformProvider, + ); v.use(IBizCommonComponents); v.use(IBizViewEngine); -- Gitee From 267f1ddc3306fc22e72172b16274de8a64a29ec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Mon, 28 Oct 2024 20:05:00 +0800 Subject: [PATCH 9/9] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6b97459..72f76e23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,18 @@ ### Fixed - 修复时间范围选择无值时点击不出选择弹框及适配值分隔符与pc端保持一致 +- 修复门户视图权重低导致未生效 + +### Change + +- 编辑器对齐、行高、换行统一调整 +- 添加移动端安全距离 +- 表单分组样式调整 style2添加padding阴影 +- 多数据视图引擎支持单选配置 + +### Added + +- 添加dingtalk-jsapi依赖 ## [0.0.31] - 2024-10-27 -- Gitee