vue2-client 1.1.0 → 1.2.2

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

@@ -1,323 +1,323 @@
-<template>
-  <a-modal
-    :title="businessTitle"
-    :visible="visible"
-    :width="1000"
-    @cancel="onClose"
-    okText="提交"
-    :confirm-loading="loading"
-    :zIndex="1001"
-    @ok="onSubmit">
-    <div class="table-page-search-wrapper">
-      <a-form-model
-        v-if="loaded"
-        ref="selectForm"
-        :model="form"
-        :rules="rules">
-        <a-row :gutter="16">
-          <x-form-item
-            v-for="(item, index) in realJsonData"
-            mode="新增/修改"
-            :attr="item"
-            :form="form"
-            :key="index"
-            :disabled="itemDisabled(item)"
-            :xl="12"
-            :xxl="8"
-          />
-          <div v-for="group in realJsonSelectsData" :key="group[0].group">
-            <x-form-col v-for="groupItem in group" :key="groupItem.group + groupItem.groupIndex" :xl="12" :xxl="8">
-              <a-form-model-item :label="groupItem.name" :disabled="itemDisabled(groupItem)">
-                <a-select v-model="form[groupItem.model]" :disabled="itemDisabledPlus(groupItem.group,groupItem.groupIndex)" :allowClear="true" @change="selectsItemCheck(groupItem.group,groupItem.groupIndex,form[groupItem.model],group)" placeholder="请选择">
-                  <template v-for="option in SelectsArray[groupItem.group][groupItem.groupIndex]">
-                    <a-select-option :key="option.label" :value="option.value">
-                      {{ option.label }}
-                    </a-select-option>
-                  </template>
-                </a-select>
-              </a-form-model-item>
-            </x-form-col>
-          </div>
-        </a-row>
-      </a-form-model>
-    </div>
-  </a-modal>
-</template>
-<script>
-import XFormItem from '@/base-client/components/common/XForm/XFormItem'
-import { formatDate } from '@/utils/util'
-import { mapState } from 'vuex'
-import { post } from '@/services/api/restTools'
-
-export default {
-    name: 'XAddForm',
-    components: {
-      XFormItem
-    },
-    data () {
-      return {
-        // 内容加载是否完成
-        loaded: false,
-        // 表单Model
-        form: undefined,
-        // 多层下拉框组 数据储存
-        SelectsArray: {},
-        // 多层下拉框组 各组数量
-        SelectsNumber: {},
-        // 校验
-        rules: {},
-        // 图标样式
-        iconStyle: {
-          position: 'relative',
-          top: '1px'
-        }
-      }
-    },
-    computed: {
-      // 过滤出用于新增/修改场景的表单项
-      realJsonData: function () {
-        return this.jsonData.filter(function (item) {
-          return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && !item.group
-        })
-      },
-      // 过滤出多个下拉框分组级联得数据
-      realJsonSelectsData: function () {
-        const Selectsata = this.jsonData.filter(item => !item.isOnlyAddOrEdit && item.group)
-        const groupName = [...new Set(Selectsata.map(item => item.group))]
-        // 初始化数据组
-        groupName.forEach(item => {
-          this.SelectsArray[item] = []
-        })
-        return groupName.map(groupName => {
-          const SelectsItem = Selectsata.filter(item => {
-              if (item.groupIndex === 1) {
-                if (item.keyName.substring(0, 6) === 'logic@') {
-                  // 请求logic
-                  post('/webmeterapi/' + item.keyName.substring(6), {}).then(res => {
-                    this.SelectsArray[item.group][item.groupIndex] = res
-                  })
-                } else {
-                  this.SelectsArray[item.group][item.groupIndex] = JSON.parse(item.keyName)
-                }
-              }
-              return item.group === groupName
-            }
-          )
-          this.SelectsNumber[groupName] = SelectsItem.length ? SelectsItem.length : 0
-          return SelectsItem
-        })
-      },
-      // 过滤出用于静默新增场景的表单项
-      silenceAddJsonData: function () {
-        return this.jsonData.filter(function (item) {
-          return item.addOrEdit === 'silenceAdd'
-        })
-      },
-      ...mapState('account', { currUser: 'user' })
-    },
-    props: {
-      jsonData: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-      // 是否显示模态框
-      visible: {
-        type: Boolean,
-        default: () => {
-          return false
-        }
-      },
-      // 业务类型
-      businessType: {
-        type: String,
-        default: ''
-      },
-      // 业务标题
-      businessTitle: {
-        type: String,
-        default: ''
-      },
-      // 修改操作前查询出的业务数据
-      modifyModelData: {
-        type: Object,
-        default: () => {
-          return {}
-        }
-      },
-      // 新增或修改业务是否执行中
-      loading: {
-        type: Boolean,
-        default: () => {
-          return false
-        }
-      },
-      // 固定新增表单
-      fixedAddForm: {
-        type: Object,
-        default: () => {
-          return {}
-        }
-      }
-    },
-    watch: {
-      visible (rel) {
-        if (rel) {
-          this.formItemLoad()
-        }
-      }
-    },
-    mounted () {
-      this.formItemLoad()
-    },
-    methods: {
-      selectsItemCheck (groupName, index, value, group) {
-        const tem = { }
-        // 获取当前下拉框子下拉框的数据
-        this.SelectsArray[groupName][index + 1] = this.SelectsArray[groupName][index].filter(item => item.value === value)[0].children
-        // 清空子下拉框的子们的数据
-        for (let i = index; i < this.SelectsNumber[groupName]; i++) {
-          tem[group[i].model] = undefined
-        }
-        this.form = Object.assign({}, this.form, tem)
-        // 清空子下拉框的子们的数据源
-        for (let i = index + 2; i <= this.SelectsNumber[groupName]; i++) {
-          this.SelectsArray[groupName][i] = []
-        }
-      },
-      formItemLoad () {
-        const formData = Object.assign({}, this.fixedAddForm)
-        for (let i = 0; i < this.realJsonData.length; i++) {
-          const item = this.realJsonData[i]
-          formData[item.model] = undefined
-          // 处理表单校验情况
-          if (item.rule) {
-            this.rules[item.model] = []
-            const required = item.rule.required ? item.rule.required === true || item.rule.required === 'true' : false
-            let trigger
-            let message
-            if (required) {
-              switch (item.type) {
-                case 'select':
-                  message = '请选择' + item.name
-                  trigger = 'change'
-                  break
-                default:
-                  message = '请输入' + item.name
-                  trigger = 'blur'
-              }
-              this.rules[item.model].push({
-                required: true,
-                message: message,
-                trigger: trigger
-              })
-            }
-
-            switch (item.rule.type) {
-              case 'number':
-              case 'integer':
-              case 'float':
-                let defaultValue
-                let message
-                switch (item.rule.type) {
-                  case 'number':
-                    message = '数字'
-                    defaultValue = 0
-                    break
-                  case 'integer':
-                    message = '整数'
-                    defaultValue = 0
-                    break
-                  case 'float':
-                    message = '小数'
-                    defaultValue = 0.0
-                    break
-                }
-                this.rules[item.model].push({
-                  type: item.rule.type,
-                  message: item.name + '必须为' + message,
-                  transform: (value) => {
-                    if (value && value.length !== 0) {
-                      return Number(value)
-                    } else {
-                      return defaultValue
-                    }
-                  },
-                  trigger: 'blur'
-                })
-                break
-            }
-          }
-        }
-        this.form = formData
-        if (Object.keys(this.modifyModelData).length > 0) {
-          this.getModifyModelData()
-        }
-        this.loaded = true
-      },
-      itemDisabled (value) {
-        return (this.businessType === '新增' && value.addOrEdit === 'edit') ||
-          (this.businessType === '修改' && value.addOrEdit === 'add')
-      },
-      itemDisabledPlus (group, index) {
-        return (!this.SelectsArray[group][index]) || (this.SelectsArray[group][index] && this.SelectsArray[group][index].length === 0)
-      },
-      resetForm () {
-        this.$refs.selectForm.resetFields()
-      },
-      async onSubmit () {
-        this.$refs.selectForm.validate(async valid => {
-          for (const key of Object.keys(this.form)) {
-            if (this.form[key] === null || this.form[key] === '') {
-              this.form[key] = undefined
-            }
-          }
-          const requestParameters = Object.assign({}, this.form)
-          // 追加静默新增字段
-          if (this.businessType === '新增') {
-            for (const item of this.silenceAddJsonData) {
-              switch (item.silencePurpose) {
-                case 'createTime':
-                  requestParameters[item.model] = formatDate('now')
-                  break
-                case 'operator':
-                  requestParameters[item.model] = this.currUser.name
-                  break
-                case 'orgId':
-                  requestParameters[item.model] = this.currUser.orgid
-                  break
-              }
-            }
-            // 通过请求追加静默新增：自定义字段
-            for (const item of this.silenceAddJsonData.filter((item) => item.silencePurpose === 'customize')) {
-              requestParameters[item.model] = await this.getSilenceSource(item.silenceSource, requestParameters)
-            }
-          }
-          const data = {
-            valid: valid,
-            form: requestParameters
-          }
-          this.$emit('onSubmit', data)
-        })
-      },
-      async getSilenceSource (silenceSource, requestParameters) {
-        const result = await post('/webmeterapi/' + silenceSource, requestParameters)
-        return result
-      },
-      getModifyModelData () {
-        for (let i = 0; i < this.realJsonData.length; i++) {
-          const item = this.realJsonData[i]
-          if (this.modifyModelData[item.model] || this.modifyModelData[item.model] === 0) {
-            this.form[item.model] = this.modifyModelData[item.model] + ''
-          } else {
-            this.form[item.model] = undefined
-          }
-        }
-      },
-      onClose () {
-        this.$emit('update:visible', false)
-      }
-    }
-  }
-</script>
+<template>
+  <a-modal
+    :title="businessTitle"
+    :visible="visible"
+    :width="1000"
+    @cancel="onClose"
+    okText="提交"
+    :confirm-loading="loading"
+    :zIndex="1001"
+    @ok="onSubmit">
+    <div class="table-page-search-wrapper">
+      <a-form-model
+        v-if="loaded"
+        ref="selectForm"
+        :model="form"
+        :rules="rules">
+        <a-row :gutter="16">
+          <x-form-item
+            v-for="(item, index) in realJsonData"
+            mode="新增/修改"
+            :attr="item"
+            :form="form"
+            :key="index"
+            :disabled="itemDisabled(item)"
+            :xl="12"
+            :xxl="8"
+          />
+          <div v-for="group in realJsonSelectsData" :key="group[0].group">
+            <x-form-col v-for="groupItem in group" :key="groupItem.group + groupItem.groupIndex" :xl="12" :xxl="8">
+              <a-form-model-item :label="groupItem.name" :disabled="itemDisabled(groupItem)">
+                <a-select v-model="form[groupItem.model]" :disabled="itemDisabledPlus(groupItem.group,groupItem.groupIndex)" :allowClear="true" @change="selectsItemCheck(groupItem.group,groupItem.groupIndex,form[groupItem.model],group)" placeholder="请选择">
+                  <template v-for="option in SelectsArray[groupItem.group][groupItem.groupIndex]">
+                    <a-select-option :key="option.label" :value="option.value">
+                      {{ option.label }}
+                    </a-select-option>
+                  </template>
+                </a-select>
+              </a-form-model-item>
+            </x-form-col>
+          </div>
+        </a-row>
+      </a-form-model>
+    </div>
+  </a-modal>
+</template>
+<script>
+import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
+import { formatDate } from '@vue2-client/utils/util'
+import { mapState } from 'vuex'
+import { post } from '@vue2-client/services/api/restTools'
+
+export default {
+    name: 'XAddForm',
+    components: {
+      XFormItem
+    },
+    data () {
+      return {
+        // 内容加载是否完成
+        loaded: false,
+        // 表单Model
+        form: undefined,
+        // 多层下拉框组 数据储存
+        SelectsArray: {},
+        // 多层下拉框组 各组数量
+        SelectsNumber: {},
+        // 校验
+        rules: {},
+        // 图标样式
+        iconStyle: {
+          position: 'relative',
+          top: '1px'
+        }
+      }
+    },
+    computed: {
+      // 过滤出用于新增/修改场景的表单项
+      realJsonData: function () {
+        return this.jsonData.filter(function (item) {
+          return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && !item.group
+        })
+      },
+      // 过滤出多个下拉框分组级联得数据
+      realJsonSelectsData: function () {
+        const Selectsata = this.jsonData.filter(item => !item.isOnlyAddOrEdit && item.group)
+        const groupName = [...new Set(Selectsata.map(item => item.group))]
+        // 初始化数据组
+        groupName.forEach(item => {
+          this.SelectsArray[item] = []
+        })
+        return groupName.map(groupName => {
+          const SelectsItem = Selectsata.filter(item => {
+              if (item.groupIndex === 1) {
+                if (item.keyName.substring(0, 6) === 'logic@') {
+                  // 请求logic
+                  post('/webmeterapi/' + item.keyName.substring(6), {}).then(res => {
+                    this.SelectsArray[item.group][item.groupIndex] = res
+                  })
+                } else {
+                  this.SelectsArray[item.group][item.groupIndex] = JSON.parse(item.keyName)
+                }
+              }
+              return item.group === groupName
+            }
+          )
+          this.SelectsNumber[groupName] = SelectsItem.length ? SelectsItem.length : 0
+          return SelectsItem
+        })
+      },
+      // 过滤出用于静默新增场景的表单项
+      silenceAddJsonData: function () {
+        return this.jsonData.filter(function (item) {
+          return item.addOrEdit === 'silenceAdd'
+        })
+      },
+      ...mapState('account', { currUser: 'user' })
+    },
+    props: {
+      jsonData: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      // 是否显示模态框
+      visible: {
+        type: Boolean,
+        default: () => {
+          return false
+        }
+      },
+      // 业务类型
+      businessType: {
+        type: String,
+        default: ''
+      },
+      // 业务标题
+      businessTitle: {
+        type: String,
+        default: ''
+      },
+      // 修改操作前查询出的业务数据
+      modifyModelData: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      },
+      // 新增或修改业务是否执行中
+      loading: {
+        type: Boolean,
+        default: () => {
+          return false
+        }
+      },
+      // 固定新增表单
+      fixedAddForm: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      }
+    },
+    watch: {
+      visible (rel) {
+        if (rel) {
+          this.formItemLoad()
+        }
+      }
+    },
+    mounted () {
+      this.formItemLoad()
+    },
+    methods: {
+      selectsItemCheck (groupName, index, value, group) {
+        const tem = { }
+        // 获取当前下拉框子下拉框的数据
+        this.SelectsArray[groupName][index + 1] = this.SelectsArray[groupName][index].filter(item => item.value === value)[0].children
+        // 清空子下拉框的子们的数据
+        for (let i = index; i < this.SelectsNumber[groupName]; i++) {
+          tem[group[i].model] = undefined
+        }
+        this.form = Object.assign({}, this.form, tem)
+        // 清空子下拉框的子们的数据源
+        for (let i = index + 2; i <= this.SelectsNumber[groupName]; i++) {
+          this.SelectsArray[groupName][i] = []
+        }
+      },
+      formItemLoad () {
+        const formData = Object.assign({}, this.fixedAddForm)
+        for (let i = 0; i < this.realJsonData.length; i++) {
+          const item = this.realJsonData[i]
+          formData[item.model] = undefined
+          // 处理表单校验情况
+          if (item.rule) {
+            this.rules[item.model] = []
+            const required = item.rule.required ? item.rule.required === true || item.rule.required === 'true' : false
+            let trigger
+            let message
+            if (required) {
+              switch (item.type) {
+                case 'select':
+                  message = '请选择' + item.name
+                  trigger = 'change'
+                  break
+                default:
+                  message = '请输入' + item.name
+                  trigger = 'blur'
+              }
+              this.rules[item.model].push({
+                required: true,
+                message: message,
+                trigger: trigger
+              })
+            }
+
+            switch (item.rule.type) {
+              case 'number':
+              case 'integer':
+              case 'float':
+                let defaultValue
+                let message
+                switch (item.rule.type) {
+                  case 'number':
+                    message = '数字'
+                    defaultValue = 0
+                    break
+                  case 'integer':
+                    message = '整数'
+                    defaultValue = 0
+                    break
+                  case 'float':
+                    message = '小数'
+                    defaultValue = 0.0
+                    break
+                }
+                this.rules[item.model].push({
+                  type: item.rule.type,
+                  message: item.name + '必须为' + message,
+                  transform: (value) => {
+                    if (value && value.length !== 0) {
+                      return Number(value)
+                    } else {
+                      return defaultValue
+                    }
+                  },
+                  trigger: 'blur'
+                })
+                break
+            }
+          }
+        }
+        this.form = formData
+        if (Object.keys(this.modifyModelData).length > 0) {
+          this.getModifyModelData()
+        }
+        this.loaded = true
+      },
+      itemDisabled (value) {
+        return (this.businessType === '新增' && value.addOrEdit === 'edit') ||
+          (this.businessType === '修改' && value.addOrEdit === 'add')
+      },
+      itemDisabledPlus (group, index) {
+        return (!this.SelectsArray[group][index]) || (this.SelectsArray[group][index] && this.SelectsArray[group][index].length === 0)
+      },
+      resetForm () {
+        this.$refs.selectForm.resetFields()
+      },
+      async onSubmit () {
+        this.$refs.selectForm.validate(async valid => {
+          for (const key of Object.keys(this.form)) {
+            if (this.form[key] === null || this.form[key] === '') {
+              this.form[key] = undefined
+            }
+          }
+          const requestParameters = Object.assign({}, this.form)
+          // 追加静默新增字段
+          if (this.businessType === '新增') {
+            for (const item of this.silenceAddJsonData) {
+              switch (item.silencePurpose) {
+                case 'createTime':
+                  requestParameters[item.model] = formatDate('now')
+                  break
+                case 'operator':
+                  requestParameters[item.model] = this.currUser.name
+                  break
+                case 'orgId':
+                  requestParameters[item.model] = this.currUser.orgid
+                  break
+              }
+            }
+            // 通过请求追加静默新增：自定义字段
+            for (const item of this.silenceAddJsonData.filter((item) => item.silencePurpose === 'customize')) {
+              requestParameters[item.model] = await this.getSilenceSource(item.silenceSource, requestParameters)
+            }
+          }
+          const data = {
+            valid: valid,
+            form: requestParameters
+          }
+          this.$emit('onSubmit', data)
+        })
+      },
+      async getSilenceSource (silenceSource, requestParameters) {
+        const result = await post('/webmeterapi/' + silenceSource, requestParameters)
+        return result
+      },
+      getModifyModelData () {
+        for (let i = 0; i < this.realJsonData.length; i++) {
+          const item = this.realJsonData[i]
+          if (this.modifyModelData[item.model] || this.modifyModelData[item.model] === 0) {
+            this.form[item.model] = this.modifyModelData[item.model] + ''
+          } else {
+            this.form[item.model] = undefined
+          }
+        }
+      },
+      onClose () {
+        this.$emit('update:visible', false)
+      }
+    }
+  }
+</script>

package/src/base-client/components/common/XAddForm/index.md

@@ -11,7 +11,7 @@
 引用方式：
 
 ```javascript
-import XAddForm from '@/base-client/components/XAddForm/XAddForm'
+import XAddForm from '@vue2-client/base-client/components/XAddForm/XAddForm'
 
 export default {
     components: {

package/src/base-client/components/common/XBadge/index.md

@@ -12,7 +12,7 @@
 引用方式：
 
 ```javascript
-import XBadge from '@/base-client/components/XBadge'
+import XBadge from '@vue2-client/base-client/components/XBadge'
 
 export default {
     components: {