Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

config/config.local.ts

@@ -29,7 +29,7 @@ export default defineConfig({
   //   'http://lingxi-frontend-prod.oss-cn-hangzhou.aliyuncs.com/static/js/lingxi-design-ui.min.js',
   // ],
   chainWebpack(config) {
-    config.plugin('antd-dayjs-webpack-plugin').use(AntdDayjsWebpackPlugin)
+    // config.plugin('antd-dayjs-webpack-plugin').use(AntdDayjsWebpackPlugin)
     // config.plugin('lodash-webpack-plugin').use(LodashModuleReplacementPlugin)
     config.module
       .rule('svg')

config/config.prod.ts

@@ -28,7 +28,7 @@ export default defineConfig({
     // 'http://lingxi-frontend-prod.oss-cn-hangzhou.aliyuncs.com/static/js/lingxi-design-ui.min.js',
   ],
   chainWebpack(config) {
-    config.plugin('antd-dayjs-webpack-plugin').use(AntdDayjsWebpackPlugin)
+    // config.plugin('antd-dayjs-webpack-plugin').use(AntdDayjsWebpackPlugin)
     config.plugin('lodash-webpack-plugin').use(LodashModuleReplacementPlugin)
     // config.merge({
     //   optimization: {

config/config.ts

@@ -103,7 +103,7 @@ const config: any = {
   // chunks: isProduction && ['styles', 'vendors', 'umi', 'services'],
   chainWebpack: function(config, { webpack }) {
     // config.plugin('case-sensitive-paths-webpack-plugin').use(CaseSensitivePathsWebpackPlugins)
-    config.plugin('antd-dayjs-webpack-plugin').use(AntdDayjsWebpackPlugin)
+    // config.plugin('antd-dayjs-webpack-plugin').use(AntdDayjsWebpackPlugin)
     config.plugin('lodash-webpack-plugin').use(LodashModuleReplacementPlugin)
     config.module
       .rule('svg')

src/pages/transaction/marketingAbility/components/productListLayout/index.tsx

@@ -82,6 +82,7 @@ const ProductListLayout: React.FC<ProductListProps> = (props: any) => {
       'productList': newData.filter(item => item.skuId !== key)
     })
     setIdNotInList(idNotInList.filter(item => item !== key));
+    setIdNots(idNots.filter(item => item !== key));
     setDataSource(newData.filter(item => item.skuId !== key))
   }