Skip to content

Commit 9f75375

Browse files
betterdancingbetterdancing
committed
feat(resouces): fix resource manager style bugs
1 parent d4db437 commit 9f75375

11 files changed

Lines changed: 43 additions & 31 deletions

File tree

‎designer-demo/public/mock/bundle.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4433,18 +4433,19 @@
44334433
"bindState": true,
44344434
"label": {
44354435
"text": {
4436-
"zh_CN": "资源"
4436+
"zh_CN": "资源选择"
44374437
}
44384438
},
44394439
"cols": 12,
44404440
"rules": [],
44414441
"widget": {
4442-
"component": "InputConfigurator",
4442+
"component": "SourceSelectConfigurator",
44434443
"props": {}
44444444
},
44454445
"description": {
44464446
"zh_CN": "src路径"
4447-
}
4447+
},
4448+
"labelPosition": "top"
44484449
},
44494450
{
44504451
"property": "attributes3",

‎packages/build/vite-config/src/vite-plugins/devAliasPlugin.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ const getDevAlias = (useSourceAlias) => {
2929
'@opentiny/tiny-engine-plugin-bridge': path.resolve(basePath, 'packages/plugins/bridge/index.ts'),
3030
'@opentiny/tiny-engine-plugin-tutorial': path.resolve(basePath, 'packages/plugins/tutorial/index.ts'),
3131
'@opentiny/tiny-engine-plugin-robot': path.resolve(basePath, 'packages/plugins/robot/index.ts'),
32+
'@opentiny/tiny-engine-plugin-resource': path.resolve(basePath, 'packages/plugins/resource/index.ts'),
3233
'@opentiny/tiny-engine-settings-panel': path.resolve(basePath, 'packages/settings/panel/index.ts'),
3334
'@opentiny/tiny-engine-setting-events': path.resolve(basePath, 'packages/settings/events/index.ts'),
3435
'@opentiny/tiny-engine-setting-props': path.resolve(basePath, 'packages/settings/props/index.ts'),

‎packages/canvas/render/src/builtin/builtin.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,15 +479,16 @@
479479
"bindState": true,
480480
"label": {
481481
"text": {
482-
"zh_CN": "src路径"
482+
"zh_CN": "资源选择"
483483
}
484484
},
485485
"cols": 12,
486486
"rules": [],
487487
"widget": {
488-
"component": "InputConfigurator",
488+
"component": "SourceSelectConfigurator",
489489
"props": {}
490-
}
490+
},
491+
"labelPosition": "top"
491492
}
492493
]
493494
}

‎packages/configurator/src/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import TabsGroupConfigurator from './tabs-group-configurator/TabsGroupConfigurat
3131
import VariableConfigurator from './variable-configurator/VariableConfigurator.vue'
3232
import BasicTagConfigurator from './basic-tag-configurator/BasicTagConfigurator.vue'
3333
import ClassConfigurator from './class-configurator/ClassConfigurator.vue'
34+
import SourceSelectConfigurator from './source-select-configurator/SourceSelectConfigurator.vue'
3435

3536
import { I18nInput, MetaCodeEditor } from '@opentiny/tiny-engine-common'
3637
import './styles/vars.less'
@@ -69,6 +70,7 @@ export {
6970
VariableConfigurator,
7071
BasicTagConfigurator,
7172
ClassConfigurator,
73+
SourceSelectConfigurator,
7274
MetaCodeEditor,
7375
I18nInput as I18nConfigurator,
7476
MetaCodeEditor as CodeConfigurator,

‎packages/design-core/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
"@opentiny/tiny-engine-plugin-materials": "workspace:*",
5858
"@opentiny/tiny-engine-plugin-page": "workspace:*",
5959
"@opentiny/tiny-engine-plugin-robot": "workspace:*",
60+
"@opentiny/tiny-engine-plugin-resource": "workspace:*",
6061
"@opentiny/tiny-engine-plugin-schema": "workspace:*",
6162
"@opentiny/tiny-engine-plugin-script": "workspace:*",
6263
"@opentiny/tiny-engine-plugin-state": "workspace:*",

‎packages/design-core/re-export.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export { default as Bridge } from '@opentiny/tiny-engine-plugin-bridge'
2727
export { default as Block, BlockService } from '@opentiny/tiny-engine-plugin-block'
2828
export { default as Datasource, DataSourceService } from '@opentiny/tiny-engine-plugin-datasource'
2929
export { default as Robot } from '@opentiny/tiny-engine-plugin-robot'
30+
export { default as Resource } from '@opentiny/tiny-engine-plugin-resource'
3031
export { default as Props, PropertiesService, PropertyService } from '@opentiny/tiny-engine-setting-props'
3132
export { default as Events } from '@opentiny/tiny-engine-setting-events'
3233
export { default as Styles } from '@opentiny/tiny-engine-setting-styles'

‎packages/design-core/registry.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import {
4040
Block,
4141
Datasource,
4242
Robot,
43+
Resource,
4344
Props,
4445
Events,
4546
Styles,
@@ -161,7 +162,8 @@ export default {
161162
__TINY_ENGINE_REMOVED_REGISTRY['engine.plugins.state'] === false ? null : State,
162163
__TINY_ENGINE_REMOVED_REGISTRY['engine.plugins.schema'] === false ? null : Schema,
163164
__TINY_ENGINE_REMOVED_REGISTRY['engine.plugins.editorhelp'] === false ? null : Help,
164-
__TINY_ENGINE_REMOVED_REGISTRY['engine.plugins.robot'] === false ? null : Robot
165+
__TINY_ENGINE_REMOVED_REGISTRY['engine.plugins.robot'] === false ? null : Robot,
166+
__TINY_ENGINE_REMOVED_REGISTRY['engine.plugins.resource'] === false ? null : Resource
165167
],
166168
settings: [
167169
__TINY_ENGINE_REMOVED_REGISTRY['engine.setting.props'] === false ? null : Props,

‎packages/layout/src/defaultLayout.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ export default {
1212
META_APP.Bridge,
1313
META_APP.I18n,
1414
META_APP.Page,
15-
META_APP.State
15+
META_APP.State,
16+
META_APP.Resource
1617
],
1718
bottom: [META_APP.Schema, META_APP.Help, META_APP.Robot]
1819
},

‎packages/plugins/resource/src/Main.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,20 +162,20 @@ export default {
162162
display: none;
163163
}
164164
.svg-icon {
165-
color: var(--te-page-manage-draggable-icon-color);
165+
color: var(--te-resource-manage-draggable-icon-color);
166166
margin-right: 4px;
167167
}
168168
&:hover {
169-
background-color: var(--te-page-manage-draggable-row-bg-color-hover);
170-
color: var(--te-page-manage-draggable-text-color);
169+
background-color: var(--te-resource-manage-draggable-row-bg-color-hover);
170+
color: var(--te-resource-manage-draggable-text-color);
171171
.item-setting {
172172
display: inline;
173173
}
174174
}
175175
}
176176
.active-item {
177-
background-color: var(--te-page-manage-draggable-row-bg-color-hover);
178-
color: var(--te-page-manage-draggable-text-color);
177+
background-color: var(--te-resource-manage-draggable-row-bg-color-hover);
178+
color: var(--te-resource-manage-draggable-text-color);
179179
font-weight: 600;
180180
}
181181
}

‎packages/plugins/resource/src/styles/vars.less‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
.plugin-resource {
2-
--te-page-manage-title-text-color: var(--te-common-text-primary);
3-
--te-page-manage-input-bg-color: var(--te-common-bg-default);
4-
--te-page-manage-input-border-color: var(--te-common-border-default);
5-
--te-page-manage-tip-color: var(--te-common-text-primary);
6-
--te-page-manage-tip-text-color: var(--te-common-text-weaken);
7-
--te-page-manage-tip-dim-text-color: var(--te-common-text-primary);
8-
--te-page-manage-tree-text-bg-color: var(--te-common-bg-default);
9-
--te-page-manage-tree-node-bg-color: var(--te-common-bg-default);
10-
--te-page-manage-tree-node-bg-color-hover: var(--te-common-bg-container);
11-
--te-page-manage-text-color: var(--te-common-text-secondary);
12-
--te-page-manage-input-head-text-color: var(--te-common-text-primary);
13-
--te-page-manage-input-or-output-text-color: var(--te-common-text-secondary);
14-
--te-page-manage-life-cycle-alert-text-color: var(--te-common-text-weaken);
15-
--te-page-manage-icon-color: var(--te-common-icon-secondary);
16-
--te-page-manage-draggable-row-bg-color-hover: var(--te-common-bg-container);
17-
--te-page-manage-draggable-text-color: var(--te-common-text-primary);
18-
--te-page-manage-draggable-icon-color: var(--te-common-icon-secondary);
19-
--te-page-manage-draggable-border-color: var(--te-common-border-checked);
2+
--te-resource-manage-title-text-color: var(--te-common-text-primary);
3+
--te-resource-manage-input-bg-color: var(--te-common-bg-default);
4+
--te-resource-manage-input-border-color: var(--te-common-border-default);
5+
--te-resource-manage-tip-color: var(--te-common-text-primary);
6+
--te-resource-manage-tip-text-color: var(--te-common-text-weaken);
7+
--te-resource-manage-tip-dim-text-color: var(--te-common-text-primary);
8+
--te-resource-manage-tree-text-bg-color: var(--te-common-bg-default);
9+
--te-resource-manage-tree-node-bg-color: var(--te-common-bg-default);
10+
--te-resource-manage-tree-node-bg-color-hover: var(--te-common-bg-container);
11+
--te-resource-manage-text-color: var(--te-common-text-secondary);
12+
--te-resource-manage-input-head-text-color: var(--te-common-text-primary);
13+
--te-resource-manage-input-or-output-text-color: var(--te-common-text-secondary);
14+
--te-resource-manage-life-cycle-alert-text-color: var(--te-common-text-weaken);
15+
--te-resource-manage-icon-color: var(--te-common-icon-secondary);
16+
--te-resource-manage-draggable-row-bg-color-hover: var(--te-common-bg-container);
17+
--te-resource-manage-draggable-text-color: var(--te-common-text-primary);
18+
--te-resource-manage-draggable-icon-color: var(--te-common-icon-secondary);
19+
--te-resource-manage-draggable-border-color: var(--te-common-border-checked);
2020
}

0 commit comments

Comments
 (0)