Merge pull request ncform#243 from ncform/develop

Develop

packages/ncform-theme-elementui/conf/webpack.config.js

@@ -4,7 +4,7 @@ const prdConfig = require("./webpack.config.prd");
 
 const env = process.env.NODE_ENV;
 if (env === "production") {
-  module.exports = merge(devConfig[1], prdConfig);
+  module.exports = prdConfig;
 } else {
   module.exports = devConfig;
 }

packages/ncform-theme-elementui/conf/webpack.config.prd.js

@@ -1,23 +1,37 @@
 const path = require("path");
-const webpack = require("webpack");
+const merge = require("webpack-merge");
 
 const config = require("./config");
+const devConfig = require("./webpack.config.dev");
 
-module.exports = {
+const commonConfig = {
+  mode: "production",
 
-  mode: 'production',
-
-  devtool: 'source-map',
+  devtool: "source-map",
 
   entry: {
-    ncformStdComps: path.join(config.src, 'components', 'index.js'),
+    ncformStdComps: path.join(config.src, "components", "index.js")
   },
 
   output: {
-    filename: "[name].min.js",
+    filename: "[name].min.js"
   },
 
   optimization: {
     minimize: true
   }
 };
+
+module.exports = module.exports = [
+  // 非压缩版本
+  merge(devConfig[1], commonConfig, {
+    output: {
+      filename: "[name].js"
+    },
+    optimization: {
+      minimize: false
+    }
+  }),
+  // 压缩版本
+  merge(devConfig[1], commonConfig)
+];

packages/ncform/conf/webpack.config.js

@@ -1,10 +1,9 @@
-const merge = require('webpack-merge');
 const devConfig = require("./webpack.config.dev");
 const prdConfig = require("./webpack.config.prd");
 
 const env = process.env.NODE_ENV;
 if (env === "production") {
-  module.exports = merge(devConfig, prdConfig);
+  module.exports = prdConfig;
 } else {
   module.exports = devConfig;
 }

packages/ncform/conf/webpack.config.prd.js

@@ -1,19 +1,30 @@
-const path = require("path");
-const webpack = require("webpack");
+const merge = require("webpack-merge");
+const devConfig = require("./webpack.config.dev");
 
-const config = require("./config");
-
-module.exports = {
-
-  mode: 'production',
+const commonConfig = {
+  mode: "production",
 
   output: {
-    filename: "[name].min.js",
+    filename: "[name].min.js"
   },
 
-  devtool: 'source-map',
+  devtool: "source-map",
 
   optimization: {
     minimize: true
   }
 };
+
+module.exports = [
+  // 非压缩版本
+  merge(devConfig, commonConfig, {
+    output: {
+      filename: "[name].js"
+    },
+    optimization: {
+      minimize: false
+    }
+  }),
+  // 压缩版本
+  merge(devConfig, commonConfig)
+];

packages/ncform/src/components/vue-ncform/form-item.vue

@@ -263,8 +263,9 @@ export default {
       },
       immediate: true
     },
-    schema: {
-      handler: function(newVal) {
+    'schema.value': {
+      handler: function() {
+        const newVal = this.schema
         let changed = false;
         if (ncformUtils.isNormalArrSchema(newVal)) {
           this.$data.itemValue = this.$data.itemValue || [];
@@ -285,6 +286,14 @@ export default {
               formValue: this.formData,
               itemOldValue: this.$data.itemValue
             })
+          } else if (ncformUtils.isNormalArrSchema(newVal)) {
+            const formVM = window.__$ncform.__ncFormsGlobalList[this.formName];
+            formVM.$emit('change', {
+              paths: this.paths,
+              itemValue: ncformUtils.getModelFromSchema(this.schema),
+              formValue: this.formData,
+              itemOldValue: this.$data.itemValue // FIXME: 数组的旧值不正确
+            })
           }
 
           if (ncformUtils.isNormalArrSchema(newVal)) {