确认
diff --git a/public/static/admin/js/test/goods.js b/public/static/admin/js/test/goods.js
index 63eaca0..bec81b2 100644
--- a/public/static/admin/js/test/goods.js
+++ b/public/static/admin/js/test/goods.js
@@ -17,7 +17,7 @@ define(["jquery", "easy-admin"], function ($, ea) {
ea.table.render({
init: init,
cols: [[
- {type: 'checkbox'},
{field: 'id', title: 'id'},
{field: 'cate_id', title: '分类ID'},
{field: 'title', title: '商品名称'},
{field: 'logo', title: '商品logo', templet: ea.table.image},
{field: 'total_stock', title: '总库存'},
{field: 'sort', title: '排序', edit: 'text'},
{field: 'status', search: 'select', selectList: ea.getDataBrage('select_list_status'), title: '状态', templet: ea.table.switch},
{field: 'cert_file', title: '合格证', templet: ea.table.url},
{field: 'remark', title: '备注说明', templet: ea.table.text},
{field: 'create_time', title: 'create_time'},
{field: 'publish_time', title: '发布日期'},
{field: 'sale_time', title: '售卖日期'},
{field: 'intro', title: '简介'},
{field: 'time_status', search: 'select', selectList: ea.getDataBrage('select_list_time_status'), title: '秒杀状态'},
{field: 'is_recommend', search: 'select', selectList: ea.getDataBrage('select_list_is_recommend'), title: '是否推荐'},
{field: 'shop_type', search: 'select', selectList: ea.getDataBrage('select_list_shop_type'), title: '商品类型'},
{field: 'from_area', title: '产地'},
{field: 'store_city', title: '仓库'},
{field: 'mallCate.id', title: ''},
{field: 'mallCate.title', title: '分类名'},
{field: 'mallCate.image', title: '分类图片', templet: ea.table.image},
{field: 'mallCate.sort', title: '排序', edit: 'text'},
{field: 'mallCate.status', title: '状态', templet: ea.table.switch},
{field: 'mallCate.remark', title: '备注说明', templet: ea.table.text},
{field: 'mallCate.create_time', title: '创建时间'},
{width: 250, title: '操作', templet: ea.table.tool},
+ {type: 'checkbox'},
{field: 'id', title: 'id'},
{field: 'cate_id', title: '分类ID'},
{field: 'title', title: '商品名称'},
{field: 'logo', title: '商品logo', templet: ea.table.image},
{field: 'total_stock', title: '总库存'},
{field: 'sort', title: '排序', edit: 'text'},
{field: 'status', search: 'select', selectList: ea.getDataBrage('select_list_status'), title: '状态', templet: ea.table.switch},
{field: 'cert_file', title: '合格证', templet: ea.table.url},
{field: 'remark', title: '备注说明', templet: ea.table.text},
{field: 'create_time', title: 'create_time'},
{field: 'publish_time', title: '发布日期'},
{field: 'sale_time', title: '售卖日期'},
{field: 'intro', title: '简介'},
{field: 'time_status', search: 'select', selectList: ea.getDataBrage('select_list_time_status'), title: '秒杀状态'},
{field: 'is_recommend', search: 'select', selectList: ea.getDataBrage('select_list_is_recommend'), title: '是否推荐'},
{field: 'shop_type', search: 'select', selectList: ea.getDataBrage('select_list_shop_type'), title: '商品类型'},
{field: 'from_area', title: '产地'},
{field: 'store_city', title: '仓库'},
{field: 'tag_input', title: '商品标签 （输入）'},
{field: 'mallCate.id', title: ''},
{field: 'mallCate.title', title: '分类名'},
{field: 'mallCate.image', title: '分类图片', templet: ea.table.image},
{field: 'mallCate.sort', title: '排序', edit: 'text'},
{field: 'mallCate.status', title: '状态', templet: ea.table.switch},
{field: 'mallCate.remark', title: '备注说明', templet: ea.table.text},
{field: 'mallCate.create_time', title: '创建时间'},
{width: 250, title: '操作', templet: ea.table.tool , fixed:'right'},
]],
});
diff --git a/public/static/config-admin.js b/public/static/config-admin.js
index beb60b0..0a88a27 100644
--- a/public/static/config-admin.js
+++ b/public/static/config-admin.js
@@ -18,6 +18,7 @@ require.config({
"treetable": ["plugs/lay-module/treetable-lay/treetable"],
"tableSelect": ["plugs/lay-module/tableSelect/tableSelect"],
"tableData": ["plugs/lay-module/tableData/tableData"],
+ "tagInput": ["plugs/lay-module/tagInput/tagInput"],
"iconPickerFa": ["plugs/lay-module/iconPicker/iconPickerFa"],
"autocomplete": ["plugs/lay-module/autocomplete/autocomplete"],
"vue": ["plugs/vue-2.6.10/vue.min"],
diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js
index d69524b..24b408f 100644
--- a/public/static/plugs/easy-admin/easy-admin.js
+++ b/public/static/plugs/easy-admin/easy-admin.js
@@ -1,4 +1,4 @@
-define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypicker'], function ($, tableSelect, undefined, miniTheme, tableData) {
+define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypicker','tagInput'], function ($, tableSelect, undefined, miniTheme, tableData,citypicker,tagInput) {
window.onInitElemStyle = function () {
miniTheme.renderElemStyle()
@@ -1355,6 +1355,9 @@ define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypick
// 监听通用表格数据控件生成
admin.api.tableData();
+ // 监听标签输入控件生成
+ admin.api.tagInput();
+
// 初始化layui表单
form.render();
@@ -1734,9 +1737,6 @@ define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypick
if (cityList.length > 0) {
$.each(cityList, function (i, v) {
- console.log(i);
- console.log(v);
- // format-all=解析全部，name=不进行解析（提交名称），code=不进行解析（提交地区代码），format-name=解析名称，format-code，解析地区代码
var fieldName = $(v).attr('name');
var code = $(v).data('citypicker').getCode();
@@ -1744,8 +1744,6 @@ define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypick
var level = $(v).data('level');
var formatTargetList = {};
- console.log(level);
-
formatTargetList['name'] = 1;
formatTargetList['code'] = 1;
formatTargetList['name-province'] = 1;
@@ -1794,13 +1792,6 @@ define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypick
dataField[fieldName + '_code_district'] = codeArr[2] || '';
}
-
-
- console.log(fieldName);
-
- console.log(code);
- console.log(text);
-
})
}
return dataField
@@ -2058,13 +2049,21 @@ define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypick
}
},
tableData() {
- var dateList = document.querySelectorAll('[data-toggle="table-data"]');
- $.each(dateList, function (i, v) {
+ var tableList = document.querySelectorAll('[data-toggle="table-data"]');
+ $.each(tableList, function (i, v) {
var data = $(v).data()
tableData.render(v, data, admin);
});
- }
+ },
+ tagInput() {
+ var list = document.querySelectorAll('[data-toggle="tag-input"]');
+ $.each(list, function (i, v) {
+ var data = $(v).data()
+ tagInput.render(v, data, admin);
+ });
+
+ },
},
getQueryVariable(variable, defaultValue) {
if (typeof defaultValue == 'undefined') {
diff --git a/public/static/plugs/lay-module/tagInput/tagInput.css b/public/static/plugs/lay-module/tagInput/tagInput.css
new file mode 100644
index 0000000..3d71174
--- /dev/null
+++ b/public/static/plugs/lay-module/tagInput/tagInput.css
@@ -0,0 +1,24 @@
+.tag-input-container .layui-input {
+ height: auto;
+ min-height: 30px;
+ padding-bottom: 8px;
+}
+.tag-input-container .main-input {
+ border: none;
+ height: 22px;
+ line-height: 22px;
+ margin-left: 5px;
+ margin-top: 8px;
+ vertical-align: bottom;
+}
+.tag-input-container .input-preshow {
+ display: inline-block;
+ height: 0px;
+ overflow: hidden;
+}
+.tag-input-container .layui-form-danger + .layui-input {
+ border-color: #ff5722 !important;
+}
+.tag-input-container .layui-btn {
+ margin-top: 8px;
+}
\ No newline at end of file
diff --git a/public/static/plugs/lay-module/tagInput/tagInput.html b/public/static/plugs/lay-module/tagInput/tagInput.html
new file mode 100644
index 0000000..649921d
--- /dev/null
+++ b/public/static/plugs/lay-module/tagInput/tagInput.html
@@ -0,0 +1,13 @@
+
\ No newline at end of file
diff --git a/public/static/plugs/lay-module/tagInput/tagInput.js b/public/static/plugs/lay-module/tagInput/tagInput.js
new file mode 100644
index 0000000..2201653
--- /dev/null
+++ b/public/static/plugs/lay-module/tagInput/tagInput.js
@@ -0,0 +1,114 @@
+define(['jquery', 'vue'], function ($, Vue) {
+ const tagInputCss = '/static/plugs/lay-module/tagInput/tagInput.css';
+ const tagInputHtml = '/static/plugs/lay-module/tagInput/tagInput.html';
+
+ var tagInput = function () {
+ var cssElement = document.createElement('link');
+
+ cssElement.setAttribute('rel', 'stylesheet');
+
+ cssElement.setAttribute('href', tagInputCss);
+
+ document.body.appendChild(cssElement);
+ };
+ var tagInputTemplate = '';
+
+ $.ajax({
+ type: "get",
+ url: tagInputHtml,
+ cache: true,
+ async: false,
+ success: function (template) {
+ tagInputTemplate = template;
+ }
+
+ });
+
+ tagInput.prototype.render = function (elem, data) {
+
+ var defaultOption = {
+ placeholder: '请选择',
+ required: ''
+ }
+
+ var options = $.extend(defaultOption, data);
+
+
+
+ app = new Vue({
+ el: elem,
+ data() {
+ return {
+ setting: options,
+ value: '',
+ inputValue: '',
+ inputWidth: 100,
+ inputValuePreview: '',
+ listTag: []
+ }
+ },
+ watch: {
+ inputValue(value) {
+
+ this.inputValuePreview = value;
+ this.updateInputWidth()
+ },
+ listTag(value) {
+ this.value = value.join(',')
+ }
+ },
+ created() {
+ if (options.value.length > 0) {
+ this.listTag = options.value.split(',')
+
+ }
+
+ },
+ mounted() {
+ if (options.required == 1) {
+ $(this.$refs['tagInput']).closest('.layui-form-item').children('.layui-form-label').addClass('required');
+ }
+ },
+ template: tagInputTemplate,
+
+ methods: {
+ onInputConfirm(e) {
+
+ if (e) e.preventDefault();
+
+ if ($.trim(this.inputValue).length == 0) {
+ return false;
+ }
+
+ this.listTag.push(this.inputValue)
+ this.inputValue = '';
+ return false;
+ },
+ onContainerClick() {
+ $(this.$refs['tagInputMain']).focus()
+ },
+ onInputChange(e) {
+
+ var cvalue = $(e.target).val();
+ this.inputValuePreview = cvalue;
+
+ },
+ updateInputWidth() {
+ var width = $(this.$refs['preshow']).width();
+
+ if (width < 100) {
+ width = 100;
+ }
+ this.inputWidth = width + 60;
+ },
+ removeItem(item, index) {
+ this.listTag.splice(index, 1)
+ }
+ }
+ })
+
+ return app;
+ }
+
+ return new tagInput();
+})
\ No newline at end of file
diff --git a/public/static/plugs/lay-module/tagInput/tagInput.scss b/public/static/plugs/lay-module/tagInput/tagInput.scss
new file mode 100644
index 0000000..a135cac
--- /dev/null
+++ b/public/static/plugs/lay-module/tagInput/tagInput.scss
@@ -0,0 +1,31 @@
+.tag-input-container {
+
+ .layui-input {
+ height : auto;
+ min-height : 30px;
+ padding-bottom: 8px;
+ }
+
+ .main-input {
+ border : none;
+ height : 22px;
+ line-height : 22px;
+ margin-left : 5px;
+ margin-top : 8px;
+ vertical-align: bottom;
+ }
+
+ .input-preshow {
+ display : inline-block;
+ height : 0px;
+ overflow: hidden;
+ }
+
+ .layui-form-danger+.layui-input {
+ border-color: #ff5722 !important;
+ }
+
+ .layui-btn {
+ margin-top: 8px;
+ }
+}
\ No newline at end of file