vue2-client 1.8.253 → 1.8.255

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.253",
+  "version": "1.8.255",
   "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

@@ -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'
@@ -596,7 +597,7 @@ export default {
           this.debouncedUpdateOptions()
         }
         // 如果有自定义函数变更函数
-        if (this.attr.dataChangeFunc()) {
+        if (this.attr.dataChangeFunc) {
           this.debouncedDataChangeFunc()
         }
         // 地址搜索框赋值
@@ -615,7 +616,7 @@ export default {
     },
     async dataChangeFunc () {
       if (this.attr.dataChangeFunc) {
-        await executeStrFunction(this.attr.keyName, [this.form, this.setForm])
+        await executeStrFunction(this.attr.dataChangeFunc, [this.form, this.setForm, this.attr, util])
       }
     },
     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格式