vue2-client 1.8.254 → 1.8.256

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.254",
+  "version": "1.8.256",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
@@ -17,7 +17,6 @@
     "@antv/data-set": "^0.11.8",
     "@antv/g2plot": "^2.4.31",
     "@vue/babel-preset-jsx": "^1.4.0",
-    "amis": "^3.4.3",
     "animate.css": "^4.1.1",
     "ant-design-vue": "^1.7.8",
     "axios": "^0.27.2",
@@ -41,7 +40,6 @@
     "lodash.debounce": "^4",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
-    "qs": "^6.11.2",
     "regenerator-runtime": "^0.14.0",
     "videojs-contrib-hls": "^5.15.0",
     "viser-vue": "^2.4.8",
@@ -69,7 +67,6 @@
     "babel-jest": "^26.6.3",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "compression-webpack-plugin": "^10.0.0",
-    "copy-webpack-plugin": "^11.0.0",
     "css-minimizer-webpack-plugin": "^5.0.1",
     "deepmerge": "^4.3.1",
     "eslint": "^8.51.0",

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

@@ -86,8 +86,8 @@ import { formatDate } from '@vue2-client/utils/util'
 import { mapState } from 'vuex'
 import { addOrModify, getConfigByName, runLogic } from '@vue2-client/services/api/common'
 import lowcodeComponentMixin from '@vue2-client/utils/lowcode/lowcodeComponentMixin'
-import dayjs from 'dayjs'
 import { _IDre15, _IDRe18, REG_EMAIL, REG_LANDLINE, REG_PHONE } from '@vue2-client/utils/reg'
+import moment from 'moment/moment'
 
 export default {
   name: 'XAddNativeForm',
@@ -289,13 +289,13 @@ export default {
       let start
       switch (defaultValue) {
         case 'curYear':
-          start = dayjs().startOf('year').format(format)
+          start = moment().startOf('year').format(format)
           break
         case 'curMonth':
-          start = dayjs().startOf('month').format(format)
+          start = moment().startOf('month').format(format)
           break
         case 'curDay':
-          start = dayjs().startOf('day').format(format)
+          start = moment().startOf('day').format(format)
           break
         default:
           return defaultValue

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

@@ -71,8 +71,8 @@
 </template>
 <script>
 import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
-import dayjs from 'dayjs'
 import { mapState } from 'vuex'
+import moment from 'moment'
 
 export default {
   name: 'XForm',
@@ -163,16 +163,16 @@ export default {
 
       switch (defaultValue) {
         case 'curYear':
-          start = dayjs().startOf('year').format(format)
-          end = dayjs().endOf('year').format(format)
+          start = moment().startOf('year').format(format)
+          end = moment().endOf('year').format(format)
           break
         case 'curMonth':
-          start = dayjs().startOf('month').format(format)
-          end = dayjs().endOf('month').format(format)
+          start = moment().startOf('month').format(format)
+          end = moment().endOf('month').format(format)
           break
         case 'curDay':
-          start = dayjs().startOf('day').format(format)
-          end = dayjs().endOf('day').format(format)
+          start = moment().startOf('day').format(format)
+          end = moment().endOf('day').format(format)
           break
         default:
           return defaultValue

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

@@ -1,7 +1,7 @@
 <template>
   <!-- 输入框 -->
   <x-form-col
-    v-if="attr.type === 'input'"
+    v-if="attr.type === 'input' && show"
     :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
@@ -49,7 +49,7 @@
   </x-form-col>
   <!-- 下拉框 -->
   <x-form-col
-    v-else-if="attr.type === 'select' || (attr.type === 'rate' && mode==='查询')"
+    v-else-if="(attr.type === 'select' || (attr.type === 'rate' && mode==='查询')) && show"
     :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
@@ -143,7 +143,7 @@
   </x-form-col>
   <!-- 多选框 -->
   <x-form-col
-    v-else-if="attr.type === 'checkbox'"
+    v-else-if="attr.type === 'checkbox' && show"
     :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
@@ -210,7 +210,7 @@
   </x-form-col>
   <!-- 单选框 -->
   <x-form-col
-    v-else-if="attr.type === 'radio'"
+    v-else-if="attr.type === 'radio' && show"
     :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
@@ -241,7 +241,7 @@
   </x-form-col>
   <!-- 日期范围选择器 -->
   <x-form-col
-    v-else-if="attr.type === 'rangePicker'"
+    v-else-if="attr.type === 'rangePicker' && show"
     :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.prop ? attr.prop : attr.model">
       <a-date-picker
@@ -263,7 +263,7 @@
   </x-form-col>
   <!-- 月份选择器 -->
   <x-form-col
-    v-else-if="attr.type === 'monthPicker'"
+    v-else-if="attr.type === 'monthPicker' && show"
     :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.prop ? attr.prop : attr.model">
       <a-month-picker
@@ -277,7 +277,7 @@
   </x-form-col>
   <!-- 年份选择器 -->
   <x-form-col
-    v-else-if="attr.type === 'yearPicker'"
+    v-else-if="attr.type === 'yearPicker' && show"
     :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.prop ? attr.prop : attr.model">
       <a-date-picker
@@ -295,7 +295,7 @@
   </x-form-col>
   <!-- 单日选择器 -->
   <x-form-col
-    v-else-if="attr.type === 'datePicker'"
+    v-else-if="attr.type === 'datePicker' && show"
     :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.prop ? attr.prop : attr.model">
       <a-range-picker
@@ -317,7 +317,7 @@
   </x-form-col>
   <!-- 文本域 -->
   <a-col
-    v-else-if="attr.type === 'textarea'"
+    v-else-if="attr.type === 'textarea' && show"
     :xs="24"
     :sm="24"
     :md="24"
@@ -340,7 +340,7 @@
   </a-col>
   <!-- 文件上传 -->
   <a-col
-    v-else-if="attr.type === 'file' || attr.type === 'image'"
+    v-else-if="(attr.type === 'file' || attr.type === 'image') && show"
     :style="layout === 'inline'?{width:'calc(100% - 60px)'}:{}"
     :xs="24"
     :sm="24"
@@ -365,7 +365,7 @@
   </a-col>
   <!-- 省市区选择框 -->
   <x-form-col
-    v-else-if="attr.type === 'citySelect'"
+    v-else-if="attr.type === 'citySelect' && show"
     :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.prop ? attr.prop : attr.model">
       <citySelect
@@ -378,7 +378,7 @@
   </x-form-col>
   <!-- 地点搜索框 -->
   <x-form-col
-    v-else-if="attr.type === 'addressSearch'"
+    v-else-if="attr.type === 'addressSearch' && show"
     :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
@@ -402,7 +402,7 @@
   </x-form-col>
   <!-- 人员选择框 -->
   <x-form-col
-    v-else-if="attr.type === 'personSetting'"
+    v-else-if="attr.type === 'personSetting' && show"
     :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.prop ? attr.prop : attr.model">
       <PersonSetting v-model="form[attr.model]"></PersonSetting>
@@ -410,7 +410,7 @@
   </x-form-col>
   <!-- 树形选择框 -->
   <x-form-col
-    v-else-if="attr.type === 'treeSelect'"
+    v-else-if="attr.type === 'treeSelect' && show"
     :flex="attr.flex">
     <x-tree-select
       v-model="form[attr.model]"
@@ -420,7 +420,7 @@
   </x-form-col>
   <!-- 评分框 -->
   <x-form-col
-    v-else-if="attr.type === 'rate'"
+    v-else-if="attr.type === 'rate' && show"
     :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
@@ -440,6 +440,7 @@ import PersonSetting from '@vue2-client/base-client/components/common/PersonSett
 import AddressSearchCombobox from '@vue2-client/base-client/components/common/AddressSearchCombobox'
 import Upload from '@vue2-client/base-client/components/common/Upload'
 import moment from 'moment'
+import util from '.././../../../utils/util'
 import XTreeSelect from '@vue2-client/base-client/components/common/XForm/XTreeSelect'
 import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 import { searchToOption } from '@vue2-client/services/v3Api'
@@ -469,6 +470,8 @@ export default {
       searchResult: '',
       yearShowOne: false,
       optionForFunc: [],
+      // 控制当前表单项是否展示
+      show: true,
       labelAndWrapperCol: [{
         labelCol: undefined,
         wrapperCol: undefined
@@ -566,18 +569,23 @@ export default {
     setForm: {
       type: Function,
       default: (val) => {
-          console.log(val)
-        }
+        console.log(val)
+      }
     },
   },
   created () {
     this.init()
-    if (this.attr.keyName && (this.attr.keyName.toString().indexOf('async ') !== -1 || this.attr.keyName.toString().indexOf('function') !== -1)) {
+    if (this.attr.keyName && (this.attr?.keyName?.toString().indexOf('async ') !== -1 || this.attr?.keyName?.toString()?.indexOf('function') !== -1)) {
       this.debouncedUpdateOptions = debounce(this.updateOptions, 200)
     }
     if (this.attr.dataChangeFunc) {
       this.debouncedDataChangeFunc = debounce(this.dataChangeFunc, 200)
     }
+    if (this.attr.showFormItemFunc) {
+      this.debouncedShowFormItemFunc = debounce(this.showFormItemFunc, 100)
+      // 执行一次
+      debounce(this.showFormItemFunc, 100)()
+    }
   },
   computed: {
     ...mapState('account', { currUser: 'user' })
@@ -599,6 +607,10 @@ export default {
         if (this.attr.dataChangeFunc) {
           this.debouncedDataChangeFunc()
         }
+        // 如果有自定义是否展示表单项函数
+        if (this.attr.showFormItemFunc) {
+          this.debouncedShowFormItemFunc()
+        }
         // 地址搜索框赋值
         if (this.attr.type === 'addressSearch') {
           this.$refs.addressSearchCombobox.addressInput = this.form[this.attr.model]
@@ -615,7 +627,14 @@ export default {
     },
     async dataChangeFunc () {
       if (this.attr.dataChangeFunc) {
-        await executeStrFunction(this.attr.dataChangeFunc, [this.form, this.setForm, this.attr])
+        await executeStrFunction(this.attr.dataChangeFunc, [this.form, this.setForm, this.attr, util])
+      }
+    },
+    async showFormItemFunc () {
+      if (this.attr.showFormItemFunc) {
+        this.show = executeStrFunction(this.attr.showFormItemFunc, [this.form, this.setForm, this.attr, util])
+      } else {
+        this.show = true
       }
     },
     init () {

package/src/utils/util.js

@@ -1,4 +1,14 @@
 import enquireJs from 'enquire.js'
+import moment from 'moment/moment'
+
+export default {
+  _moment
+}
+
+// 导出 mount 处理时间函数
+function _moment (...args) {
+  return moment(...args)
+}
 
 const timeList = [
   {

package/vue.config.js

@@ -5,7 +5,7 @@ const { getThemeColors, modifyVars } = require('./src/utils/themeUtil')
 const { resolveCss } = require('./src/utils/theme-color-replacer-extend')
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
-const CopyPlugin = require('copy-webpack-plugin')
+// const CopyPlugin = require('copy-webpack-plugin')
 
 const productionGzipExtensions = ['js', 'css']
 const isProd = process.env.NODE_ENV === 'production'
@@ -123,9 +123,9 @@ module.exports = {
     }))
 
     config.plugins.push(
-        new CopyPlugin({
-          patterns: [{ from: 'node_modules/amis/sdk', to: 'amis/sdk' }],
-        })
+        // new CopyPlugin({
+        //   patterns: [{ from: 'node_modules/amis/sdk', to: 'amis/sdk' }],
+        // })
     )
 
     // 生产环境下将资源压缩成gzip格式