Merge remote-tracking branch 'origin/master'

data-room-ui/package.json

@@ -29,6 +29,7 @@
     "build:history": "vue-cli-service build --mode history",
     "build:hash:pro": "vue-cli-service build --name dataRoomPro",
     "build:history:pro": "vue-cli-service build --mode=pro.history",
+    "build:history:all": "vue-cli-service build --mode history && vue-cli-service build --mode=pro.history", 
 
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue packages",

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

@@ -26,7 +26,7 @@ import { settingToTheme } from 'data-room-ui/js/utils/themeFormatting'
 import { mapState } from 'vuex'
 window.dataSetFields = []
 export default {
-  name: 'BasicComponentSelect',
+  name: 'BasicComponentsDateTimePicker',
   components: {},
   mixins: [commonMixins, linkageMixins],
   props: {

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

@@ -232,7 +232,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 export default {
-  name: 'Border14Setting',
+  name: 'DateTimePickerSetting',
   components: {
     ColorPicker,
     PosWhSetting,

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

@@ -19,17 +19,6 @@
           <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">
             <RotateSetting

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

@@ -25,7 +25,7 @@ import { settingToTheme } from 'data-room-ui/js/utils/themeFormatting'
 import { mapState } from 'vuex'
 window.dataSetFields = []
 export default {
-  name: 'BasicComponentSelect',
+  name: 'BasicComponentsTimePicker',
   components: {},
   mixins: [commonMixins, linkageMixins],
   props: {

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

@@ -188,7 +188,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 export default {
-  name: 'Border14Setting',
+  name: 'TimePickerSetting',
   components: {
     ColorPicker,
     PosWhSetting,

data-room-ui/vue.config.example.js

@@ -23,8 +23,6 @@ const cdn = {
 }
 const port = process.env.port || process.env.npm_config_port || 7521 // dev port
 
-console.log('process.env', process.env)
-
 const plugins = [
   new webpack.ProvidePlugin({
     jQuery: 'jquery',