Merge remote-tracking branch 'origin/master'

# Conflicts:
#	data-room-ui/packages/BasicComponents/Select/index.vue
#	data-room-ui/packages/BasicComponents/Select/settingConfig.js

data-room-ui/packages/BasicComponents/Select/index.vue

@@ -61,7 +61,8 @@ export default {
     }
   },
   watch: { },
-  created () { },
+  created () {
+  },
   mounted () {
     window.dataSetFields = []
     this.changeStyle(this.config)
@@ -169,11 +170,11 @@ export default {
           item.style.setProperty('--dropDownHoverBackgroundColor', this.innerConfig.customize.dropDownHoverBackgroundColor)
         })
         // 激活项
-        const selectDropdownItemSelectedEl = document.querySelectorAll(`.select-popper-${this.innerConfig.code} .el-select-dropdown__item.selected`)
-        selectDropdownItemSelectedEl.forEach(item => {
-          item.style.color = this.innerConfig.customize.activeFontColor
-          item.style.backgroundColor = this.innerConfig.customize.activeBackgroundColor
-        })
+        // const selectDropdownItemSelectedEl = document.querySelectorAll(`.select-popper-${this.innerConfig.code} .el-select-dropdown__item.selected`)
+        // selectDropdownItemSelectedEl.forEach(item => {
+        //   item.style.color = this.innerConfig.customize.activeFontColor
+        //   item.style.backgroundColor = this.innerConfig.customize.activeBackgroundColor
+        // })
       }
       // 不是激活项的还是使用背景颜色
       const selectDropdownItemEl = document.querySelectorAll(`.select-popper-${this.innerConfig.code} .el-select-dropdown__item`)

data-room-ui/packages/BasicComponents/Select/setting.vue

@@ -19,7 +19,9 @@
           <div class="lc-field-body">
             <PosWhSetting :config="config" />
           </div>
-          <SettingTitle v-if="config.border">边框</SettingTitle>
+          <SettingTitle v-if="config.border">
+            边框
+          </SettingTitle>
           <div class="lc-field-body">
             <BorderSetting
               v-if="config.border"
@@ -52,31 +54,6 @@
                 :predefine="predefineThemeColors"
               />
             </el-form-item>
-            <!-- 下拉框是否需要边框 -->
-            <!-- <el-form-item label="下拉框边框">
-              <el-switch v-model="config.customize.dropDownBorder" />
-            </el-form-item> -->
-            <!-- 下拉框如果有边框，再选择边框颜色 -->
-            <!-- <el-form-item
-              v-if="config.customize.dropDownBorder"
-              label="下拉框边框颜色"
-            >
-              <ColorPicker
-                v-model="config.customize.dropDownBorderColor"
-                :predefine="predefineThemeColors"
-              />
-            </el-form-item> -->
-            <!-- hover 颜色 -->
-            <!-- 下拉框字体大小 -->
-            <!-- <el-form-item label="下拉框字体大小">
-              <el-input-number
-                v-model="config.customize.dropDownFontSize"
-                class="bs-el-input-number"
-                :min="12"
-                :max="100"
-              />
-            </el-form-item> -->
-            <!-- 下拉框字体颜色 -->
           </div>
           <SettingTitle>下拉项</SettingTitle>
           <!-- 选择器下拉框背景颜色 -->
@@ -107,20 +84,6 @@
                 :predefine="predefineThemeColors"
               />
             </el-form-item>
-            <!-- 激活项背景颜色 -->
-            <el-form-item label="激活项背景颜色">
-              <ColorPicker
-                v-model="config.customize.activeBackgroundColor"
-                :predefine="predefineThemeColors"
-              />
-            </el-form-item>
-            <!-- 激活项文字颜色 -->
-            <el-form-item label="激活项文字颜色">
-              <ColorPicker
-                v-model="config.customize.activeFontColor"
-                :predefine="predefineThemeColors"
-              />
-            </el-form-item>
           </div>
         </el-form>
       </div>

data-room-ui/packages/BasicComponents/Select/settingConfig.js

@@ -25,9 +25,8 @@ export const settingConfig = {
 const customConfig = {
   type: 'select',
   // 名称
-  title: '下拉框',
   root: {
-    version: '2023091401'
+    version: '2023091402'
   },
   // 自定义属性
   customize: {
@@ -44,11 +43,7 @@ const customConfig = {
     // 下拉项hover背景颜色
     dropDownHoverBackgroundColor: '#6A7E9D',
     // 下拉项hover字体颜色
-    dropDownHoverFontColor: '#FFFFFF',
-    // 激活项背景颜色
-    activeBackgroundColor: '#6A7E9D',
-    // 激活项字体颜色
-    activeFontColor: '#FFFFFF'
+    dropDownHoverFontColor: '#FFFFFF'
   }
 }
 export const dataConfig = {

data-room-ui/packages/BorderSelect/index.vue

@@ -93,7 +93,7 @@ import borderComponents from 'data-room-ui/BorderComponents/bordersList'
 export default {
   name: 'ComponentDialog',
   mixins: [pageMixins],
-   model: {
+  model: {
     prop: 'type',
     event: 'select'
   },
@@ -114,19 +114,18 @@ export default {
       code: '',
       focus: -1,
       searchKey: '',
-      remoteComponentlist: [],
+      remoteComponentlist: []
     }
   },
   computed: {
     remoteComponentsGridComputed () {
       return this.remoteComponentlist.length > 3
-    },
+    }
   },
   watch: {
   },
   mounted () {
     this.remoteComponentlist = [...borderComponents]
-    console.log(this.remoteComponentlist)
   },
   methods: {
     chooseComponent (component) {
@@ -144,9 +143,8 @@ export default {
     confirm () {
       this.dialogVisible = false
       if (isEmpty(this.focus)) return
-      console.log(this.focus.title)
       this.$emit('select', this.focus.title)
-    },
+    }
 
   }
 }

data-room-ui/packages/ComponentList/EditForm.vue

@@ -29,9 +29,9 @@
             class="bs-el-input"
           />
         </el-form-item>
-         <el-form-item
-          label="组件类型"
+        <el-form-item
           v-if="type === 'bizComponent'"
+          label="组件类型"
         >
           <el-select
             v-model="bizType"
@@ -145,20 +145,20 @@ export default {
   },
   data () {
     return {
-      bizType:'native',
+      bizType: 'native',
       resolutionRatioValue: '',
       resolutionRatio: {},
-      BizList:[
+      BizList: [
         {
-          label:'echarts组件',
-          value:'echarts'
+          label: 'echarts组件',
+          value: 'echarts'
         }, {
-          label:'g2Plot组件',
-          value:'g2plot'
+          label: 'g2Plot组件',
+          value: 'g2plot'
         }, {
-          label:'基础组件',
-          value:'native'
-        },
+          label: '基础组件',
+          value: 'native'
+        }
       ],
       resolutionRatioOptions: [
         {
@@ -252,7 +252,7 @@ export default {
     closeAddDialog () {
       this.formVisible = false
       this.$refs.dataForm.resetFields()
-      this.bizType='native'
+      this.bizType = 'native'
     },
     // 初始化
     init (nodeData, parentCode) {
@@ -455,13 +455,13 @@ export default {
     // 跳转设计态
     toDesign (form) {
       const path = this.type === 'component' ? (window.BS_CONFIG?.routers?.designUrl || '/big-screen/design') : 'big-screen-biz-component-design'
-      const { href: bigScreenHref } =this.type=='bizComponent'? this.$router.resolve({
+      const { href: bigScreenHref } = this.type == 'bizComponent' ? this.$router.resolve({
         path,
         query: {
           code: form.code,
-          type:this.bizType
+          type: this.bizType
         }
-      }):this.$router.resolve({
+      }) : this.$router.resolve({
         path,
         query: {
           code: form.code