vue2-client 1.9.75 → 1.9.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.9.75",
+  "version": "1.9.77",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

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

@@ -311,11 +311,11 @@ export default {
 <style lang="less" scoped>
 .hide-page-numbers /deep/ .ant-pagination-item,
 .hide-page-numbers /deep/ .ant-pagination-jump-next {
-    display: none; /* 隐藏数字页码和多页跳转 */
+    display: none !important; /* 隐藏数字页码和多页跳转 */
 }
 .hide-page-numbers /deep/ .ant-pagination-prev,
 .hide-page-numbers /deep/ .ant-pagination-next {
-    display: inline-block; /* 保留左右跳转按钮 */
+    display: inline-block !important; /* 保留左右跳转按钮 */
 }
 
 .XCard {

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

@@ -62,13 +62,13 @@
                 <a-divider type="vertical"/>
               </template>
               <a-button
-                v-show="!simpleMode"
+                v-if="!simpleMode"
                 htmlType="submit"
                 type="primary"
                 @click="onSubmit">
                 <a-icon :style="iconStyle" type="search"/>查询
               </a-button>
-              <a-button v-show="!simpleMode" style="margin-left: 8px" @click="resetForm">重置</a-button>
+              <a-button v-if="!simpleMode" style="margin-left: 8px" @click="resetForm">重置</a-button>
               <slot></slot>
             </span>
           </a-col>

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

@@ -85,13 +85,13 @@ export default {
      * @param businessType 新增还是修改
      */
     init ({
-            groups,
-            modifyModelData = {},
-            serviceName = process.env.VUE_APP_SYSTEM_NAME,
-            env = 'prod',
-            showLeftTab = false,
-            businessType = '新增'
-          }) {
+           groups,
+           modifyModelData = {},
+           serviceName = process.env.VUE_APP_SYSTEM_NAME,
+           env = 'prod',
+           showLeftTab = false,
+           businessType = '新增'
+         }) {
       Object.assign(this, { groups, modifyModelData, serviceName, env, showLeftTab, businessType })
       this.initView()
       this.$nextTick(() => {
@@ -170,8 +170,15 @@ export default {
       }
     },
     // xfromitem 一路传递上来的事件
-    emitFunc (func, data) {
-      this.$emit('x-form-item-emit-func', func, data)
+    emitFunc (func, data, index) {
+      let value = null
+      try {
+        if (data && data.model && this.$refs[`nativeForm-${index}`]) {
+          value = this.$refs[`nativeForm-${index}`]?.form[data.model]
+        }
+        this.$emit(func, data, value)
+      } catch (error) { console.error(error) }
+      this.$emit('x-form-item-emit-func', func, data, value)
     },
     // 提交表单
     asyncSubmit () {