vue2-client 1.15.86 → 1.15.88

package/src/base-client/components/common/CitySelect/demo.vue

@@ -1,43 +1,43 @@
-<template>
-  <div>
-    <a-modal
-      v-model="asigAddressFlag"
-      :dialog-style="{ top: '30px' }"
-      :z-index="909"
-      :maskClosable="false"
-      @ok="asigAddressSubmit"
-      @cancel="asigAddressFlag = false"
-      :destroyOnClose="true">
-      <a-form-model>
-        <a-form-model-item label="选择小区">
-          <CitySelect v-model="f_residential_area_id" :contexts="5"></CitySelect>
-        </a-form-model-item>
-      </a-form-model>
-    </a-modal>
-  </div>
-</template>
-
-<script>
-
-import CitySelect from '@vue2-client/base-client/components/common/CitySelect/CitySelect.vue'
-
-export default {
-  name: 'Demo',
-  components: { CitySelect },
-  data () {
-    return {
-      asigAddressFlag: true,
-      f_residential_area_id: 1
-    }
-  },
-  methods: {
-    asigAddressSubmit () {
-    },
-  },
-  computed: {},
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <div>
+    <a-modal
+      v-model="asigAddressFlag"
+      :dialog-style="{ top: '30px' }"
+      :z-index="909"
+      :maskClosable="false"
+      @ok="asigAddressSubmit"
+      @cancel="asigAddressFlag = false"
+      :destroyOnClose="true">
+      <a-form-model>
+        <a-form-model-item label="选择小区">
+          <CitySelect v-model="f_residential_area_id" :contexts="5"></CitySelect>
+        </a-form-model-item>
+      </a-form-model>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+
+import CitySelect from '@vue2-client/base-client/components/common/CitySelect/CitySelect.vue'
+
+export default {
+  name: 'Demo',
+  components: { CitySelect },
+  data () {
+    return {
+      asigAddressFlag: true,
+      f_residential_area_id: 1
+    }
+  },
+  methods: {
+    asigAddressSubmit () {
+    },
+  },
+  computed: {},
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/base-client/components/common/ColorPickerCombobox/ColorPickerCombobox.vue

@@ -1,99 +1,99 @@
-<template>
-  <div id="colorPickerCombobox" style="padding: 4px 0;">
-    <div style="display: flex; width: 100%;">
-      <a-input
-        :value="colorValue"
-        :read-only="readOnly"
-        style="flex: 1; min-width: 0;"
-        placeholder="请选择颜色"
-      />
-      <a-button
-        style="flex-shrink: 0; margin-left: 0.2rem;"
-        @click="visible = true"
-      >
-        选择颜色
-      </a-button>
-    </div>
-    <a-modal
-      v-model="visible"
-      title="颜色选择"
-      @ok="onSelect"
-      :zIndex="1002"
-      :destroyOnClose="true"
-      width="40%"
-    >
-      <chrome-picker
-        :value="tempColor"
-        :disable-alpha="true"
-        @input="onColorChange"
-      />
-      <div style="margin-top: 16px; text-align: center;">
-        <span>当前颜色: <span :style="{ color: tempColor }">{{ tempColor }}</span></span>
-      </div>
-    </a-modal>
-  </div>
-</template>
-
-<script>
-import { Chrome } from 'vue-color'
-
-export default {
-  name: 'ColorPickerCombobox',
-  components: {
-    'chrome-picker': Chrome
-  },
-  props: {
-    value: {
-      type: String,
-      default: ''
-    },
-    readOnly: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data () {
-    return {
-      visible: false,
-      colorValue: this.value,
-      tempColor: this.value
-    }
-  },
-  watch: {
-    value (val) {
-      this.colorValue = val
-      this.tempColor = val
-    }
-  },
-  methods: {
-    onColorChange (color) {
-      // color.hex 是 #RRGGBB 格式
-      this.tempColor = color.hex
-    },
-    onSelect () {
-      this.colorValue = this.tempColor
-      this.visible = false
-      this.$emit('onSelect', this.colorValue)
-    },
-    setColor (val) {
-      this.colorValue = val
-      this.tempColor = val
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-#colorPickerCombobox {
-  .ant-input {
-    background: #fff;
-  }
-}
-.vc-chrome {
-  width: 100% !important;
-  box-sizing: border-box;
-}
-::v-deep .vc-chrome {
-  width: 100% !important;
-}
-</style>
+<template>
+  <div id="colorPickerCombobox" style="padding: 4px 0;">
+    <div style="display: flex; width: 100%;">
+      <a-input
+        :value="colorValue"
+        :read-only="readOnly"
+        style="flex: 1; min-width: 0;"
+        placeholder="请选择颜色"
+      />
+      <a-button
+        style="flex-shrink: 0; margin-left: 0.2rem;"
+        @click="visible = true"
+      >
+        选择颜色
+      </a-button>
+    </div>
+    <a-modal
+      v-model="visible"
+      title="颜色选择"
+      @ok="onSelect"
+      :zIndex="1002"
+      :destroyOnClose="true"
+      width="40%"
+    >
+      <chrome-picker
+        :value="tempColor"
+        :disable-alpha="true"
+        @input="onColorChange"
+      />
+      <div style="margin-top: 16px; text-align: center;">
+        <span>当前颜色: <span :style="{ color: tempColor }">{{ tempColor }}</span></span>
+      </div>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { Chrome } from 'vue-color'
+
+export default {
+  name: 'ColorPickerCombobox',
+  components: {
+    'chrome-picker': Chrome
+  },
+  props: {
+    value: {
+      type: String,
+      default: ''
+    },
+    readOnly: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      visible: false,
+      colorValue: this.value,
+      tempColor: this.value
+    }
+  },
+  watch: {
+    value (val) {
+      this.colorValue = val
+      this.tempColor = val
+    }
+  },
+  methods: {
+    onColorChange (color) {
+      // color.hex 是 #RRGGBB 格式
+      this.tempColor = color.hex
+    },
+    onSelect () {
+      this.colorValue = this.tempColor
+      this.visible = false
+      this.$emit('onSelect', this.colorValue)
+    },
+    setColor (val) {
+      this.colorValue = val
+      this.tempColor = val
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+#colorPickerCombobox {
+  .ant-input {
+    background: #fff;
+  }
+}
+.vc-chrome {
+  width: 100% !important;
+  box-sizing: border-box;
+}
+::v-deep .vc-chrome {
+  width: 100% !important;
+}
+</style>

package/src/base-client/components/common/ColorPickerCombobox/demo.vue

@@ -1,34 +1,34 @@
-<script>
-
-import ColorPickerCombobox from '@vue2-client/base-client/components/common/ColorPickerCombobox/ColorPickerCombobox.vue'
-
-export default {
-  name: 'Demo',
-  components: { ColorPickerCombobox },
-  data () {
-    return {
-      visible: false,
-      searchResult: {}
-    }
-  },
-  methods: {
-    colorPickerComboboxSelect (res) {
-      console.log('===colorPickerComboboxSelect', res)
-    }
-  }
-}
-</script>
-
-<template>
-  <div>
-    <ColorPickerCombobox
-      v-model="searchResult"
-      searchResultType="Object"
-      @onSelect="colorPickerComboboxSelect"
-    ></ColorPickerCombobox>
-  </div>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script>
+
+import ColorPickerCombobox from '@vue2-client/base-client/components/common/ColorPickerCombobox/ColorPickerCombobox.vue'
+
+export default {
+  name: 'Demo',
+  components: { ColorPickerCombobox },
+  data () {
+    return {
+      visible: false,
+      searchResult: {}
+    }
+  },
+  methods: {
+    colorPickerComboboxSelect (res) {
+      console.log('===colorPickerComboboxSelect', res)
+    }
+  }
+}
+</script>
+
+<template>
+  <div>
+    <ColorPickerCombobox
+      v-model="searchResult"
+      searchResultType="Object"
+      @onSelect="colorPickerComboboxSelect"
+    ></ColorPickerCombobox>
+  </div>
+</template>
+
+<style scoped lang="less">
+
+</style>

package/src/base-client/components/common/FormGroupEdit/FormGroupEdit.vue

@@ -1,146 +1,146 @@
-<template>
-  <a-drawer
-    title="选择参数组"
-    placement="right"
-    :width="isMobile ? screenWidth : screenWidth * 0.85"
-    :visible="visible"
-    @close="onClose"
-  >
-    <x-add-form
-      ref="xAddForm"
-      @onSubmit="onAddOrEditSubmit"/>
-    <a-list
-      :grid="{gutter: 24, lg: 4, md: 3, sm: 1, xs: 1}"
-      :dataSource="content.groups"
-    >
-      <a-list-item slot="renderItem" slot-scope="item">
-        <a-card :hoverable="true" @click="toEdit(item)">
-          <a-card-meta >
-            <div style="margin-bottom: 3px" slot="title">{{ item.group }}</div>
-            <a-icon type="tags" slot="avatar" :style="{ fontSize:'2em' }"/>
-            <div class="meta-content" slot="description">{{ item.describe }}</div>
-          </a-card-meta>
-        </a-card>
-      </a-list-item>
-    </a-list>
-  </a-drawer>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
-
-export default {
-  name: 'FormGroupEdit',
-  components: {
-    XAddForm
-  },
-  data () {
-    return {
-      // 页面宽度
-      screenWidth: document.documentElement.clientWidth,
-      formObj: {
-        groupName: '',
-        formJson: []
-      }
-    }
-  },
-  mounted () {
-    this.initView()
-  },
-  computed: {
-    ...mapState('setting', ['isMobile'])
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    serviceName: {
-      type: String,
-      default: undefined
-    },
-    modifyModelData: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    content: {
-      type: Object,
-      required: true
-    },
-    // 环境
-    env: {
-      type: String,
-      default: () => {
-        return 'prod'
-      }
-    },
-  },
-  watch: {
-    visible (rel) {
-      if (rel) {
-        this.initView()
-      }
-    }
-  },
-  methods: {
-    // 初始化组件
-    initView () {
-    },
-    toEdit (item) {
-      this.formObj = item
-      const modifyModelData = { data: this.modifyModelData[item.groupName] }
-      this.$refs.xAddForm.init({
-        businessType: '修改',
-        title: '参数项',
-        formItems: item.formJson,
-        serviceName: this.serviceName,
-        modifyModelData: modifyModelData
-      })
-    },
-    onClose () {
-      this.$emit('update:visible', false)
-    },
-    onAddOrEditSubmit (res, callback) {
-      const requestParameters = {
-        paramsJson: {}
-      }
-      requestParameters.paramsJson[this.formObj.groupName] = {}
-      for (const key of Object.keys(res.realForm)) {
-        requestParameters.paramsJson[this.formObj.groupName][key] = res.realForm[key]
-      }
-      this.$emit('onSubmit', requestParameters, result => {
-        if (result) {
-          this.$message.success('提交成功！')
-        } else {
-          this.$message.error('提交失败！')
-        }
-        callback()
-      })
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-  .card-avatar {
-    width: 48px;
-    height: 48px;
-    border-radius: 48px;
-  }
-  .new-btn{
-    border-radius: 2px;
-    width: 100%;
-    height: 187px;
-  }
-  .meta-content{
-    position: relative;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    height: 64px;
-    -webkit-line-clamp: 3;
-    -webkit-box-orient: vertical;
-  }
-</style>
+<template>
+  <a-drawer
+    title="选择参数组"
+    placement="right"
+    :width="isMobile ? screenWidth : screenWidth * 0.85"
+    :visible="visible"
+    @close="onClose"
+  >
+    <x-add-form
+      ref="xAddForm"
+      @onSubmit="onAddOrEditSubmit"/>
+    <a-list
+      :grid="{gutter: 24, lg: 4, md: 3, sm: 1, xs: 1}"
+      :dataSource="content.groups"
+    >
+      <a-list-item slot="renderItem" slot-scope="item">
+        <a-card :hoverable="true" @click="toEdit(item)">
+          <a-card-meta >
+            <div style="margin-bottom: 3px" slot="title">{{ item.group }}</div>
+            <a-icon type="tags" slot="avatar" :style="{ fontSize:'2em' }"/>
+            <div class="meta-content" slot="description">{{ item.describe }}</div>
+          </a-card-meta>
+        </a-card>
+      </a-list-item>
+    </a-list>
+  </a-drawer>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
+
+export default {
+  name: 'FormGroupEdit',
+  components: {
+    XAddForm
+  },
+  data () {
+    return {
+      // 页面宽度
+      screenWidth: document.documentElement.clientWidth,
+      formObj: {
+        groupName: '',
+        formJson: []
+      }
+    }
+  },
+  mounted () {
+    this.initView()
+  },
+  computed: {
+    ...mapState('setting', ['isMobile'])
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    serviceName: {
+      type: String,
+      default: undefined
+    },
+    modifyModelData: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    content: {
+      type: Object,
+      required: true
+    },
+    // 环境
+    env: {
+      type: String,
+      default: () => {
+        return 'prod'
+      }
+    },
+  },
+  watch: {
+    visible (rel) {
+      if (rel) {
+        this.initView()
+      }
+    }
+  },
+  methods: {
+    // 初始化组件
+    initView () {
+    },
+    toEdit (item) {
+      this.formObj = item
+      const modifyModelData = { data: this.modifyModelData[item.groupName] }
+      this.$refs.xAddForm.init({
+        businessType: '修改',
+        title: '参数项',
+        formItems: item.formJson,
+        serviceName: this.serviceName,
+        modifyModelData: modifyModelData
+      })
+    },
+    onClose () {
+      this.$emit('update:visible', false)
+    },
+    onAddOrEditSubmit (res, callback) {
+      const requestParameters = {
+        paramsJson: {}
+      }
+      requestParameters.paramsJson[this.formObj.groupName] = {}
+      for (const key of Object.keys(res.realForm)) {
+        requestParameters.paramsJson[this.formObj.groupName][key] = res.realForm[key]
+      }
+      this.$emit('onSubmit', requestParameters, result => {
+        if (result) {
+          this.$message.success('提交成功！')
+        } else {
+          this.$message.error('提交失败！')
+        }
+        callback()
+      })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+  .card-avatar {
+    width: 48px;
+    height: 48px;
+    border-radius: 48px;
+  }
+  .new-btn{
+    border-radius: 2px;
+    width: 100%;
+    height: 187px;
+  }
+  .meta-content{
+    position: relative;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    height: 64px;
+    -webkit-line-clamp: 3;
+    -webkit-box-orient: vertical;
+  }
+</style>

package/src/base-client/components/common/JSONToTree/index.js

@@ -1,3 +1,3 @@
-import JSONToTree from './jsontotree'
-
-export default JSONToTree
+import JSONToTree from './jsontotree'
+
+export default JSONToTree