From b3517d12f2f3165cb3adf28e911869d70b5acbde Mon Sep 17 00:00:00 2001 From: kgdxpr Date: Tue, 2 Jan 2024 14:26:29 +0800 Subject: [PATCH 1/2] 'commit' --- WebRoot/view/tb/form/ayq/modules/formField.js | 89 ++++++++++--------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/WebRoot/view/tb/form/ayq/modules/formField.js b/WebRoot/view/tb/form/ayq/modules/formField.js index ea8c3dca..e4b22add 100644 --- a/WebRoot/view/tb/form/ayq/modules/formField.js +++ b/WebRoot/view/tb/form/ayq/modules/formField.js @@ -18,10 +18,10 @@ layui.define(['layer'], function (exports) { showWordLimit: false, // readonly: false, // disabled: false, - required: true, + required: false // hideLabel: false, // dimension: false, - expression: "" + // expression: "" // document: '', }, select: { @@ -32,16 +32,16 @@ layui.define(['layer'], function (exports) { tagIcon: 'select', labelWidth: 110, width: "100%", - disabled: false, - required: true, - hideLabel: false, - document: '', - datasourceType: 'local', - remoteUrl: 'http://', - remoteMethod: 'post', - remoteOptionText: 'options.data.dictName',//映射到text - remoteOptionValue: 'options.data.dictId',//映射到value text和value可以是一样的 - remoteDefaultValue: '12',//表示对应的remoteOptionValue的值 + // disabled: false, + required: false, + // hideLabel: false, + // document: '', + // datasourceType: 'local', + // remoteUrl: 'http://', + // remoteMethod: 'post', + // remoteOptionText: 'options.data.dictName',//映射到text + // remoteOptionValue: 'options.data.dictId',//映射到value text和value可以是一样的 + // remoteDefaultValue: '12',//表示对应的remoteOptionValue的值 options: [ { text: 'option1', @@ -67,14 +67,15 @@ layui.define(['layer'], function (exports) { tag: "radio", tagIcon: 'radio', labelWidth: 110, - disabled: false, - hideLabel: false, - document: '', - datasourceType: 'local', - remoteUrl: 'http://', - remoteMethod: 'post', - remoteOptionText: 'options.data.dictName',//映射到text - remoteOptionValue: 'options.data.dictId',//映射到value text和value可以是一样的 + required: false, + // disabled: false, + // hideLabel: false, + // document: '', + // datasourceType: 'local', + // remoteUrl: 'http://', + // remoteMethod: 'post', + // remoteOptionText: 'options.data.dictName',//映射到text + // remoteOptionValue: 'options.data.dictId',//映射到value text和value可以是一样的 options: [ { text: 'option1', @@ -100,15 +101,15 @@ layui.define(['layer'], function (exports) { tag: "checkbox", tagIcon: 'checkbox', labelWidth: 110, - disabled: false, - required: true, - hideLabel: false, - document: '', - datasourceType: 'local', - remoteUrl: 'http://', - remoteMethod: 'post', - remoteOptionText: 'options.data.dictName',//映射到text - remoteOptionValue: 'options.data.dictId',//映射到value text和value可以是一样的 + // disabled: false, + required: false, + // hideLabel: false, + // document: '', + // datasourceType: 'local', + // remoteUrl: 'http://', + // remoteMethod: 'post', + // remoteOptionText: 'options.data.dictName',//映射到text + // remoteOptionValue: 'options.data.dictId',//映射到value text和value可以是一样的 options: [ { text: 'option1', @@ -150,7 +151,7 @@ layui.define(['layer'], function (exports) { width: "100%", clearable: true, maxlength: null, - dateDefaultValue: '2021-05-25', + dateDefaultValue: '', dateType: "date",//year month date time datetime range: false, dateFormat: "yyyy-MM-dd", @@ -163,10 +164,10 @@ layui.define(['layer'], function (exports) { mark: null,//每年的日期 {'0-9-18': '国耻'} 0 即代表每一年 showBottom: true, zindex: 66666666, - disabled: false, - required: true, - hideLabel: false, - document: '', + // disabled: false, + required: false, + // hideLabel: false, + // document: '', }, dateRange: { id: '-1', @@ -208,10 +209,11 @@ layui.define(['layer'], function (exports) { text: false, theme: "default", colorSelection: "#ffb800", + required: false, showBottom: true, - readonly: false, - hideLabel: false, - document: '', + // readonly: false, + // hideLabel: false, + // document: '', }, image: { id: '-1', @@ -250,11 +252,11 @@ layui.define(['layer'], function (exports) { placeholder: "请输入", defaultValue: null, width: "100%", - readonly: false, - disabled: false,//这里就是readonly的医生 - required: true, - hideLabel: false, - document: '' + // readonly: false, + // disabled: false,//这里就是readonly的医生 + required: false, + // hideLabel: false, + // document: '' }, blockquote: { id: '-1', @@ -307,8 +309,7 @@ layui.define(['layer'], function (exports) { { "key": "date", "icon": "layui-icon layui-icon-time" }, { "key": "rate", "icon": "layui-icon layui-icon-rate-solid" }, { "key": "image", "icon": "layui-icon layui-icon-picture" }, - { "key": "file", "icon": "layui-icon layui-icon-export" }, - { "key": "dateRange", "icon": "layui-icon layui-icon-date" } + { "key": "file", "icon": "layui-icon layui-icon-export" } ] }, { From 9075c48d349cfed834cfdeea3409cdd14deea792 Mon Sep 17 00:00:00 2001 From: kgdxpr Date: Tue, 2 Jan 2024 14:52:48 +0800 Subject: [PATCH 2/2] 'commit' --- .../view/tb/form/ayq/modules/formDesigner.js | 31 ++++++++++++++++++- WebRoot/view/tb/form/ayq/modules/formField.js | 18 +++++------ 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/WebRoot/view/tb/form/ayq/modules/formDesigner.js b/WebRoot/view/tb/form/ayq/modules/formDesigner.js index b1df3f97..eef6c89c 100644 --- a/WebRoot/view/tb/form/ayq/modules/formDesigner.js +++ b/WebRoot/view/tb/form/ayq/modules/formDesigner.js @@ -648,6 +648,9 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele var _readonly = json.readonly ? 'readonly=""' : ''; var $block = $('#' + json.id + ' .layui-input-block'); var $label = $('#' + json.id + ' .layui-form-label'); + if (json.required) { + $label.append('*'); + } $block.empty(); $label.empty(); if (json.hideLabel) { @@ -884,6 +887,7 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele selected = false; } var _disabled = json.disabled ? 'disabled=""' : ''; + var _required = json.required ? 'required' : ''; var _hideLabel = json.hideLabel ? 'display: none;' : ''; var _html = '
'.format(json.id, json.tag, selected ? 'active' : '', json.index); _html += ''.format(json.label, json.labelWidth, _hideLabel); @@ -910,11 +914,15 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele * */ update: function (json, that) { var _disabled = json.disabled ? 'disabled=""' : ''; + var _required = json.required ? 'required' : ''; var $block = $('#' + json.id + ' .layui-input-block'); var $label = $('#' + json.id + ' .layui-form-label'); $block.empty(); $label.empty(); $label.css("width", json.labelWidth); + if (json.required) { + $label.append('*'); + } $label.append(json.label + ":"); if (json.hideLabel) { $label.css("display", "none"); @@ -1566,9 +1574,16 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele * @param {object} that 实例对象 * */ update: function (json, that) { + console.log(json); + var _required = json.required ? 'required' : ''; var $block = $('#' + json.id + ' .layui-input-block'); var $label = $('#' + json.id + ' .layui-form-label'); + $label.empty(); + + if (json.required) { + $label.append('*'); + } if (json.hideLabel) { $label.css("display", "none"); $block.css("margin-left", "0px"); @@ -1577,6 +1592,7 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele $block.css("margin-left", json.labelWidth + 30); } $label.append(json.label + ":"); + rate.render({ elem: '#' + json.tag + json.id, value: json.defaultValue, @@ -1962,6 +1978,13 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele * @param {object} that 实例对象 * */ update: function (json, that) { + var _required = json.required ? 'required' : ''; + var $label = $('#' + json.id + ' .layui-form-label'); + $label.empty(); + if (json.required) { + $label.append('*'); + } + $label.append(json.label + ":"); }, /** @@ -2080,7 +2103,13 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele * @param {object} that 实例对象 * */ update: function (json, that) { - + var _required = json.required ? 'required' : ''; + var $label = $('#' + json.id + ' .layui-form-label'); + $label.empty(); + if (json.required) { + $label.append('*'); + } + $label.append(json.label + ":"); }, /** * 根据components组件对象获取组件属性 diff --git a/WebRoot/view/tb/form/ayq/modules/formField.js b/WebRoot/view/tb/form/ayq/modules/formField.js index e4b22add..1e89435c 100644 --- a/WebRoot/view/tb/form/ayq/modules/formField.js +++ b/WebRoot/view/tb/form/ayq/modules/formField.js @@ -210,7 +210,7 @@ layui.define(['layer'], function (exports) { theme: "default", colorSelection: "#ffb800", required: false, - showBottom: true, + showBottom: true // readonly: false, // hideLabel: false, // document: '', @@ -224,10 +224,10 @@ layui.define(['layer'], function (exports) { placeholder: "请输入", defaultValue: null, labelWidth: null, - disabled: false, - required: true, - document: '', - uploadUrl: '', + // disabled: false, + required: false, + // document: '', + // uploadUrl: '', }, file: { id: '-1', @@ -238,10 +238,10 @@ layui.define(['layer'], function (exports) { // placeholder: "请输入", // defaultValue: null, // labelWidth: null, - disabled: false, - required: true, - document: '', - uploadUrl: '', + // disabled: false, + required: false, + // document: '', + // uploadUrl: '', }, textarea: { id: '-1',