vue2-client 1.6.49 → 1.7.0

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

@@ -1,64 +1,64 @@
-<template>
-  <div>
-    <a-card :body-style="{ margin: 0, padding: 0 }" :bordered="false">
-      <a-skeleton v-show="loadState === 'loading'" active style="padding: 16px"/>
-      <a-empty v-show="loadState === 'empty'">
-        <a-button type="dashed" @click="retry">
-          重新加载
-        </a-button>
-      </a-empty>
-      <a-card
-        v-show="loadState === 'error'"
-        :body-style="{ margin: '0 auto' }"
-        :bordered="false"
-        :hoverable="true"
-        class="retryCard"
-        @click="retry" >
-        <a-icon :style="{ fontSize: '28px' }" type="global"/>
-        <p class="noSelect" style="margin-top: 20px">网络好像开小差了，点击重新加载...</p>
-      </a-card>
-      <div v-show="loadState === 'success'">
-        <slot></slot>
-      </div>
-    </a-card>
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: 'XCard',
-  props: {
-    loadState: {
-      type: String,
-      default: 'success'
-    },
-    retry: {
-      type: Function,
-      default: () => {
-        console.error('未实现重新加载')
-      }
-    }
-  },
-  data () {
-    return {
-
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.retryCard {
-  text-align: center;
-}
-.noSelect {
-  -webkit-touch-callout: none; /* iOS Safari */
-  -webkit-user-select: none; /* Chrome/Safari/Opera */
-  -khtml-user-select: none; /* Konqueror */
-  -moz-user-select: none; /* Firefox */
-  -ms-user-select: none; /* Internet Explorer/Edge */
-  user-select: none; /* Non-prefixed version, currently
-  not supported by any browser */
-}
-</style>
+<template>
+  <div>
+    <a-card :body-style="{ margin: 0, padding: 0 }" :bordered="false">
+      <a-skeleton v-show="loadState === 'loading'" active style="padding: 16px"/>
+      <a-empty v-show="loadState === 'empty'">
+        <a-button type="dashed" @click="retry">
+          重新加载
+        </a-button>
+      </a-empty>
+      <a-card
+        v-show="loadState === 'error'"
+        :body-style="{ margin: '0 auto' }"
+        :bordered="false"
+        :hoverable="true"
+        class="retryCard"
+        @click="retry" >
+        <a-icon :style="{ fontSize: '28px' }" type="global"/>
+        <p class="noSelect" style="margin-top: 20px">网络好像开小差了，点击重新加载...</p>
+      </a-card>
+      <div v-show="loadState === 'success'">
+        <slot></slot>
+      </div>
+    </a-card>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'XCard',
+  props: {
+    loadState: {
+      type: String,
+      default: 'success'
+    },
+    retry: {
+      type: Function,
+      default: () => {
+        console.error('未实现重新加载')
+      }
+    }
+  },
+  data () {
+    return {
+
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.retryCard {
+  text-align: center;
+}
+.noSelect {
+  -webkit-touch-callout: none; /* iOS Safari */
+  -webkit-user-select: none; /* Chrome/Safari/Opera */
+  -khtml-user-select: none; /* Konqueror */
+  -moz-user-select: none; /* Firefox */
+  -ms-user-select: none; /* Internet Explorer/Edge */
+  user-select: none; /* Non-prefixed version, currently
+  not supported by any browser */
+}
+</style>

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

@@ -1,180 +1,180 @@
-<template>
-  <div v-show="visible && realJsonData.length > 0" class="table-page-search-wrapper">
-    <a-form-model
-      v-if="loaded"
-      ref="form"
-      :model="form"
-      :rules="rules"
-      layout="inline">
-      <a-row :gutter="48">
-        <x-form-item
-          v-for="(item, index) in realJsonData.slice(0,6)"
-          :key="index"
-          :attr="item"
-          :form="form"
-          :service-name="serviceName"
-          :get-data-params="getDataParams"
-        />
-        <div v-show="advanced">
-          <x-form-item
-            v-for="(item, index) in realJsonData.slice(6)"
-            :key="'advanced'+index"
-            :attr="item"
-            :form="form"
-            :service-name="serviceName"
-            :get-data-params="getDataParams"
-          />
-        </div>
-        <a-col>
-          <span
-            :style="advanced && { float: 'right', overflow: 'hidden' } || {} "
-            class="table-page-search-submitButtons">
-            <a-button htmlType="submit" style="margin-left: 8px" type="primary" @click="onSubmit">
-              <a-icon :style="iconStyle" type="search"/>查询
-            </a-button>
-            <a-button style="margin-left: 8px" @click="resetForm">
-              <a-icon :style="iconStyle" type="redo" />重置
-            </a-button>
-            <slot></slot>
-            <a v-if="realJsonData.length > 6" style="margin-left: 8px" @click="toggleAdvanced">
-              <span v-show="!advanced">更多条件<a-icon type="down"/></span>
-              <span v-show="advanced">收起更多<a-icon type="up"/></span>
-            </a>
-          </span>
-        </a-col>
-      </a-row>
-    </a-form-model>
-    <div class="next-divider-dashed" role="separator"></div>
-  </div>
-</template>
-<script>
-import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
-
-export default {
-  name: 'XForm',
-  components: {
-    XFormItem
-  },
-  props: {
-    // 调用logic获取数据源的追加参数
-    getDataParams: {
-      type: Object,
-      default: undefined
-    }
-  },
-  data () {
-    return {
-      // 内容加载是否完成
-      loaded: false,
-      // 服务名称
-      serviceName: 'af-system',
-      // 是否展开条件
-      advanced: false,
-      // 表单Model
-      form: undefined,
-      // 校验
-      rules: {},
-      // 图标样式
-      iconStyle: {
-        position: 'relative',
-        top: '1px'
-      },
-      // 表单项集合
-      formItems: [],
-      // 是否显示
-      visible: true
-    }
-  },
-  computed: {
-    // 过滤掉仅用于新增/修改场景的表单项
-    realJsonData: function () {
-      return this.formItems.filter(item => !item.isOnlyAddOrEdit)
-    },
-  },
-  methods: {
-    init (params) {
-      const {
-        formItems, serviceName = 'af-system'
-      } = params
-      this.loaded = false
-      this.formItems = JSON.parse(JSON.stringify(formItems))
-      this.serviceName = serviceName
-      const formData = {}
-      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] = []
-          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
-      this.loaded = true
-    },
-    toggleAdvanced () {
-      this.advanced = !this.advanced
-    },
-    toggleVisible () {
-      this.visible = !this.visible
-    },
-    resetForm () {
-      this.$refs.form.resetFields()
-    },
-    onSubmit () {
-      this.$refs.form.validate(valid => {
-        for (const key of Object.keys(this.form)) {
-          if (this.form[key] === null || this.form[key] === '') {
-            this.form[key] = undefined
-          }
-          if (Array.isArray(this.form[key]) && !this.form[key][0]) {
-            this.form[key] = undefined
-          }
-        }
-        const requestParameters = Object.assign({}, this.form)
-        const data = {
-          valid: valid,
-          form: requestParameters
-        }
-        this.$emit('onSubmit', data)
-      })
-    },
-    exports () {
-      this.$emit('exports', this.form)
-    }
-  }
-}
-</script>
+<template>
+  <div v-show="visible && realJsonData.length > 0" class="table-page-search-wrapper">
+    <a-form-model
+      v-if="loaded"
+      ref="form"
+      :model="form"
+      :rules="rules"
+      layout="inline">
+      <a-row :gutter="48">
+        <x-form-item
+          v-for="(item, index) in realJsonData.slice(0,6)"
+          :key="index"
+          :attr="item"
+          :form="form"
+          :service-name="serviceName"
+          :get-data-params="getDataParams"
+        />
+        <div v-show="advanced">
+          <x-form-item
+            v-for="(item, index) in realJsonData.slice(6)"
+            :key="'advanced'+index"
+            :attr="item"
+            :form="form"
+            :service-name="serviceName"
+            :get-data-params="getDataParams"
+          />
+        </div>
+        <a-col>
+          <span
+            :style="advanced && { float: 'right', overflow: 'hidden' } || {} "
+            class="table-page-search-submitButtons">
+            <a-button htmlType="submit" style="margin-left: 8px" type="primary" @click="onSubmit">
+              <a-icon :style="iconStyle" type="search"/>查询
+            </a-button>
+            <a-button style="margin-left: 8px" @click="resetForm">
+              <a-icon :style="iconStyle" type="redo" />重置
+            </a-button>
+            <slot></slot>
+            <a v-if="realJsonData.length > 6" style="margin-left: 8px" @click="toggleAdvanced">
+              <span v-show="!advanced">更多条件<a-icon type="down"/></span>
+              <span v-show="advanced">收起更多<a-icon type="up"/></span>
+            </a>
+          </span>
+        </a-col>
+      </a-row>
+    </a-form-model>
+    <div class="next-divider-dashed" role="separator"></div>
+  </div>
+</template>
+<script>
+import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
+
+export default {
+  name: 'XForm',
+  components: {
+    XFormItem
+  },
+  props: {
+    // 调用logic获取数据源的追加参数
+    getDataParams: {
+      type: Object,
+      default: undefined
+    }
+  },
+  data () {
+    return {
+      // 内容加载是否完成
+      loaded: false,
+      // 服务名称
+      serviceName: 'system',
+      // 是否展开条件
+      advanced: false,
+      // 表单Model
+      form: undefined,
+      // 校验
+      rules: {},
+      // 图标样式
+      iconStyle: {
+        position: 'relative',
+        top: '1px'
+      },
+      // 表单项集合
+      formItems: [],
+      // 是否显示
+      visible: true
+    }
+  },
+  computed: {
+    // 过滤掉仅用于新增/修改场景的表单项
+    realJsonData: function () {
+      return this.formItems.filter(item => !item.isOnlyAddOrEdit)
+    },
+  },
+  methods: {
+    init (params) {
+      const {
+        formItems, serviceName = 'system'
+      } = params
+      this.loaded = false
+      this.formItems = JSON.parse(JSON.stringify(formItems))
+      this.serviceName = serviceName
+      const formData = {}
+      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] = []
+          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
+      this.loaded = true
+    },
+    toggleAdvanced () {
+      this.advanced = !this.advanced
+    },
+    toggleVisible () {
+      this.visible = !this.visible
+    },
+    resetForm () {
+      this.$refs.form.resetFields()
+    },
+    onSubmit () {
+      this.$refs.form.validate(valid => {
+        for (const key of Object.keys(this.form)) {
+          if (this.form[key] === null || this.form[key] === '') {
+            this.form[key] = undefined
+          }
+          if (Array.isArray(this.form[key]) && !this.form[key][0]) {
+            this.form[key] = undefined
+          }
+        }
+        const requestParameters = Object.assign({}, this.form)
+        const data = {
+          valid: valid,
+          form: requestParameters
+        }
+        this.$emit('onSubmit', data)
+      })
+    },
+    exports () {
+      this.$emit('exports', this.form)
+    }
+  }
+}
+</script>