rabin 2 år sedan
förälder
incheckning
30e69d4869
2 ändrade filer med 29 tillägg och 27 borttagningar
  1. 14 9
      assets/lib/layui/admin/modules/plugin/skuTable.js
  2. 15 18
      assets/lib/manage/main.js

+ 14 - 9
assets/lib/layui/admin/modules/plugin/skuTable.js

@@ -300,7 +300,11 @@ layui.define(['jquery', 'form', 'upload', 'layer', 'sortable'], function (export
                     specData.push(specItem);
                 });
                 that.options.specData = specData;
-                that.options.skuData = $.extend(that.options.skuData, that.getFormSkuData());
+                console.log(that.options.specData);
+                if (data.elem.checked) {
+                    //that.options.skuData[]
+                }
+                //that.options.skuData = $.extend(that.options.skuData, that.getFormSkuData());
                 that.resetRender(that.options.skuTableElemId);
                 that.renderMultipleSkuTable();
             });
@@ -434,15 +438,15 @@ layui.define(['jquery', 'form', 'upload', 'layer', 'sortable'], function (export
          */
         resetRender(targets) {
             if (typeof targets === 'string') {
-                $(`#${targets}`).parents('.layui-form-item').replaceWith(`<div id="${targets}"></div>`);
+                $(`#${targets}`).parents('.dever_sku').replaceWith(`<div id="${targets}"></div>`);
             } else if ($.isArray(targets) && targets.length) {
                 targets.forEach((item) => {
-                    $(`#${item}`).parents('.layui-form-item').replaceWith(`<div id="${item}"></div>`);
+                    $(`#${item}`).parents('.dever_sku').replaceWith(`<div id="${item}"></div>`);
                 })
             } else {
-                $(`#${this.options.isAttributeElemId}`).parents('.layui-form-item').replaceWith(`<div id="${this.options.isAttributeElemId}"></div>`);
-                $(`#${this.options.specTableElemId}`).parents('.layui-form-item').replaceWith(`<div id="${this.options.specTableElemId}"></div>`);
-                $(`#${this.options.skuTableElemId}`).parents('.layui-form-item').replaceWith(`<div id="${this.options.skuTableElemId}"></div>`);
+                $(`#${this.options.isAttributeElemId}`).parents('.dever_sku').replaceWith(`<div id="${this.options.isAttributeElemId}"></div>`);
+                $(`#${this.options.specTableElemId}`).parents('.dever_sku').replaceWith(`<div id="${this.options.specTableElemId}"></div>`);
+                $(`#${this.options.skuTableElemId}`).parents('.dever_sku').replaceWith(`<div id="${this.options.skuTableElemId}"></div>`);
             }
         }
 
@@ -696,13 +700,13 @@ layui.define(['jquery', 'form', 'upload', 'layer', 'sortable'], function (export
          */
         renderFormItem(label, content, target, isRequired = true) {
             var html = '';
-            html += '<div class="layui-form-item">';
+            html += '<div class="layui-form-item dever_sku">';
             html += `<label class="layui-form-label ${isRequired ? 'required' : ''}">${label.length ? label : ''}</label>`;
             html += '<div class="layui-input-block">';
             html += content;
             html += '</div>';
             html += '</div>';
-            $(`#${target}`).html(html);
+            $(`#${target}`).replaceWith(html);
             form.render();
         }
 
@@ -715,7 +719,7 @@ layui.define(['jquery', 'form', 'upload', 'layer', 'sortable'], function (export
         }
 
         getFormFilter() {
-            var fariyForm = $('form.fairy-form');
+            var fariyForm = $('form.layui-form');
             if (!fariyForm.attr('lay-filter')) {
                 fariyForm.attr('lay-filter', 'fairy-form-filter');
             }
@@ -724,6 +728,7 @@ layui.define(['jquery', 'form', 'upload', 'layer', 'sortable'], function (export
 
         getFormSkuData() {
             var skuData = {};
+            console.info(this.getFormFilter(), form.val(this.getFormFilter()));
             $.each(form.val(this.getFormFilter()), function (key, value) {
                 if (key.startsWith('skus')) {
                     skuData[key] = value;

+ 15 - 18
assets/lib/manage/main.js

@@ -2383,15 +2383,15 @@ function fastEdit(e, url, title, col, index, type)
 		//if ($(t).find('form').length && !$(t).find('#form1').length) {
 		if ($(t).find('form').length) {
 			if ($(t).find('form').length > 1) {
-				var form = $(t).find('form').eq(1);
-				form.addClass('layui-card-body');
+				var form_1 = $(t).find('form').eq(1);
+				form_1.addClass('layui-card-body');
 			} else {
-				var form = $(t).find('form').eq(0);
+				var form_1 = $(t).find('form').eq(0);
 			}
-			action = form.attr('action');
-			form.addClass('fast');
-			form.find('#function').eq(0).val('showYes');
-			var html = form.prop("outerHTML");
+			action = form_1.attr('action');
+			form_1.addClass('fast');
+			form_1.find('#function').eq(0).val('showYes');
+			var html = form_1.prop("outerHTML");
 			if ($(t).find('#valid').length) {
 				var valid = $(t).find('#valid').prop("outerHTML");
 				html = html + valid;
@@ -2425,17 +2425,14 @@ function fastEdit(e, url, title, col, index, type)
 		if ($('#update_button').length) {
 			$('#update_button').hide();
 		}
-		
-		layui.use(['formSelects', 'form'], function(){
-			var form = layui.form; 
-			form.render();
-			$("select").each(function()
-			{
-				if ($(this).attr('xm-select')) {
-					layui.formSelects.render($(this).attr('xm-select'));
-				}
-			})
-		  });
+
+		form.render();
+		$("select").each(function()
+		{
+			if ($(this).attr('xm-select')) {
+				layui.formSelects.render($(this).attr('xm-select'));
+			}
+		})
 		init(560);
 	});
 }