Merge branch 'feature/img_onload' into 'master'

Feature/img onload

See merge request !10

app/web/page/editor/component/DynamicForm/component/GoodsTableModal/columns/goods.column.ts

@@ -54,6 +54,11 @@ const columns = function() {
       key: 'id',
       formType: 'input'
     },
+    {
+      title: 'sku_no',
+      key: 'skuNo',
+      formType: 'input'
+    },
     {
       title: '商品图片',
       key: 'imageUrl',
@@ -107,21 +112,6 @@ const columns = function() {
         return h('div', obj.name);
       },
     },
-    {
-      title: '创建时间',
-      key: 'createdAt',
-      hideSearch: true
-    },
-    {
-      title: '发布时间',
-      key: 'pushedAt',
-      hideSearch: true
-    },
-    {
-      title: '下架时间',
-      key: 'offlineAt',
-      hideSearch: true
-    },
     {
       title: '标签',
       hideSearch: true,

package-lock.json

@@ -1455,9 +1455,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.0.76",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.0.76.tgz",
-      "integrity": "sha512-7eKOp5Ey1kZZA1kijM/9aLisFRXLTiN2ZAPOtTo3YN0ErQ+ObMaIMK4pNVjrP5WJppf/OHR7Z0+82FTge16vqA==",
+      "version": "0.0.78",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.0.78.tgz",
+      "integrity": "sha512-bfhD2w2bdXSoBkFNOzz6oKGc2hn9JjtyElW6szjWlprsD3pkvIdMcxht85DpeNJjvSRhvjBzgB98YPHPSuJgbw==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.20.11",

package.json

@@ -25,7 +25,7 @@
     "@easy-team/easywebpack-vue": "^4.0.0",
     "@hubcarl/json-typescript-mapper": "^2.0.0",
     "@qg/cherry-ui": "^2.20.11",
-    "@qg/citrus-ui": "0.0.76",
+    "@qg/citrus-ui": "0.0.78",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",