From d2b16e2beef46effa261ace410069d6a87c60d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= <jianweie@163.com>
Date: Wed, 3 Aug 2022 01:03:06 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=95=86=E5=93=81=E5=8F=82=E6=95=B0=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E6=88=96=E7=BC=96=E8=BE=91=E5=90=8E=EF=BC=8C=E6=9C=AA=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E7=BB=93=E6=9E=9C=E9=9B=86=E5=AF=BC=E8=87=B4=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=B8=A2=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Good/CoreCmsGoodsRepository.cs                 | 14 +++++++-------
 .../wwwroot/views/good/goods/create.html           |  3 ++-
 .../wwwroot/views/good/goods/edit.html             |  9 +++++----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
index 8b6496bf..3d85d499 100644
--- a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
+++ b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
@@ -128,19 +128,19 @@ namespace CoreCms.Net.Repository
             goods.commentsCount = 0;
             goods.buyCount = 0;
             goods.viewCount = 0;
+            goods.goodsParamsIds = entity.goods.goodsParamsIds;
+            goods.parameters = entity.goods.parameters;
 
             if (goods.openSpec == 1)
             {
                 goods.newSpec = entity.goods.newSpec;
                 goods.spesDesc = entity.goods.spesDesc;
-                goods.parameters = entity.goods.parameters;
                 goods.goodsTypeId = entity.goods.goodsTypeId;
             }
             else
             {
                 goods.newSpec = "";
                 goods.spesDesc = "";
-                goods.parameters = "";
                 goods.goodsTypeId = 0;
             }
 
@@ -408,28 +408,28 @@ namespace CoreCms.Net.Repository
             oldModel.sort = model.sort;
             //oldModel.labelIds = model.labelIds;
             //oldModel.createTime = model.createTime;
+
+            oldModel.goodsParamsIds = model.goodsParamsIds;
+            oldModel.parameters = model.parameters;
+
             oldModel.openSpec = model.openSpec;
             if (oldModel.openSpec == 1)
             {
                 oldModel.newSpec = model.newSpec;
                 oldModel.spesDesc = model.spesDesc;
-                oldModel.parameters = model.parameters;
                 oldModel.goodsTypeId = model.goodsTypeId;
 
                 oldModel.goodsSkuIds = model.goodsSkuIds;
-                oldModel.goodsParamsIds = model.goodsParamsIds;
-                oldModel.parameters = model.parameters;
+
 
             }
             else
             {
                 oldModel.newSpec = "";
                 oldModel.spesDesc = "";
-                oldModel.parameters = "";
                 oldModel.goodsTypeId = 0;
 
                 oldModel.goodsSkuIds = "";
-                oldModel.goodsParamsIds = "";
 
             }
 
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
index 64e59632..6ba72bf1 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
@@ -222,7 +222,7 @@
                         <div class="layui-tab-item">
                             <div class="layui-form-item">
                                 <label class="layui-form-label">参数模型选择</label>
-                                <div class="layui-input-inline layui-inline-10">
+                                <div class="layui-input-inline layui-inline-12">
                                     <div id="goodsParams_SelectCreateTree" class="xm-select-demo"></div>
                                 </div>
                                 <div class="layui-form-mid layui-word-aux">
@@ -674,6 +674,7 @@
                     height: '250px',
                     data: d.data.paramsList,
                     //model: { label: { type: 'text' } },
+                    filterable: true,
                     name: 'goodsParamsIds',
                     prop: {
                         name: 'name',
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
index 7da56a07..05cf8606 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
@@ -213,7 +213,7 @@
                         <div class="layui-tab-item">
                             <div class="layui-form-item">
                                 <label class="layui-form-label">参数模型选择</label>
-                                <div class="layui-input-inline layui-inline-10">
+                                <div class="layui-input-inline layui-inline-12">
                                     <div id="goodsParams_SelectCreateTree" class="xm-select-demo"></div>
                                 </div>
                                 <div class="layui-form-mid layui-word-aux">
@@ -407,16 +407,16 @@
                 {{# if(item.type && item.type==='radio'){ }}
                 <input type="hidden" name="paramsValueCount[{{index}}]" value="{{layui.coreHelper.stringToArrayLength(item.value)}}" class="layui-input">
                 {{# layui.each(layui.coreHelper.stringToArray(item.value), function(indexRadio, itemRadio){ }}
-                <input type="radio" name="paramsValue[{{index}}]" value="{{itemRadio}}" title="{{itemRadio}}" {{ setRadioParameters(d.arrParameters, item.id , itemRadio) ?'checked':'' }} lay-verType="tips" lay-verify="required">
+                <input type="radio" name="paramsValue[{{index}}]" value="{{itemRadio}}" title="{{itemRadio}}" {{ setRadioParameters(d.arrParameters, item.id , itemRadio) ?'checked':'' }} lay-verify="required">
                 {{# }); }}
                 {{# } else if (item.type && item.type==='checkbox'){ }}
                 <input type="hidden" name="paramsValueCount[{{index}}]" value="{{layui.coreHelper.stringToArrayLength(item.value)}}" class="layui-input">
                 {{# layui.each(layui.coreHelper.stringToArray(item.value), function(indexCheckbox, itemCheckbox){ }}
-                <input type="checkbox" name="paramsValue[{{index}}][]" value="{{itemCheckbox}}" lay-skin="primary" {{ setCheckboxParameters(d.arrParameters, item.id , itemCheckbox) ?'checked':'' }} title="{{itemCheckbox}}" value="{{itemCheckbox}}" lay-verType="tips" lay-verify="required">
+                <input type="checkbox" name="paramsValue[{{index}}][]" value="{{itemCheckbox}}" lay-skin="primary" {{ setCheckboxParameters(d.arrParameters, item.id , itemCheckbox) ?'checked':'' }} title="{{itemCheckbox}}" value="{{itemCheckbox}}" lay-verify="required">
                 {{# }); }}
                 {{# } else if (item.type && item.type==='text'){ }}
                 <input type="hidden" name="paramsValueCount[{{index}}]" value="1" class="layui-input">
-                <input type="text" name="paramsValue[{{index}}]" value="{{setTextParameters(d.arrParameters, item.id)}}" class="layui-input" lay-verType="tips" lay-verify="required">
+                <input type="text" name="paramsValue[{{index}}]" value="{{setTextParameters(d.arrParameters, item.id)}}" class="layui-input" lay-verify="required">
                 {{# } else { }}
                 {{# } }}
             </div>
@@ -743,6 +743,7 @@
                     height: '250px',
                     data: d.data.paramsList,
                     //model: { label: { type: 'text' } },
+                    filterable: true,
                     name: 'goodsParamsIds',
                     prop: {
                         name: 'name',