Merge remote-tracking branch 'open/refactor/develop' into lx-ui-develop

opentiny · Jan 7, 2025 · 3a63c5c · 3a63c5c
2 parents b2fe00f + a14a508
commit 3a63c5c
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 4 deletions.
diff --git a/packages/common/component/PluginSetting.vue b/packages/common/component/PluginSetting.vue
@@ -133,7 +133,7 @@ export default {
   overflow: hidden;
   border-left: 1px solid var(--ti-lowcode-plugin-panel-header-border-bottom-color);
   &:not(.second-panel) {
-    box-shadow: 6px 0px 3px 0px rgba(0, 0, 0, 0.05);
+    box-shadow: 6px 0px 3px 0px var(--te-base-box-shadow-rgba-3);
     border-right: none;
     border-left: none;
   }

diff --git a/packages/plugins/block/src/BlockEventList.vue b/packages/plugins/block/src/BlockEventList.vue
@@ -84,4 +84,10 @@ export default {
     stroke: var(--te-common-text-weaken);
   }
 }
+.opt-button {
+  width: auto;
+  &:last-child {
+    margin-right: var(--te-base-space-3x);
+  }
+}
 </style>
diff --git a/packages/plugins/block/src/BlockPropertyList.vue b/packages/plugins/block/src/BlockPropertyList.vue
@@ -104,4 +104,11 @@ export default {
     stroke: var(--te-common-text-weaken);
   }
 }
+.opt-button {
+  color: var(--te-common-icon-secondary);
+  width: auto;
+  &:last-child {
+    margin-right: var(--te-base-space-3x);
+  }
+}
 </style>
diff --git a/packages/plugins/i18n/src/Main.vue b/packages/plugins/i18n/src/Main.vue
@@ -434,7 +434,7 @@ export default {
 
 <style lang="less" scoped>
 .plugin-panel-i18n {
-  box-shadow: 6px 0px 3px 0px rgba(0, 0, 0, 0.05);
+  box-shadow: 6px 0px 3px 0px var(--te-base-box-shadow-rgba-3);
 }
 .stripe-tiny-grid {
   word-wrap: break-word;

diff --git a/packages/plugins/schema/src/Main.vue b/packages/plugins/schema/src/Main.vue
@@ -175,7 +175,7 @@ export default {
   top: var(--base-top-panel-height);
   left: 41px;
   background: var(--ti-lowcode-common-component-bg);
-  box-shadow: 6px 0px 3px 0px rgba(0, 0, 0, 0.05);
+  box-shadow: 6px 0px 3px 0px var(--te-base-box-shadow-rgba-3);
   z-index: 1000;
   .source-code-header {
     display: flex;

diff --git a/packages/plugins/script/src/Main.vue b/packages/plugins/script/src/Main.vue
@@ -102,7 +102,7 @@ export default {
   width: 50vw;
   height: 100%;
   background: var(--ti-lowcode-plugin-js-bg);
-  box-shadow: 6px 0px 3px 0px rgba(0, 0, 0, 0.05);
+  box-shadow: 6px 0px 3px 0px var(--te-base-box-shadow-rgba-3);
   position: absolute;
   left: 0;
   top: 0;

diff --git a/packages/plugins/state/src/Main.vue b/packages/plugins/state/src/Main.vue
@@ -447,6 +447,7 @@ export default {
     height: 100%;
     border-right: 1px solid var(--ti-lowcode-toolbar-border-color);
     background: var(--ti-lowcode-common-component-bg);
+    box-shadow: 6px 0px 3px 0px var(--te-base-box-shadow-rgba-3);
     position: absolute;
     left: var(--base-left-panel-width);
     top: 0;

diff --git a/packages/theme/base/src/base.less b/packages/theme/base/src/base.less
@@ -240,6 +240,7 @@
 
   --te-base-box-shadow-rgba-1: rgba(25, 25, 25, 0.15);
   --te-base-box-shadow-rgba-2: rgba(0, 0, 0, 0.16);
+  --te-base-box-shadow-rgba-3: rgba(0, 0, 0, 0.1);
 
   /**
   * 1.1 行高

diff --git a/packages/theme/base/src/component-common.less b/packages/theme/base/src/component-common.less
@@ -800,6 +800,18 @@
 .tiny-form-item__label.tiny-form-item__label {
   padding-right: 16px;
 }
+.tiny-form--label-left.label-align .tiny-form-item.is-required .tiny-form-item__label.tiny-form-item__label {
+  padding-left: 0;
+}
+.tiny-form--label-left.label-align
+  .tiny-form-item.is-required
+  ~ .tiny-form-item
+  .tiny-form-item__label.tiny-form-item__label {
+  padding-left: 0;
+}
+.tiny-form-item__label.tiny-form-item__label {
+  padding-right: 16px;
+}
 .tiny-form--label-left.has-required .tiny-form-item__label,
 .tiny-form--label-left.label-align .tiny-form-item.is-required .tiny-form-item__label.tiny-form-item__label {
   padding-left: 0;