vue2-client 1.19.20 → 1.19.21

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 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 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/XDataDrawer/XDataDrawer.vue

@@ -1,180 +1,180 @@
-<template>
-  <a-drawer
-    :visible="visible"
-    :width="isMobile ? screenWidth : screenWidth * 0.85"
-    placement="right"
-    :title="title"
-    @close="onClose"
-  >
-    <a-spin :spinning="loading">
-      <a-page-header :title="getPageHeaderTitle">
-        <div class="row">
-          <div class="content">
-            <slot name="contentDescriptions" :datas="details"></slot>
-          </div>
-          <div class="extra">
-            <a-row class="status-list" v-for="(item,index) in extraStatusList" :key="'extraStatus' + index">
-              <a-col :sm="24" :xs="12">
-                <div class="text">{{ item.text }}</div>
-                <div class="heading">
-                  <x-badge :is-external-text="true" :value="item.key" :badge-key="item.keyMap ? item.keyMap : 'none'"/>
-                </div>
-              </a-col>
-            </a-row>
-          </div>
-        </div>
-        <!-- actions -->
-        <template #extra>
-          <a-button-group style="margin-right: 4px;">
-            <a-button :loading="loading" type="dashed" @click="initView('1')">刷新</a-button>
-          </a-button-group>
-          <a-button-group style="margin-right: 4px;">
-            <slot name="extraActions" :datas="details"></slot>
-          </a-button-group>
-        </template>
-        <template #footer>
-          <slot name="footerContent" :datas="details"></slot>
-        </template>
-      </a-page-header>
-    </a-spin>
-  </a-drawer>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import XBadge from '@vue2-client/base-client/components/common/XBadge/XBadge'
-
-export default {
-  name: 'InstructDetailsView',
-  components: {
-    XBadge
-  },
-  data () {
-    return {
-      // 页面宽度
-      screenWidth: document.documentElement.clientWidth,
-      // Tab页签
-      tabActiveKey: '1',
-      // 数据详情
-      details: {},
-      // 加载状态
-      loading: true
-    }
-  },
-  mounted () {
-    this.initView('1')
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-    ...mapState('setting', ['isMobile'])
-  },
-  props: {
-    title: {
-      type: String,
-      required: true
-    },
-    extraStatusList: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    visible: {
-      type: Boolean,
-      default: false
-    }
-  },
-  methods: {
-    // 初始化组件
-    initView (tabActiveKey) {
-      this.tabActiveKey = tabActiveKey || '1'
-      this.getDatas()
-    },
-    // 获取详情信息
-    getDatas () {
-      this.loading = true
-      this.$emit('load').then(res => {
-        this.details = res
-      }, err => {
-        console.error(err)
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    // 获取页头标题
-    getPageHeaderTitle () {
-      this.$emit('getPageHeaderTitle', this.details)
-    },
-    // 关闭抽屉时回调
-    onClose () {
-      this.$emit('update:visible', false)
-    }
-  },
-  watch: {
-    'visible' (val) {
-      if (val) {
-        this.initView('1')
-      }
-    }
-  }
-}
-</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="title"
+    @close="onClose"
+  >
+    <a-spin :spinning="loading">
+      <a-page-header :title="getPageHeaderTitle">
+        <div class="row">
+          <div class="content">
+            <slot name="contentDescriptions" :datas="details"></slot>
+          </div>
+          <div class="extra">
+            <a-row class="status-list" v-for="(item,index) in extraStatusList" :key="'extraStatus' + index">
+              <a-col :sm="24" :xs="12">
+                <div class="text">{{ item.text }}</div>
+                <div class="heading">
+                  <x-badge :is-external-text="true" :value="item.key" :badge-key="item.keyMap ? item.keyMap : 'none'"/>
+                </div>
+              </a-col>
+            </a-row>
+          </div>
+        </div>
+        <!-- actions -->
+        <template #extra>
+          <a-button-group style="margin-right: 4px;">
+            <a-button :loading="loading" type="dashed" @click="initView('1')">刷新</a-button>
+          </a-button-group>
+          <a-button-group style="margin-right: 4px;">
+            <slot name="extraActions" :datas="details"></slot>
+          </a-button-group>
+        </template>
+        <template #footer>
+          <slot name="footerContent" :datas="details"></slot>
+        </template>
+      </a-page-header>
+    </a-spin>
+  </a-drawer>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import XBadge from '@vue2-client/base-client/components/common/XBadge/XBadge'
+
+export default {
+  name: 'InstructDetailsView',
+  components: {
+    XBadge
+  },
+  data () {
+    return {
+      // 页面宽度
+      screenWidth: document.documentElement.clientWidth,
+      // Tab页签
+      tabActiveKey: '1',
+      // 数据详情
+      details: {},
+      // 加载状态
+      loading: true
+    }
+  },
+  mounted () {
+    this.initView('1')
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', ['isMobile'])
+  },
+  props: {
+    title: {
+      type: String,
+      required: true
+    },
+    extraStatusList: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  methods: {
+    // 初始化组件
+    initView (tabActiveKey) {
+      this.tabActiveKey = tabActiveKey || '1'
+      this.getDatas()
+    },
+    // 获取详情信息
+    getDatas () {
+      this.loading = true
+      this.$emit('load').then(res => {
+        this.details = res
+      }, err => {
+        console.error(err)
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    // 获取页头标题
+    getPageHeaderTitle () {
+      this.$emit('getPageHeaderTitle', this.details)
+    },
+    // 关闭抽屉时回调
+    onClose () {
+      this.$emit('update:visible', false)
+    }
+  },
+  watch: {
+    'visible' (val) {
+      if (val) {
+        this.initView('1')
+      }
+    }
+  }
+}
+</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/XDataDrawer/index.js

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

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

@@ -1,41 +1,41 @@
-# XForm
-
-通用数据抽屉控件，快速制作数据详情抽屉
-
-
-## 何时使用
-
-当需要一个通用数据抽屉时
-
-
-引用方式：
-
-```javascript
-import XDataDrawer from '@vue2-client/base-client/components/XDataDrawer/XDataDrawer'
-
-export default {
-    components: {
-      XDataDrawer
-    }
-}
-```
-
-
-
-## 代码演示
-
-```html
-<x-data-drawer
-  :isExports="true"
-  @onSubmit="onSubmit">
-</x-data-drawer>
-```
-
-## API
-
-| 参数        | 说明                       | 类型      | 默认值  |
-|-----------|--------------------------|---------|------|
-| jsonData  | JSON配置，根据[工具>查询配置生成]功能生成 | Object  | {}   |
-| isExports | 是否显示导出按钮                 | Boolean | true |
-| getDataParams | 调用logic获取数据源的追加参数 | Object | - |
-| @onSubmit | 表单的提交事件                  | event   | -    |
+# XForm
+
+通用数据抽屉控件，快速制作数据详情抽屉
+
+
+## 何时使用
+
+当需要一个通用数据抽屉时
+
+
+引用方式：
+
+```javascript
+import XDataDrawer from '@vue2-client/base-client/components/XDataDrawer/XDataDrawer'
+
+export default {
+    components: {
+      XDataDrawer
+    }
+}
+```
+
+
+
+## 代码演示
+
+```html
+<x-data-drawer
+  :isExports="true"
+  @onSubmit="onSubmit">
+</x-data-drawer>
+```
+
+## API
+
+| 参数        | 说明                       | 类型      | 默认值  |
+|-----------|--------------------------|---------|------|
+| jsonData  | JSON配置，根据[工具>查询配置生成]功能生成 | Object  | {}   |
+| isExports | 是否显示导出按钮                 | Boolean | true |
+| getDataParams | 调用logic获取数据源的追加参数 | Object | - |
+| @onSubmit | 表单的提交事件                  | event   | -    |

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

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

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

@@ -983,9 +983,20 @@ export default {
     // 表单组上下文（通过注入传递）
     formGroupContext: {
       default: null
+    },
+    // 外部数据（通过 XAddNativeForm 的 provide 传递）
+    _getExternalData: {
+      default: () => ({})
     }
   },
   methods: {
+    /**
+     * 获取外部数据
+     * @returns {Object} 外部扩展数据对象 比如收费表单中俄的 用户信息要参与表单判断
+     */
+    getExternalData() {
+      return this._getExternalData() || {}
+    },
     // 处理 queryParams 结果并更新 rowChooseFixedQueryValue
     handleQueryParamsResult(obj) {
       let configName = ''