Merge remote-tracking branch 'origin/master'

1 year ago · 2ab2c4eb67
parent 2a56d1fe29 fb048c436f
commit 2ab2c4eb67
1 changed files with 0 additions and 9 deletions
--- a/data-room-ui/packages/BasicComponents/Input/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Input/setting.vue
@ -71,15 +71,6 @@
          <SettingTitle>位置</SettingTitle>
          <div class="lc-field-body">
            <PosWhSetting :config="config" />
-          </div>
-           <SettingTitle v-if="config.border">边框</SettingTitle>
-          <div class="lc-field-body">
-            <BorderSetting
-              v-if="config.border"
-              label-width="100px"
-              :config="config.border"
-              :bigTitle='config.title'
-            />
          </div>
          <SettingTitle>旋转</SettingTitle>
          <div class="lc-field-body">