From 09da2536c13896a498629d1a82df122b0d475d83 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 08 12월 2021 10:51:08 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/customField/customFieldModify.html | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/views/customField/customFieldModify.html b/src/main/webapp/views/customField/customFieldModify.html
index 8af0dcd..8beb7b1 100644
--- a/src/main/webapp/views/customField/customFieldModify.html
+++ b/src/main/webapp/views/customField/customFieldModify.html
@@ -35,6 +35,7 @@
<div class="form-group">
<label for="customFieldModifyForm2"><span translate="customField.fieldType">�븘�뱶 �쑀�삎</span><code
class="highlighter-rouge">*</code></label>
+ <label> <input type="checkbox" ng-model="vm.form.requiredData"> �븘�닔 �뜲�씠�꽣 </label>
<select id="customFieldModifyForm2" class="form-control" ng-model="vm.form.customFieldType"
ng-change="fn.changeCustomFieldType()">
<option value="INPUT" translate="common.stringField">臾몄옄�뿴 �븘�뱶</option>
@@ -111,15 +112,17 @@
</div>
<input ng-if="vm.form.customFieldType == 'DATETIME'"
- type="text"
- class="form-control"
- kr-input
- ng-pattern="/^(19|20)\d{2}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[0-1])$/"
- placeholder="�궇吏� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
- autocomplete="off"
- ng-model="vm.form.defaultValue">
- <div ng-show="customFieldAddForm.ipAdress.$error.pattern" class="help-block form-text text-danger"
- translate="common.invalidDateFormat">�궇吏� �삎�떇�씠 留욎� �븡�뒿�땲�떎.(19|20�뀈�룄 �썡�� 1~12 �씪�옄�뒗 31源뚯� �엯�젰媛��뒫�빀�땲�떎.)
+ name="dateTime"
+ class="form-control input-readonly"
+ ng-model="vm.form.defaultValue"
+ modal-form-auto-scroll
+ range-type="singleDate"
+ onfocus="this.blur()"
+ date-range-picker>
+ <div class="row">
+ <div class="col-xs-12">
+ <div id="createdWidget" class="bootstrap-datepicker"></div>
+ </div>
</div>
<input ng-if="vm.form.customFieldType == 'IP_ADDRESS'"
--
Gitblit v1.8.0