vue2-client 1.2.33 → 1.2.36

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -1,307 +1,280 @@
-<template>
-  <!-- 综合筛选 -->
-  <x-form-col
-    :xl="xl"
-    :xxl="xxl"
-    v-if="attr.type === 'select' && attr.model === 'rowIdValue'">
-    <a-form-model-item
-      :ref="attr.model"
-      :label="attr.name"
-      :prop="attr.model">
-      <a-input :disabled="disabled" v-model="form[attr.model]">
-        <a-select
-          slot="addonBefore"
-          v-model="form['rowIdName']"
-          style="width: 100px">
-          <a-select-option
-            v-for="(item,index) in attr.keys"
-            :key="index"
-            :value="Object.keys(item)[0]">{{ item[Object.keys(item)[0]] }}
-          </a-select-option>
-        </a-select>
-      </a-input>
-    </a-form-model-item>
-  </x-form-col>
-  <!-- 输入框 -->
-  <x-form-col
-    :xl="xl"
-    :xxl="xxl"
-    v-else-if="attr.type === 'input'">
-    <a-form-model-item
-      :ref="attr.model"
-      :label="attr.name"
-      :prop="attr.model">
-      <a-input :disabled="disabled" v-model="form[attr.model]" :placeholder="attr.placeholder ? attr.placeholder : '请输入'+attr.name.replace(/\s*/g, '')"/>
-    </a-form-model-item>
-  </x-form-col>
-  <!-- 下拉框 -->
-  <x-form-col
-    :xl="xl"
-    :xxl="xxl"
-    v-else-if="attr.type === 'select'">
-    <a-form-model-item
-      :ref="attr.model"
-      :label="attr.name"
-      :prop="attr.model">
-      <a-select
-        v-if="!attr.lazyLoad || attr.lazyLoad === 'false'"
-        v-model="form[attr.model]"
-        :disabled="disabled"
-        show-search
-        :placeholder="attr.placeholder ? attr.placeholder : '请选择'"
-        :filter-option="filterOption"
-      >
-        <a-select-option
-          v-if="mode === '查询'"
-          key="999999"
-          value="全部">全部
-        </a-select-option>
-        <template v-if="attr.keys">
-          <a-select-option
-            v-for="(item,index) in attr.keys"
-            :key="index"
-            :value="Object.keys(item)[0]">
-            {{ item[Object.keys(item)[0]] }}
-          </a-select-option>
-        </template>
-        <template v-else>
-          <template v-if="attr.keyName.indexOf('logic@') !== -1">
-            <a-select-option
-              v-for="(item,index) in option"
-              :key="index"
-              :value="Object.keys(item)[0]">{{ item[Object.keys(item)[0]] }}
-            </a-select-option>
-          </template>
-          <template v-else>
-            <a-select-option
-              v-for="item in $appdata.getDictionaryList(attr.keyName)"
-              :key="item.value"
-              :value="item.value">
-              <!-- 徽标(badge) -->
-              <x-badge :badge-key="attr.keyName" :value="item.value" :replaceText="item.text"/>
-            </a-select-option>
-          </template>
-        </template>
-      </a-select>
-      <a-select
-        v-else
-        show-search
-        v-model="form[attr.model]"
-        :disabled="disabled"
-        @search="fetchFunction"
-        :placeholder="attr.placeholder ? attr.placeholder : '搜索' + attr.name"
-        :filter-option="filterOption"
-      >
-        <a-spin v-if="searching" slot="notFoundContent" size="small" />
-        <a-select-option
-          v-for="(item,index) in option"
-          :key="index"
-          :value="Object.keys(item)[0]">{{ item[Object.keys(item)[0]] }}
-        </a-select-option>
-      </a-select>
-    </a-form-model-item>
-  </x-form-col>
-  <!-- TODO 多选框 -->
-  <!-- TODO 单选框 -->
-  <!-- 日期范围选择器 -->
-  <x-form-col
-    :xl="xl"
-    :xxl="xxl"
-    v-else-if="attr.type === 'rangePicker'">
-    <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
-      <a-range-picker :disabled="disabled" :show-time="true" v-model="form[attr.model]" valueFormat="YYYY-MM-DD HH:mm:ss"/>
-    </a-form-model-item>
-  </x-form-col>
-  <!-- 月份选择器 -->
-  <x-form-col
-    :xl="xl"
-    :xxl="xxl"
-    v-else-if="attr.type === 'monthPicker'">
-    <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
-      <a-month-picker :disabled="disabled" :show-time="true" v-model="form[attr.model]" valueFormat="YYYY-MM"/>
-    </a-form-model-item>
-  </x-form-col>
-  <!-- 日期选择器 -->
-  <x-form-col
-    :xl="xl"
-    :xxl="xxl"
-    v-else-if="attr.type === 'datePicker'">
-    <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
-      <a-date-picker :disabled="disabled" :show-time="true" v-model="form[attr.model]" valueFormat="YYYY-MM-DD"/>
-    </a-form-model-item>
-  </x-form-col>
-  <!-- 级联选择器 -->
-  <x-form-col
-    :xl="xl"
-    :xxl="xxl"
-    v-else-if="attr.type === 'cascader'">
-    <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
-      <template v-if="attr.keys">
-        <a-dcascader :disabled="disabled" :option="attr.keys" :value="form[attr.model]"/>
-      </template>
-      <template v-else>
-        <a-dcascader :disabled="disabled" :option="option" :value="form[attr.model]"/>
-      </template>
-    </a-form-model-item>
-  </x-form-col>
-  <!-- 文本域 -->
-  <x-form-col
-    :xl="24"
-    :xxl="24"
-    :xs="24"
-    :sm="24"
-    :md="24"
-    :lg="24"
-    v-else-if="attr.type === 'textarea'">
-    <a-form-model-item
-      :ref="attr.model"
-      :label="attr.name"
-      :prop="attr.model">
-      <a-textarea :rows="4" :disabled="disabled" v-model="form[attr.model]" :placeholder="attr.placeholder ? attr.placeholder : '请输入'+attr.name.replace(/\s*/g, '')"/>
-    </a-form-model-item>
-  </x-form-col>
-  <!-- TODO 文件上传 -->
-  <x-form-col
-    :xl="24"
-    :xxl="24"
-    :xs="24"
-    :sm="24"
-    :md="24"
-    :lg="24"
-    v-else-if="attr.type === 'file'">
-    <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
-      <a-upload-dragger
-        name="file"
-        :multiple="true"
-        :action="'/webmeteruploadapi/upload/'+attr.resUploadMode">
-        <p class="ant-upload-drag-icon">
-          <a-icon type="inbox"/>
-        </p>
-        <p class="ant-upload-text">
-          点击或拖动文件到该区域上传
-        </p>
-        <p class="ant-upload-hint">
-          支持单个或多个文件
-        </p>
-      </a-upload-dragger>
-    </a-form-model-item>
-  </x-form-col>
-  <!-- TODO 图片上传 -->
-  <x-form-col
-    :xl="24"
-    :xxl="24"
-    :xs="24"
-    :sm="24"
-    :md="24"
-    :lg="24"
-    v-else-if="attr.type === 'image'">
-    <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
-      <a-upload list-type="picture-card" :file-list="[]">
-        <a-icon type="plus"/>
-        <div class="ant-upload-text">
-          Upload
-        </div>
-      </a-upload>
-    </a-form-model-item>
-  </x-form-col>
-</template>
-<script>
-
-import { post } from '@vue2-client/services/api'
-import { debounce } from 'ant-design-vue/lib/vc-table/src/utils'
-
-export default {
-  name: 'XFormItem',
-  data () {
-    // 检索去抖
-    this.fetchFunction = debounce(this.fetchFunction, 800)
-    return {
-      option: [],
-      // 最后检索版本
-      lastFetchId: 0,
-      // 检索中
-      searching: false
-    }
-  },
-  props: {
-    attr: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    form: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    disabled: {
-      type: Boolean,
-      default: () => {
-        return false
-      }
-    },
-    mode: {
-      type: String,
-      default: () => {
-        return '查询'
-      }
-    },
-    xl: {
-      type: Number,
-      default: undefined
-    },
-    xxl: {
-      type: Number,
-      default: undefined
-    }
-  },
-  created () {
-    if ((!this.attr.lazyLoad || this.attr.lazyLoad === 'false') && this.attr.keyName && this.attr.keyName.indexOf('logic@') !== -1) {
-      this.getData({}, res => {
-        this.option = res
-      })
-    }
-  },
-  methods: {
-    // 懒加载检索方法
-    fetchFunction (value) {
-      this.lastFetchId += 1
-      const fetchId = this.lastFetchId
-      this.option = []
-      this.searching = true
-      this.getData({
-        word: value
-      }, res => {
-        if (fetchId !== this.lastFetchId) {
-          return
-        }
-        this.option = res
-        this.searching = false
-      })
-    },
-    // 获取数据
-    getData (value, callback) {
-      if (value !== '') {
-        const logicName = this.attr.keyName
-        const logic = logicName.substring(6)
-        post('/webmeterapi/' + logic, value).then(res => {
-          callback(res)
-        })
-      }
-    },
-    filterOption (input, option) {
-      if (option.componentOptions.children[0].text) {
-        return (
-          option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        )
-      } else {
-        return (
-          option.componentOptions.children[0].child.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        )
-      }
-    }
-  }
-}
-</script>
+<template>
+  <!-- 综合筛选 -->
+  <x-form-col
+    :xl="xl"
+    :xxl="xxl"
+    v-if="attr.type === 'select' && attr.model === 'rowIdValue'">
+    <a-form-model-item
+      :ref="attr.model"
+      :label="attr.name"
+      :prop="attr.model">
+      <a-input :disabled="disabled" v-model="form[attr.model]">
+        <a-select
+          slot="addonBefore"
+          v-model="form['rowIdName']"
+          style="width: 100px">
+          <a-select-option
+            v-for="(item,index) in attr.keys"
+            :key="index"
+            :value="Object.keys(item)[0]">{{ item[Object.keys(item)[0]] }}
+          </a-select-option>
+        </a-select>
+      </a-input>
+    </a-form-model-item>
+  </x-form-col>
+  <!-- 输入框 -->
+  <x-form-col
+    :xl="xl"
+    :xxl="xxl"
+    v-else-if="attr.type === 'input'">
+    <a-form-model-item
+      :ref="attr.model"
+      :label="attr.name"
+      :prop="attr.model">
+      <a-input :disabled="disabled" v-model="form[attr.model]" :placeholder="attr.placeholder ? attr.placeholder : '请输入'+attr.name.replace(/\s*/g, '')"/>
+    </a-form-model-item>
+  </x-form-col>
+  <!-- 下拉框 -->
+  <x-form-col
+    :xl="xl"
+    :xxl="xxl"
+    v-else-if="attr.type === 'select'">
+    <a-form-model-item
+      :ref="attr.model"
+      :label="attr.name"
+      :prop="attr.model">
+      <a-select
+        v-if="!attr.lazyLoad || attr.lazyLoad === 'false'"
+        v-model="form[attr.model]"
+        :disabled="disabled"
+        show-search
+        :placeholder="attr.placeholder ? attr.placeholder : '请选择'"
+        :filter-option="filterOption"
+      >
+        <a-select-option
+          v-if="mode === '查询'"
+          key="999999"
+          value="全部">全部
+        </a-select-option>
+        <template v-if="attr.keys">
+          <a-select-option
+            v-for="(item,index) in attr.keys"
+            :key="index"
+            :value="Object.keys(item)[0]">
+            {{ item[Object.keys(item)[0]] }}
+          </a-select-option>
+        </template>
+        <template v-else>
+          <template v-if="attr.keyName.indexOf('logic@') !== -1">
+            <a-select-option
+              v-for="(item,index) in option"
+              :key="index"
+              :value="Object.keys(item)[0]">{{ item[Object.keys(item)[0]] }}
+            </a-select-option>
+          </template>
+          <template v-else>
+            <a-select-option
+              v-for="item in $appdata.getDictionaryList(attr.keyName)"
+              :key="item.value"
+              :value="item.value">
+              <!-- 徽标(badge) -->
+              <x-badge :badge-key="attr.keyName" :value="item.value" :replaceText="item.text"/>
+            </a-select-option>
+          </template>
+        </template>
+      </a-select>
+      <a-select
+        v-else
+        show-search
+        v-model="form[attr.model]"
+        :disabled="disabled"
+        @search="fetchFunction"
+        :placeholder="attr.placeholder ? attr.placeholder : '搜索' + attr.name"
+        :filter-option="filterOption"
+      >
+        <a-spin v-if="searching" slot="notFoundContent" size="small" />
+        <a-select-option
+          v-for="(item,index) in option"
+          :key="index"
+          :value="Object.keys(item)[0]">{{ item[Object.keys(item)[0]] }}
+        </a-select-option>
+      </a-select>
+    </a-form-model-item>
+  </x-form-col>
+  <!-- TODO 多选框 -->
+  <!-- TODO 单选框 -->
+  <!-- 日期范围选择器 -->
+  <x-form-col
+    :xl="xl"
+    :xxl="xxl"
+    v-else-if="attr.type === 'rangePicker'">
+    <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
+      <a-range-picker :disabled="disabled" :show-time="true" v-model="form[attr.model]" valueFormat="YYYY-MM-DD HH:mm:ss"/>
+    </a-form-model-item>
+  </x-form-col>
+  <!-- 月份选择器 -->
+  <x-form-col
+    :xl="xl"
+    :xxl="xxl"
+    v-else-if="attr.type === 'monthPicker'">
+    <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
+      <a-month-picker :disabled="disabled" :show-time="true" v-model="form[attr.model]" valueFormat="YYYY-MM"/>
+    </a-form-model-item>
+  </x-form-col>
+  <!-- 日期选择器 -->
+  <x-form-col
+    :xl="xl"
+    :xxl="xxl"
+    v-else-if="attr.type === 'datePicker'">
+    <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
+      <a-date-picker :disabled="disabled" :show-time="true" v-model="form[attr.model]" valueFormat="YYYY-MM-DD"/>
+    </a-form-model-item>
+  </x-form-col>
+  <!-- 级联选择器 -->
+  <x-form-col
+    :xl="xl"
+    :xxl="xxl"
+    v-else-if="attr.type === 'cascader'">
+    <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
+      <template v-if="attr.keys">
+        <a-dcascader :disabled="disabled" :option="attr.keys" :value="form[attr.model]"/>
+      </template>
+      <template v-else>
+        <a-dcascader :disabled="disabled" :option="option" :value="form[attr.model]"/>
+      </template>
+    </a-form-model-item>
+  </x-form-col>
+  <!-- 文本域 -->
+  <x-form-col
+    :xl="24"
+    :xxl="24"
+    :xs="24"
+    :sm="24"
+    :md="24"
+    :lg="24"
+    v-else-if="attr.type === 'textarea'">
+    <a-form-model-item
+      :ref="attr.model"
+      :label="attr.name"
+      :prop="attr.model">
+      <a-textarea :rows="4" :disabled="disabled" v-model="form[attr.model]" :placeholder="attr.placeholder ? attr.placeholder : '请输入'+attr.name.replace(/\s*/g, '')"/>
+    </a-form-model-item>
+  </x-form-col>
+  <!-- TODO 文件上传 -->
+  <x-form-col
+    :xl="24"
+    :xxl="24"
+    :xs="24"
+    :sm="24"
+    :md="24"
+    :lg="24"
+    v-else-if="attr.type === 'file' || attr.type === 'image'">
+    <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
+      <upload :model="attr" @setFiles="setFiles"></upload>
+    </a-form-model-item>
+  </x-form-col>
+</template>
+<script>
+
+import { post } from '@vue2-client/services/api'
+import { debounce } from 'ant-design-vue/lib/vc-table/src/utils'
+
+export default {
+  name: 'XFormItem',
+  data () {
+    // 检索去抖
+    this.fetchFunction = debounce(this.fetchFunction, 800)
+    return {
+      option: [],
+      // 最后检索版本
+      lastFetchId: 0,
+      // 检索中
+      searching: false
+    }
+  },
+  props: {
+    attr: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    form: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    disabled: {
+      type: Boolean,
+      default: () => {
+        return false
+      }
+    },
+    mode: {
+      type: String,
+      default: () => {
+        return '查询'
+      }
+    },
+    xl: {
+      type: Number,
+      default: undefined
+    },
+    xxl: {
+      type: Number,
+      default: undefined
+    }
+  },
+  created () {
+    if ((!this.attr.lazyLoad || this.attr.lazyLoad === 'false') && this.attr.keyName && this.attr.keyName.indexOf('logic@') !== -1) {
+      this.getData({}, res => {
+        this.option = res
+      })
+    }
+  },
+  methods: {
+    // 文件框时设置上传组件的值
+    setFiles (fileIds) {
+      this.form[this.attr.model] = fileIds
+    },
+    // 懒加载检索方法
+    fetchFunction (value) {
+      this.lastFetchId += 1
+      const fetchId = this.lastFetchId
+      this.option = []
+      this.searching = true
+      this.getData({
+        word: value
+      }, res => {
+        if (fetchId !== this.lastFetchId) {
+          return
+        }
+        this.option = res
+        this.searching = false
+      })
+    },
+    // 获取数据
+    getData (value, callback) {
+      if (value !== '') {
+        const logicName = this.attr.keyName
+        const logic = logicName.substring(6)
+        post('/webmeterapi/' + logic, value).then(res => {
+          callback(res)
+        })
+      }
+    },
+    filterOption (input, option) {
+      if (option.componentOptions.children[0].text) {
+        return (
+          option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        )
+      } else {
+        return (
+          option.componentOptions.children[0].child.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        )
+      }
+    }
+  }
+}
+</script>

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

@@ -259,7 +259,7 @@ export default {
       }
       // 如果是临时表
       if (this.isTableTemp) {
-        this.$emit('tempTableModify',res)
+        this.$emit('tempTableModify', res)
         return
       }
       if (res.valid) {
@@ -331,7 +331,7 @@ export default {
         }
         requestParameters.conditionParams[this.tableColumns[0].dataIndex] = this.selectedRowKeys[0]
         if (this.isTableTemp) {
-          this.$emit('tempTableEdit',requestParameters)
+          this.$emit('tempTableEdit', requestParameters)
           return
         }
         this.editDataLoading = true
@@ -407,12 +407,12 @@ export default {
     // 插入临时表数据sql生成
     insertTempTableData (defineJson) {
       const tableName = defineJson.tableName
-      let params = {}
+      const params = {}
       params.define = defineJson.column
       params.applyId = defineJson.applyId
       params.stepName = defineJson.stepName
       params.tableName = tableName
-      return post (ApplyInstallApi.insertDataToTempTable, {
+      return post(ApplyInstallApi.insertDataToTempTable, {
         tempTableData: params
       })
         .then(