vue2-client 1.14.54 → 1.14.56

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

@@ -1,238 +1,238 @@
-<template>
-  <a-drawer
-    :visible="visible"
-    :width="isMobile ? screenWidth : screenWidth * 0.85"
-    placement="right"
-    :title="mainTitle"
-    @close="onClose"
-  >
-    <a-spin :spinning="loadDetails">
-      <a-row type="flex">
-        <a-col :span="layoutStyle.leftCol">
-          <!-- 扩展区域 -->
-          <slot name="leftContent" :details="details"/>
-        </a-col>
-        <a-col :span="layoutStyle.rightCol">
-          <a-page-header :title="title">
-            <!-- 详情区域 -->
-            <div class="row">
-              <div class="content">
-                <a-descriptions :column="desColumn">
-                  <slot name="descriptionsContent" :details="details"/>
-                </a-descriptions>
-              </div>
-              <!-- 状态区域 -->
-              <div class="extra">
-                <slot name="statusContent" :details="details"/>
-                <!-- example is: -->
-                <!-- <a-row class="status-list">-->
-                <!--   <a-col :sm="24" :xs="12">-->
-                <!--   </a-col>-->
-                <!-- </a-row>-->
-                <!-- or many is: -->
-                <!-- <a-row class="status-list">-->
-                <!--   <a-col :sm="24" :xs="12">-->
-                <!--   </a-col>-->
-                <!-- </a-row>-->
-                <!-- <p></p>-->
-                <!-- <a-row class="status-list">-->
-                <!--   <a-col :sm="24" :xs="12">-->
-                <!--   </a-col>-->
-                <!-- </a-row>-->
-              </div>
-            </div>
-            <!-- 操作区域 -->
-            <template #extra>
-              <a-button-group style="margin-right: 4px;" v-show="buttonState.refresh">
-                <a-button :loading="loadDetails" type="dashed" @click="initView('1')">刷新</a-button>
-              </a-button-group>
-              <a-button-group style="margin-right: 4px;">
-                <slot name="actionContent" :details="details"/>
-              </a-button-group>
-            </template>
-            <!-- 扩展区域 -->
-            <slot name="extraContent" :details="details"/>
-            <!-- 页签区域 -->
-            <a-tabs default-active-key="1">
-              <slot name="actionTabs" :details="details"/>
-            </a-tabs>
-          </a-page-header>
-        </a-col>
-      </a-row>
-    </a-spin>
-  </a-drawer>
-</template>
-
-<script>
-import { formatDate } from '@vue2-client/utils/util'
-import { mapState } from 'vuex'
-import XBadge from '@vue2-client/base-client/components/common/XBadge/XBadge'
-import { post } from 'vue2-client/src/services/api/restTools'
-
-export default {
-  name: 'XDetailsView',
-  components: {
-    XBadge
-  },
-  data () {
-    return {
-      // 页面宽度
-      screenWidth: document.documentElement.clientWidth,
-      // 数据详情
-      details: {},
-      // 详情加载
-      loadDetails: false
-    }
-  },
-  mounted () {
-    this.initView()
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-    ...mapState('setting', ['isMobile'])
-  },
-  props: {
-    id: {
-      type: [String, Number],
-      required: false
-    },
-    mainTitle: {
-      type: String,
-      required: true
-    },
-    title: {
-      type: String,
-      required: true
-    },
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    api: {
-      type: String,
-      required: false
-    },
-    desColumn: {
-      type: Number,
-      required: false,
-      default: 3
-    },
-    // 按钮状态
-    buttonState: {
-      type: Object,
-      default: () => {
-        return {
-          // 刷新按钮显示状态
-          refresh: true
-        }
-      }
-    },
-    // 详情内容样式
-    layoutStyle: {
-      type: Object,
-      default: () => {
-        return {
-          leftCol: 0, // 侧边占比
-          rightCol: 24, // 内容区域占比
-        }
-      }
-    }
-  },
-  methods: {
-    // 初始化组件
-    initView () {
-      this.getDetails()
-    },
-    // 关闭抽屉时回调
-    onClose () {
-      this.$emit('update:visible', false)
-    },
-    // 获取详情信息
-    getDetails () {
-      if (this.api && this.id) {
-        this.loadDetails = true
-        post(this.api, {
-          id: this.id
-        }).then(res => {
-          this.$emit('searchData', res)
-          this.details = res
-        }, err => {
-          console.error(err)
-        }).finally(() => {
-          this.loadDetails = false
-        })
-      }
-    },
-    // 日期格式化
-    format (date, format) {
-      return formatDate(date, format)
-    }
-  },
-  watch: {
-    'visible' (val) {
-      if (val) {
-        this.initView()
-      }
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.detail-layout {
-  margin-left: 44px;
-}
-.text {
-  color: rgba(0, 0, 0, .45);
-}
-
-.heading {
-  color: rgba(0, 0, 0, .85);
-  font-size: 20px;
-}
-
-.no-data {
-  color: rgba(0, 0, 0, .25);
-  text-align: center;
-  line-height: 64px;
-  font-size: 16px;
-
-  i {
-    font-size: 24px;
-    margin-right: 16px;
-    position: relative;
-    top: 3px;
-  }
-}
-
-.mobile {
-  .detail-layout {
-    margin-left: unset;
-  }
-  .text {
-
-  }
-  .status-list {
-    text-align: left;
-  }
-}
-
-.row {
-  display: flex;
-
-  .content {
-    -webkit-box-flex: 1;
-    flex: auto;
-    -ms-flex: auto;
-  }
-
-  .extra {
-    flex: 0 1 auto;
-    -webkit-box-flex: 0;
-    -ms-flex: 0 1 auto;
-    min-width: 242px;
-    margin-left: 88px;
-    text-align: right;
-  }
-}
-</style>
+<template>
+  <a-drawer
+    :visible="visible"
+    :width="isMobile ? screenWidth : screenWidth * 0.85"
+    placement="right"
+    :title="mainTitle"
+    @close="onClose"
+  >
+    <a-spin :spinning="loadDetails">
+      <a-row type="flex">
+        <a-col :span="layoutStyle.leftCol">
+          <!-- 扩展区域 -->
+          <slot name="leftContent" :details="details"/>
+        </a-col>
+        <a-col :span="layoutStyle.rightCol">
+          <a-page-header :title="title">
+            <!-- 详情区域 -->
+            <div class="row">
+              <div class="content">
+                <a-descriptions :column="desColumn">
+                  <slot name="descriptionsContent" :details="details"/>
+                </a-descriptions>
+              </div>
+              <!-- 状态区域 -->
+              <div class="extra">
+                <slot name="statusContent" :details="details"/>
+                <!-- example is: -->
+                <!-- <a-row class="status-list">-->
+                <!--   <a-col :sm="24" :xs="12">-->
+                <!--   </a-col>-->
+                <!-- </a-row>-->
+                <!-- or many is: -->
+                <!-- <a-row class="status-list">-->
+                <!--   <a-col :sm="24" :xs="12">-->
+                <!--   </a-col>-->
+                <!-- </a-row>-->
+                <!-- <p></p>-->
+                <!-- <a-row class="status-list">-->
+                <!--   <a-col :sm="24" :xs="12">-->
+                <!--   </a-col>-->
+                <!-- </a-row>-->
+              </div>
+            </div>
+            <!-- 操作区域 -->
+            <template #extra>
+              <a-button-group style="margin-right: 4px;" v-show="buttonState.refresh">
+                <a-button :loading="loadDetails" type="dashed" @click="initView('1')">刷新</a-button>
+              </a-button-group>
+              <a-button-group style="margin-right: 4px;">
+                <slot name="actionContent" :details="details"/>
+              </a-button-group>
+            </template>
+            <!-- 扩展区域 -->
+            <slot name="extraContent" :details="details"/>
+            <!-- 页签区域 -->
+            <a-tabs default-active-key="1">
+              <slot name="actionTabs" :details="details"/>
+            </a-tabs>
+          </a-page-header>
+        </a-col>
+      </a-row>
+    </a-spin>
+  </a-drawer>
+</template>
+
+<script>
+import { formatDate } from '@vue2-client/utils/util'
+import { mapState } from 'vuex'
+import XBadge from '@vue2-client/base-client/components/common/XBadge/XBadge'
+import { post } from 'vue2-client/src/services/api/restTools'
+
+export default {
+  name: 'XDetailsView',
+  components: {
+    XBadge
+  },
+  data () {
+    return {
+      // 页面宽度
+      screenWidth: document.documentElement.clientWidth,
+      // 数据详情
+      details: {},
+      // 详情加载
+      loadDetails: false
+    }
+  },
+  mounted () {
+    this.initView()
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', ['isMobile'])
+  },
+  props: {
+    id: {
+      type: [String, Number],
+      required: false
+    },
+    mainTitle: {
+      type: String,
+      required: true
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    api: {
+      type: String,
+      required: false
+    },
+    desColumn: {
+      type: Number,
+      required: false,
+      default: 3
+    },
+    // 按钮状态
+    buttonState: {
+      type: Object,
+      default: () => {
+        return {
+          // 刷新按钮显示状态
+          refresh: true
+        }
+      }
+    },
+    // 详情内容样式
+    layoutStyle: {
+      type: Object,
+      default: () => {
+        return {
+          leftCol: 0, // 侧边占比
+          rightCol: 24, // 内容区域占比
+        }
+      }
+    }
+  },
+  methods: {
+    // 初始化组件
+    initView () {
+      this.getDetails()
+    },
+    // 关闭抽屉时回调
+    onClose () {
+      this.$emit('update:visible', false)
+    },
+    // 获取详情信息
+    getDetails () {
+      if (this.api && this.id) {
+        this.loadDetails = true
+        post(this.api, {
+          id: this.id
+        }).then(res => {
+          this.$emit('searchData', res)
+          this.details = res
+        }, err => {
+          console.error(err)
+        }).finally(() => {
+          this.loadDetails = false
+        })
+      }
+    },
+    // 日期格式化
+    format (date, format) {
+      return formatDate(date, format)
+    }
+  },
+  watch: {
+    'visible' (val) {
+      if (val) {
+        this.initView()
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.detail-layout {
+  margin-left: 44px;
+}
+.text {
+  color: rgba(0, 0, 0, .45);
+}
+
+.heading {
+  color: rgba(0, 0, 0, .85);
+  font-size: 20px;
+}
+
+.no-data {
+  color: rgba(0, 0, 0, .25);
+  text-align: center;
+  line-height: 64px;
+  font-size: 16px;
+
+  i {
+    font-size: 24px;
+    margin-right: 16px;
+    position: relative;
+    top: 3px;
+  }
+}
+
+.mobile {
+  .detail-layout {
+    margin-left: unset;
+  }
+  .text {
+
+  }
+  .status-list {
+    text-align: left;
+  }
+}
+
+.row {
+  display: flex;
+
+  .content {
+    -webkit-box-flex: 1;
+    flex: auto;
+    -ms-flex: auto;
+  }
+
+  .extra {
+    flex: 0 1 auto;
+    -webkit-box-flex: 0;
+    -ms-flex: 0 1 auto;
+    min-width: 242px;
+    margin-left: 88px;
+    text-align: right;
+  }
+}
+</style>

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

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

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

@@ -6,6 +6,7 @@
     :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
@@ -82,6 +83,7 @@
     :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       v-if="!attr.showMode || mode === '查询' || attr.showMode === 'select' "
       :ref="attr.model"
@@ -190,6 +192,7 @@
       </a-select>
     </a-form-model-item>
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       v-else-if="attr.showMode === 'radioGroup'"
       :ref="attr.model"
@@ -202,6 +205,7 @@
       </a-radio-group>
     </a-form-model-item>
     <a-form-model-item
+      v-bind="bindOther"
       v-else-if="attr.showMode === 'clickChange' && option.length > 0"
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
@@ -215,6 +219,7 @@
     :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       v-if="!attr.showMode || mode === '查询' || attr.showMode === 'select' "
       :ref="attr.model"
@@ -287,6 +292,7 @@
       </a-select>
     </a-form-model-item>
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       v-else
       :ref="attr.model"
@@ -305,6 +311,7 @@
     :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       v-if="!attr.showMode || attr.type === 'radio' "
       :ref="attr.model"
@@ -336,6 +343,7 @@
       </a-radio-group>
     </a-form-model-item>
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       v-else-if="attr.showMode === 'radioGroup'"
       :ref="attr.model"
@@ -348,6 +356,7 @@
       </a-radio-group>
     </a-form-model-item>
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       v-else-if="attr.showMode === 'clickChange' && option.length > 0"
       :ref="attr.model"
@@ -362,6 +371,7 @@
     :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
@@ -383,6 +393,7 @@
     :flex="attr.flex">
     <!--    :style="layout === 'inline'?{width:'calc(100% - 60px)'}:{}"-->
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
@@ -401,6 +412,7 @@
     :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
@@ -420,6 +432,7 @@
     :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
@@ -440,6 +453,7 @@
     :occupyCol="attr.occupyCol"
     :flex="attr.flex">
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
@@ -463,6 +477,7 @@
     :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
@@ -490,6 +505,7 @@
     :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
@@ -551,6 +567,7 @@
     :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
@@ -574,6 +591,7 @@
     :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
@@ -596,6 +614,7 @@
     :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
@@ -636,6 +655,7 @@
     :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
+      v-bind="bindOther"
       :rules="rules"
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
@@ -714,7 +734,8 @@ export default {
       // 行选择器浮层是否显示
       rowChoosePopoverVisible: false,
       // 行选择器CRUD固定查询值
-      rowChooseFixedQueryValue: undefined
+      rowChooseFixedQueryValue: undefined,
+      bindOther: {}
     }
   },
   props: {