diff --git a/scripts/AreaSelectFieldBuilder-output.json b/scripts/AreaSelectFieldBuilder-output.json index c035859..d97576f 100644 --- a/scripts/AreaSelectFieldBuilder-output.json +++ b/scripts/AreaSelectFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225515058","jnpfKey":"areaSelect","label":"地区","tipLabel":"","showLabel":true,"tag":"JnpfAreaSelect","tagIcon":"icon-ym icon-ym-generator-area","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","defaultCurrent":false,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225515058},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请选择","level":2,"startPlaceholder":"请选择省","endPlaceholder":"请选择市","separator":"/","multiple":false,"__vModel__":"f_area"} -======= -{"__config__":{"formId":"formItem1781225353060","jnpfKey":"areaSelect","label":"地区","tipLabel":"","showLabel":true,"tag":"JnpfAreaSelect","tagIcon":"icon-ym icon-ym-generator-area","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","defaultCurrent":false,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225353060},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请选择","level":2,"startPlaceholder":"请选择省","endPlaceholder":"请选择市","separator":"/","multiple":false,"__vModel__":"f_area"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671187","jnpfKey":"areaSelect","label":"地区","tipLabel":"","showLabel":true,"tag":"JnpfAreaSelect","tagIcon":"icon-ym icon-ym-generator-area","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","defaultCurrent":false,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225671188},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请选择","level":2,"startPlaceholder":"请选择省","endPlaceholder":"请选择市","separator":"/","multiple":false,"__vModel__":"f_area"} \ No newline at end of file diff --git a/scripts/AutoCompleteFieldBuilder-output.json b/scripts/AutoCompleteFieldBuilder-output.json index 8b75017..58e8c2d 100644 --- a/scripts/AutoCompleteFieldBuilder-output.json +++ b/scripts/AutoCompleteFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225515524","jnpfKey":"autoComplete","label":"关键词","tipLabel":"","labelWidth":null,"showLabel":true,"required":true,"tag":"JnpfAutoComplete","tagIcon":"icon-ym icon-ym-generator-autoComplete","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change"},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请输入","interfaceId":"","interfaceName":"","templateJson":[],"total":10,"relationField":"fullName","disabled":false,"clearable":true} -======= -{"__config__":{"formId":"formItem1781225353092","jnpfKey":"autoComplete","label":"关键词","tipLabel":"","labelWidth":null,"showLabel":true,"required":true,"tag":"JnpfAutoComplete","tagIcon":"icon-ym icon-ym-generator-autoComplete","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change"},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请输入","interfaceId":"","interfaceName":"","templateJson":[],"total":10,"relationField":"fullName","disabled":false,"clearable":true} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671634","jnpfKey":"autoComplete","label":"关键词","tipLabel":"","labelWidth":null,"showLabel":true,"required":true,"tag":"JnpfAutoComplete","tagIcon":"icon-ym icon-ym-generator-autoComplete","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change"},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请输入","interfaceId":"","interfaceName":"","templateJson":[],"total":10,"relationField":"fullName","disabled":false,"clearable":true} \ No newline at end of file diff --git a/scripts/CalculateFieldBuilder-output.json b/scripts/CalculateFieldBuilder-output.json index 0f615ce..26e19a6 100644 --- a/scripts/CalculateFieldBuilder-output.json +++ b/scripts/CalculateFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225515998","jnpfKey":"calculate","label":"合计","tipLabel":"","showLabel":true,"required":true,"tag":"JnpfCalculate","tagIcon":"icon-ym icon-ym-generator-calculate","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"renderKey":1781225515998},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请输入","formula":[],"trigger":"change","precision":0,"roundType":1,"dataSource":0,"addonAfter":"","isAmountChinese":false,"isStorage":0} -======= -{"__config__":{"formId":"formItem1781225353494","jnpfKey":"calculate","label":"合计","tipLabel":"","showLabel":true,"required":true,"tag":"JnpfCalculate","tagIcon":"icon-ym icon-ym-generator-calculate","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"renderKey":1781225353494},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请输入","formula":[],"trigger":"change","precision":0,"roundType":1,"dataSource":0,"addonAfter":"","isAmountChinese":false,"isStorage":0} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671989","jnpfKey":"calculate","label":"合计","tipLabel":"","showLabel":true,"required":true,"tag":"JnpfCalculate","tagIcon":"icon-ym icon-ym-generator-calculate","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"renderKey":1781225671989},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请输入","formula":[],"trigger":"change","precision":0,"roundType":1,"dataSource":0,"addonAfter":"","isAmountChinese":false,"isStorage":0} \ No newline at end of file diff --git a/scripts/CarouselFieldBuilder-output.json b/scripts/CarouselFieldBuilder-output.json index 58f0bc6..63712e2 100644 --- a/scripts/CarouselFieldBuilder-output.json +++ b/scripts/CarouselFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225516032","jnpfKey":"carousel","label":"轮播图","labelWidth":null,"showLabel":false,"tag":"JnpfCarousel","tagIcon":"icon-ym icon-ym-portal-carousel","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":null,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"noShow":false,"regList":[],"trigger":"click","renderKey":1781225516032},"__vModel__":"f_carousel","id":"f_carousel","imgList":[{"imageUrl":"https://app.cdn.jnpfsoft.com/image/3.2/banner1.png","dataType":2,"propsApi":"","moduleId":"","linkType":"","urlAddress":"","linkTarget":"_self","text":"","id":"1"},{"imageUrl":"https://app.cdn.jnpfsoft.com/image/3.2/banner2.png","dataType":2,"propsApi":"","moduleId":"","linkType":"","urlAddress":"","linkTarget":"_self","text":"","id":"2"},{"imageUrl":"https://app.cdn.jnpfsoft.com/image/3.2/banner4.png","dataType":2,"propsApi":"","moduleId":"","linkType":"","urlAddress":"","linkTarget":"_self","text":"","id":"3"}],"height":200,"autoplay":true,"direction":"horizontal","interval":3000,"indicatorPosition":"bottomRight","arrow":"never","imageFillStyle":"cover"} -======= -{"__config__":{"formId":"formItem1781225352811","jnpfKey":"carousel","label":"轮播图","labelWidth":null,"showLabel":false,"tag":"JnpfCarousel","tagIcon":"icon-ym icon-ym-portal-carousel","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":null,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"noShow":false,"regList":[],"trigger":"click","renderKey":1781225352811},"__vModel__":"f_carousel","id":"f_carousel","imgList":[{"imageUrl":"https://app.cdn.jnpfsoft.com/image/3.2/banner1.png","dataType":2,"propsApi":"","moduleId":"","linkType":"","urlAddress":"","linkTarget":"_self","text":"","id":"1"},{"imageUrl":"https://app.cdn.jnpfsoft.com/image/3.2/banner2.png","dataType":2,"propsApi":"","moduleId":"","linkType":"","urlAddress":"","linkTarget":"_self","text":"","id":"2"},{"imageUrl":"https://app.cdn.jnpfsoft.com/image/3.2/banner4.png","dataType":2,"propsApi":"","moduleId":"","linkType":"","urlAddress":"","linkTarget":"_self","text":"","id":"3"}],"height":200,"autoplay":true,"direction":"horizontal","interval":3000,"indicatorPosition":"bottomRight","arrow":"never","imageFillStyle":"cover"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225672012","jnpfKey":"carousel","label":"轮播图","labelWidth":null,"showLabel":false,"tag":"JnpfCarousel","tagIcon":"icon-ym icon-ym-portal-carousel","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":null,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"noShow":false,"regList":[],"trigger":"click","renderKey":1781225672012},"__vModel__":"f_carousel","id":"f_carousel","imgList":[{"imageUrl":"https://app.cdn.jnpfsoft.com/image/3.2/banner1.png","dataType":2,"propsApi":"","moduleId":"","linkType":"","urlAddress":"","linkTarget":"_self","text":"","id":"1"},{"imageUrl":"https://app.cdn.jnpfsoft.com/image/3.2/banner2.png","dataType":2,"propsApi":"","moduleId":"","linkType":"","urlAddress":"","linkTarget":"_self","text":"","id":"2"},{"imageUrl":"https://app.cdn.jnpfsoft.com/image/3.2/banner4.png","dataType":2,"propsApi":"","moduleId":"","linkType":"","urlAddress":"","linkTarget":"_self","text":"","id":"3"}],"height":200,"autoplay":true,"direction":"horizontal","interval":3000,"indicatorPosition":"bottomRight","arrow":"never","imageFillStyle":"cover"} \ No newline at end of file diff --git a/scripts/CascaderFieldBuilder-output.json b/scripts/CascaderFieldBuilder-output.json index 949bfa9..10f5ed1 100644 --- a/scripts/CascaderFieldBuilder-output.json +++ b/scripts/CascaderFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225515833","visibility":["pc","app"],"jnpfKey":"cascader","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"地区","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225515833,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-cascader","tag":"JnpfCascader","regList":[],"tableAlign":"left","span":24,"defaultValue":[],"dataType":"static","dictionaryType":"","propsUrl":"","propsName":"","useCache":true,"templateJson":[]},"__vModel__":"f_region","field":"f_region","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"style":{"width":"100%"},"options":[{"id":"1","fullName":"选项1","children":[{"id":"2","fullName":"选项1-1"}]}],"props":{"value":"id","label":"fullName","children":"children"},"placeholder":"请选择","disabled":false,"clearable":true,"filterable":false,"multiple":false,"id":"f_region","fullName":"地区","fullNameI18nCode":[""],"dropdownClassName":"","maxTagCount":null} -======= -{"__config__":{"formId":"formItem1781225353439","visibility":["pc","app"],"jnpfKey":"cascader","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"地区","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225353439,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-cascader","tag":"JnpfCascader","regList":[],"tableAlign":"left","span":24,"defaultValue":[],"dataType":"static","dictionaryType":"","propsUrl":"","propsName":"","useCache":true,"templateJson":[]},"__vModel__":"f_region","field":"f_region","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"style":{"width":"100%"},"options":[{"id":"1","fullName":"选项1","children":[{"id":"2","fullName":"选项1-1"}]}],"props":{"value":"id","label":"fullName","children":"children"},"placeholder":"请选择","disabled":false,"clearable":true,"filterable":false,"multiple":false,"id":"f_region","fullName":"地区","fullNameI18nCode":[""],"dropdownClassName":"","maxTagCount":null} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671765","visibility":["pc","app"],"jnpfKey":"cascader","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"地区","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225671765,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-cascader","tag":"JnpfCascader","regList":[],"tableAlign":"left","span":24,"defaultValue":[],"dataType":"static","dictionaryType":"","propsUrl":"","propsName":"","useCache":true,"templateJson":[]},"__vModel__":"f_region","field":"f_region","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"style":{"width":"100%"},"options":[{"id":"1","fullName":"选项1","children":[{"id":"2","fullName":"选项1-1"}]}],"props":{"value":"id","label":"fullName","children":"children"},"placeholder":"请选择","disabled":false,"clearable":true,"filterable":false,"multiple":false,"id":"f_region","fullName":"地区","fullNameI18nCode":[""],"dropdownClassName":"","maxTagCount":null} \ No newline at end of file diff --git a/scripts/CheckboxFieldBuilder-output.json b/scripts/CheckboxFieldBuilder-output.json index 39d01b5..c900991 100644 --- a/scripts/CheckboxFieldBuilder-output.json +++ b/scripts/CheckboxFieldBuilder-output.json @@ -1 +1 @@ -{"__config__":{"formId":"formItem1781225353336","visibility":["pc","app"],"jnpfKey":"checkbox","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"标签","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225353336,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-checkbox","tag":"JnpfCheckbox","regList":[],"tableAlign":"left","span":24,"defaultValue":[],"dataType":"static","dictionaryType":"","propsUrl":"","propsName":"","useCache":true,"templateJson":[]},"__vModel__":"f_tags","field":"f_tags","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"style":{"width":"100%"},"options":[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],"props":{"label":"fullName","value":"id"},"direction":"horizontal","disabled":false,"id":"f_tags","fullName":"标签","fullNameI18nCode":[""],"selectAll":false,"min":null,"max":null} \ No newline at end of file +{"__config__":{"formId":"formItem1781225672340","visibility":["pc","app"],"jnpfKey":"checkbox","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"标签","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225672340,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-checkbox","tag":"JnpfCheckbox","regList":[],"tableAlign":"left","span":24,"defaultValue":[],"dataType":"static","dictionaryType":"","propsUrl":"","propsName":"","useCache":true,"templateJson":[]},"__vModel__":"f_tags","field":"f_tags","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"style":{"width":"100%"},"options":[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],"props":{"label":"fullName","value":"id"},"direction":"horizontal","disabled":false,"id":"f_tags","fullName":"标签","fullNameI18nCode":[""],"selectAll":false,"min":null,"max":null} \ No newline at end of file diff --git a/scripts/ColorPickerFieldBuilder-output.json b/scripts/ColorPickerFieldBuilder-output.json index 3f33a53..c6cdc25 100644 --- a/scripts/ColorPickerFieldBuilder-output.json +++ b/scripts/ColorPickerFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225516051","jnpfKey":"colorPicker","label":"颜色","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfColorPicker","tagIcon":"icon-ym icon-ym-generator-color","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":null,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225516051},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"showAlpha":false,"colorFormat":"","disabled":false,"__vModel__":"f_color","id":"f_color"} -======= -{"__config__":{"formId":"formItem1781225353320","jnpfKey":"colorPicker","label":"颜色","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfColorPicker","tagIcon":"icon-ym icon-ym-generator-color","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":null,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225353320},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"showAlpha":false,"colorFormat":"","disabled":false,"__vModel__":"f_color","id":"f_color"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225672043","jnpfKey":"colorPicker","label":"颜色","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfColorPicker","tagIcon":"icon-ym icon-ym-generator-color","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":null,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225672043},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"showAlpha":false,"colorFormat":"","disabled":false,"__vModel__":"f_color","id":"f_color"} \ No newline at end of file diff --git a/scripts/ColumnDataBuilder-output.json b/scripts/ColumnDataBuilder-output.json index 6dee632..4e6c147 100644 --- a/scripts/ColumnDataBuilder-output.json +++ b/scripts/ColumnDataBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225514911","visibility":["pc","app"],"jnpfKey":"relationForm","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"客户","trigger":"blur","showLabel":true,"required":true,"tableName":"","renderKey":1781225514911,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-menu","tag":"JnpfRelationForm","regList":[],"tableAlign":"left","span":24,"dictionaryType":"","defaultValue":""},"__vModel__":"f_customer","field":"f_customer","id":"f_customer","sortable":false,"searchable":true,"width":250,"fixed":"none","align":"left","columnBtnsList":[],"buttons":[],"required":true,"preview":false,"fmt":{"type":"","format":""},"jt":"","showText":"","display":true,"datatype":"string","isStorage":0,"totalSummary":false,"freeSign":"","showTooltip":false,"linkInfo":[],"appLinkInfo":[],"copy":false,"rules":[],"hideColumn":false,"level":0,"options":[],"props":{"label":"fullName","value":"id"},"hideInTable":false,"subTableKey":""} -======= -{"__config__":{"formId":"formItem1781225354093","visibility":["pc","app"],"jnpfKey":"relationForm","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"客户","trigger":"blur","showLabel":true,"required":true,"tableName":"","renderKey":1781225354093,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-menu","tag":"JnpfRelationForm","regList":[],"tableAlign":"left","span":24,"dictionaryType":"","defaultValue":""},"__vModel__":"f_customer","field":"f_customer","id":"f_customer","sortable":false,"searchable":true,"width":250,"fixed":"none","align":"left","columnBtnsList":[],"buttons":[],"required":true,"preview":false,"fmt":{"type":"","format":""},"jt":"","showText":"","display":true,"datatype":"string","isStorage":0,"totalSummary":false,"freeSign":"","showTooltip":false,"linkInfo":[],"appLinkInfo":[],"copy":false,"rules":[],"hideColumn":false,"level":0,"options":[],"props":{"label":"fullName","value":"id"},"hideInTable":false,"subTableKey":""} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671063","visibility":["pc","app"],"jnpfKey":"relationForm","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"客户","trigger":"blur","showLabel":true,"required":true,"tableName":"","renderKey":1781225671063,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-menu","tag":"JnpfRelationForm","regList":[],"tableAlign":"left","span":24,"dictionaryType":"","defaultValue":""},"__vModel__":"f_customer","field":"f_customer","id":"f_customer","sortable":false,"searchable":true,"width":250,"fixed":"none","align":"left","columnBtnsList":[],"buttons":[],"required":true,"preview":false,"fmt":{"type":"","format":""},"jt":"","showText":"","display":true,"datatype":"string","isStorage":0,"totalSummary":false,"freeSign":"","showTooltip":false,"linkInfo":[],"appLinkInfo":[],"copy":false,"rules":[],"hideColumn":false,"level":0,"options":[],"props":{"label":"fullName","value":"id"},"hideInTable":false,"subTableKey":""} \ No newline at end of file diff --git a/scripts/DateCalculateFieldBuilder-output.json b/scripts/DateCalculateFieldBuilder-output.json index ca5c107..e8f062a 100644 --- a/scripts/DateCalculateFieldBuilder-output.json +++ b/scripts/DateCalculateFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225515094","jnpfKey":"dateCalculate","label":"截止日期","tipLabel":"","showLabel":true,"required":true,"tag":"JnpfDateCalculate","tagIcon":"icon-ym icon-ym-generator-date-calculate","tableAlign":"left","tableFixed":"none","className":[],"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"renderKey":1781225515095},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请输入","format":"yyyy-MM-dd","defaultValue":"","startTime":"","endTime":"","formula":[],"isStorage":0} -======= -{"__config__":{"formId":"formItem1781225352818","jnpfKey":"dateCalculate","label":"截止日期","tipLabel":"","showLabel":true,"required":true,"tag":"JnpfDateCalculate","tagIcon":"icon-ym icon-ym-generator-date-calculate","tableAlign":"left","tableFixed":"none","className":[],"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"renderKey":1781225352819},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请输入","format":"yyyy-MM-dd","defaultValue":"","startTime":"","endTime":"","formula":[],"isStorage":0} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671221","jnpfKey":"dateCalculate","label":"截止日期","tipLabel":"","showLabel":true,"required":true,"tag":"JnpfDateCalculate","tagIcon":"icon-ym icon-ym-generator-date-calculate","tableAlign":"left","tableFixed":"none","className":[],"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"renderKey":1781225671221},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请输入","format":"yyyy-MM-dd","defaultValue":"","startTime":"","endTime":"","formula":[],"isStorage":0} \ No newline at end of file diff --git a/scripts/DatePickerFieldBuilder-output.json b/scripts/DatePickerFieldBuilder-output.json index 32307bd..dd7be1a 100644 --- a/scripts/DatePickerFieldBuilder-output.json +++ b/scripts/DatePickerFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225516103","visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"入职时间","trigger":"change","showLabel":true,"required":false,"tableName":"","renderKey":1781225516103,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-date","tag":"JnpfDatePicker","regList":[],"tableAlign":"left","span":24,"endRelationField":"","endTimeRule":false,"endTimeTarget":1,"endTimeType":1,"startRelationField":"","startTimeRule":false,"startTimeTarget":1,"startTimeType":1,"defaultCurrent":false},"__vModel__":"f_joinDate","clearable":true,"format":"yyyy-MM-dd","style":{"width":"100%"},"disabled":false,"placeholder":"请选择","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}} -======= -{"__config__":{"formId":"formItem1781225353004","visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"入职时间","trigger":"change","showLabel":true,"required":false,"tableName":"","renderKey":1781225353004,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-date","tag":"JnpfDatePicker","regList":[],"tableAlign":"left","span":24,"endRelationField":"","endTimeRule":false,"endTimeTarget":1,"endTimeType":1,"startRelationField":"","startTimeRule":false,"startTimeTarget":1,"startTimeType":1,"defaultCurrent":false},"__vModel__":"f_joinDate","clearable":true,"format":"yyyy-MM-dd","style":{"width":"100%"},"disabled":false,"placeholder":"请选择","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225672082","visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"入职时间","trigger":"change","showLabel":true,"required":false,"tableName":"","renderKey":1781225672082,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-date","tag":"JnpfDatePicker","regList":[],"tableAlign":"left","span":24,"endRelationField":"","endTimeRule":false,"endTimeTarget":1,"endTimeType":1,"startRelationField":"","startTimeRule":false,"startTimeTarget":1,"startTimeType":1,"defaultCurrent":false},"__vModel__":"f_joinDate","clearable":true,"format":"yyyy-MM-dd","style":{"width":"100%"},"disabled":false,"placeholder":"请选择","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}} \ No newline at end of file diff --git a/scripts/DividerFieldBuilder-output.json b/scripts/DividerFieldBuilder-output.json index e184d45..86ab492 100644 --- a/scripts/DividerFieldBuilder-output.json +++ b/scripts/DividerFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225514973","visibility":["pc","app"],"jnpfKey":"divider","noShow":false,"label":"","showLabel":false,"className":[],"required":false,"layout":"colFormItem","span":24,"dragDisabled":false,"tagIcon":"icon-ym icon-ym-generator-divider","tag":"JnpfDivider","defaultValue":null},"__vModel__":"f_divider","content":"我是分割线","contentPosition":"center"} -======= -{"__config__":{"formId":"formItem1781225353203","visibility":["pc","app"],"jnpfKey":"divider","noShow":false,"label":"","showLabel":false,"className":[],"required":false,"layout":"colFormItem","span":24,"dragDisabled":false,"tagIcon":"icon-ym icon-ym-generator-divider","tag":"JnpfDivider","defaultValue":null},"__vModel__":"f_divider","content":"我是分割线","contentPosition":"center"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671133","visibility":["pc","app"],"jnpfKey":"divider","noShow":false,"label":"","showLabel":false,"className":[],"required":false,"layout":"colFormItem","span":24,"dragDisabled":false,"tagIcon":"icon-ym icon-ym-generator-divider","tag":"JnpfDivider","defaultValue":null},"__vModel__":"f_divider","content":"我是分割线","contentPosition":"center"} \ No newline at end of file diff --git a/scripts/EditorFieldBuilder-output.json b/scripts/EditorFieldBuilder-output.json index 22c11e1..0f56095 100644 --- a/scripts/EditorFieldBuilder-output.json +++ b/scripts/EditorFieldBuilder-output.json @@ -1 +1 @@ -{"__config__":{"formId":"formItem1781225353079","visibility":["pc","app"],"jnpfKey":"editor","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"内容","trigger":"blur","showLabel":true,"required":true,"tableName":"","renderKey":1781225353079,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-rich-text","tag":"JnpfEditor","regList":[],"tableAlign":"left","span":24,"defaultValue":null},"__vModel__":"f_content","field":"f_content","style":{"width":"100%"},"placeholder":"请输入","disabled":false,"toolbar":["bold","italic","underline","fontSize","color","background","ul","ol","link","image","code","table"],"config":{"autoFocus":false,"readOnly":false},"height":300,"minHeight":200} \ No newline at end of file +{"__config__":{"formId":"formItem1781225672030","visibility":["pc","app"],"jnpfKey":"editor","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"内容","trigger":"blur","showLabel":true,"required":true,"tableName":"","renderKey":1781225672030,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-rich-text","tag":"JnpfEditor","regList":[],"tableAlign":"left","span":24,"defaultValue":null},"__vModel__":"f_content","field":"f_content","style":{"width":"100%"},"placeholder":"请输入","disabled":false,"toolbar":["bold","italic","underline","fontSize","color","background","ul","ol","link","image","code","table"],"config":{"autoFocus":false,"readOnly":false},"height":300,"minHeight":200} \ No newline at end of file diff --git a/scripts/GroupTitleFieldBuilder-output.json b/scripts/GroupTitleFieldBuilder-output.json index 7dd2339..2e144cd 100644 --- a/scripts/GroupTitleFieldBuilder-output.json +++ b/scripts/GroupTitleFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225515933","visibility":["pc","app"],"jnpfKey":"groupTitle","noShow":false,"label":"","showLabel":false,"className":[],"required":false,"layout":"colFormItem","span":24,"dragDisabled":false,"tagIcon":"icon-ym icon-ym-generator-group","tag":"JnpfGroupTitle","defaultValue":null},"__vModel__":"f_title","helpMessage":"","content":"基本信息","contentPosition":"left"} -======= -{"__config__":{"formId":"formItem1781225353194","visibility":["pc","app"],"jnpfKey":"groupTitle","noShow":false,"label":"","showLabel":false,"className":[],"required":false,"layout":"colFormItem","span":24,"dragDisabled":false,"tagIcon":"icon-ym icon-ym-generator-group","tag":"JnpfGroupTitle","defaultValue":null},"__vModel__":"f_title","helpMessage":"","content":"基本信息","contentPosition":"left"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671896","visibility":["pc","app"],"jnpfKey":"groupTitle","noShow":false,"label":"","showLabel":false,"className":[],"required":false,"layout":"colFormItem","span":24,"dragDisabled":false,"tagIcon":"icon-ym icon-ym-generator-group","tag":"JnpfGroupTitle","defaultValue":null},"__vModel__":"f_title","helpMessage":"","content":"基本信息","contentPosition":"left"} \ No newline at end of file diff --git a/scripts/I18nInputFieldBuilder-output.json b/scripts/I18nInputFieldBuilder-output.json index 79c0c9a..abbec68 100644 --- a/scripts/I18nInputFieldBuilder-output.json +++ b/scripts/I18nInputFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225515854","jnpfKey":"i18nInput","label":"多语言标题","tipLabel":"","showLabel":true,"required":true,"tag":"JnpfI18nInput","tagIcon":"icon-ym icon-ym-generator-i18nInput","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"renderKey":1781225515854},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请输入","prefixIcon":"","suffixIcon":"","addonBefore":"","addonAfter":"","i18n":"","maxlength":null} -======= -{"__config__":{"formId":"formItem1781225353039","jnpfKey":"i18nInput","label":"多语言标题","tipLabel":"","showLabel":true,"required":true,"tag":"JnpfI18nInput","tagIcon":"icon-ym icon-ym-generator-i18nInput","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"renderKey":1781225353039},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请输入","prefixIcon":"","suffixIcon":"","addonBefore":"","addonAfter":"","i18n":"","maxlength":null} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671798","jnpfKey":"i18nInput","label":"多语言标题","tipLabel":"","showLabel":true,"required":true,"tag":"JnpfI18nInput","tagIcon":"icon-ym icon-ym-generator-i18nInput","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"renderKey":1781225671799},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请输入","prefixIcon":"","suffixIcon":"","addonBefore":"","addonAfter":"","i18n":"","maxlength":null} \ No newline at end of file diff --git a/scripts/IframeFieldBuilder-output.json b/scripts/IframeFieldBuilder-output.json index 5601634..8d7bce7 100644 --- a/scripts/IframeFieldBuilder-output.json +++ b/scripts/IframeFieldBuilder-output.json @@ -1 +1 @@ -{"__config__":{"formId":"formItem1781225353235","visibility":["pc"],"jnpfKey":"iframe","noShow":false,"tableFixed":"none","dragDisabled":false,"className":[],"defaultValue":null,"required":false,"layout":"colFormItem","span":24,"tagIcon":"icon-ym icon-ym-generator-iframe","tag":"JnpfIframe","tableAlign":"left","showLabel":true,"label":"外链"},"__vModel__":"f_iframe","field":"f_iframe","href":"","height":300,"borderType":"solid","borderColor":"#E2E0E0","borderWidth":1} \ No newline at end of file +{"__config__":{"formId":"formItem1781225671775","visibility":["pc"],"jnpfKey":"iframe","noShow":false,"tableFixed":"none","dragDisabled":false,"className":[],"defaultValue":null,"required":false,"layout":"colFormItem","span":24,"tagIcon":"icon-ym icon-ym-generator-iframe","tag":"JnpfIframe","tableAlign":"left","showLabel":true,"label":"外链"},"__vModel__":"f_iframe","field":"f_iframe","href":"","height":300,"borderType":"solid","borderColor":"#E2E0E0","borderWidth":1} \ No newline at end of file diff --git a/scripts/InputFieldBuilder-output.json b/scripts/InputFieldBuilder-output.json index ee791cb..51d6f18 100644 --- a/scripts/InputFieldBuilder-output.json +++ b/scripts/InputFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225516081","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"姓名","trigger":"blur","showLabel":true,"required":true,"tableName":"","renderKey":1781225516081,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","tag":"JnpfInput","regList":[],"tableAlign":"left","span":24,"dictionaryType":"","defaultValue":""},"__vModel__":"f_name","field":"f_name","clearable":true,"useScan":false,"suffixIcon":"","addonAfter":"","showCount":false,"readonly":false,"maskConfig":{"prefixType":1,"useUnrealMask":false,"maskType":1,"unrealMaskLength":1,"prefixLimit":0,"suffixLimit":0,"filler":"*","prefixSpecifyChar":"","suffixType":1,"ignoreChar":"","suffixSpecifyChar":""},"useMask":false,"showPassword":false,"style":{"width":"100%"},"disabled":false,"placeholder":"请输入姓名","prefixIcon":"","addonBefore":"","on":{"change":"","blur":""},"id":"f_name","fullName":"姓名","fullNameI18nCode":[""]} -======= -{"__config__":{"formId":"formItem1781225352858","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"姓名","trigger":"blur","showLabel":true,"required":true,"tableName":"","renderKey":1781225352858,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","tag":"JnpfInput","regList":[],"tableAlign":"left","span":24,"dictionaryType":"","defaultValue":""},"__vModel__":"f_name","field":"f_name","clearable":true,"useScan":false,"suffixIcon":"","addonAfter":"","showCount":false,"readonly":false,"maskConfig":{"prefixType":1,"useUnrealMask":false,"maskType":1,"unrealMaskLength":1,"prefixLimit":0,"suffixLimit":0,"filler":"*","prefixSpecifyChar":"","suffixType":1,"ignoreChar":"","suffixSpecifyChar":""},"useMask":false,"showPassword":false,"style":{"width":"100%"},"disabled":false,"placeholder":"请输入姓名","prefixIcon":"","addonBefore":"","on":{"change":"","blur":""},"id":"f_name","fullName":"姓名","fullNameI18nCode":[""]} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225672064","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"姓名","trigger":"blur","showLabel":true,"required":true,"tableName":"","renderKey":1781225672064,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","tag":"JnpfInput","regList":[],"tableAlign":"left","span":24,"dictionaryType":"","defaultValue":""},"__vModel__":"f_name","field":"f_name","clearable":true,"useScan":false,"suffixIcon":"","addonAfter":"","showCount":false,"readonly":false,"maskConfig":{"prefixType":1,"useUnrealMask":false,"maskType":1,"unrealMaskLength":1,"prefixLimit":0,"suffixLimit":0,"filler":"*","prefixSpecifyChar":"","suffixType":1,"ignoreChar":"","suffixSpecifyChar":""},"useMask":false,"showPassword":false,"style":{"width":"100%"},"disabled":false,"placeholder":"请输入姓名","prefixIcon":"","addonBefore":"","on":{"change":"","blur":""},"id":"f_name","fullName":"姓名","fullNameI18nCode":[""]} \ No newline at end of file diff --git a/scripts/InputNumberFieldBuilder-output.json b/scripts/InputNumberFieldBuilder-output.json index d5840fa..7e32005 100644 --- a/scripts/InputNumberFieldBuilder-output.json +++ b/scripts/InputNumberFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":1781225515181,"visibility":["pc","app"],"jnpfKey":"inputNumber","noShow":false,"parentVModel":"","tipLabel":"","dragDisabled":false,"className":[],"label":"年龄","trigger":["blur","change"],"showLabel":true,"required":true,"tableName":"","renderKey":1781225515181,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-number","isSubTable":false,"tag":"JnpfInputNumber","regList":[],"span":24},"controls":true,"__vModel__":"f_age","style":{"width":"100%"},"step":1,"disabled":false,"placeholder":"请输入","thousands":false,"isAmountChinese":false,"addonBefore":"","addonAfter":"","on":{"change":"","blur":""}} -======= -{"__config__":{"formId":1781225353160,"visibility":["pc","app"],"jnpfKey":"inputNumber","noShow":false,"parentVModel":"","tipLabel":"","dragDisabled":false,"className":[],"label":"年龄","trigger":["blur","change"],"showLabel":true,"required":true,"tableName":"","renderKey":1781225353160,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-number","isSubTable":false,"tag":"JnpfInputNumber","regList":[],"span":24},"controls":true,"__vModel__":"f_age","style":{"width":"100%"},"step":1,"disabled":false,"placeholder":"请输入","thousands":false,"isAmountChinese":false,"addonBefore":"","addonAfter":"","on":{"change":"","blur":""}} ->>>>>>> v13-f1-form +{"__config__":{"formId":1781225671357,"visibility":["pc","app"],"jnpfKey":"inputNumber","noShow":false,"parentVModel":"","tipLabel":"","dragDisabled":false,"className":[],"label":"年龄","trigger":["blur","change"],"showLabel":true,"required":true,"tableName":"","renderKey":1781225671357,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-number","isSubTable":false,"tag":"JnpfInputNumber","regList":[],"span":24},"controls":true,"__vModel__":"f_age","style":{"width":"100%"},"step":1,"disabled":false,"placeholder":"请输入","thousands":false,"isAmountChinese":false,"addonBefore":"","addonAfter":"","on":{"change":"","blur":""}} \ No newline at end of file diff --git a/scripts/InputTableFieldBuilder-output.json b/scripts/InputTableFieldBuilder-output.json index a56f5eb..3300ba7 100644 --- a/scripts/InputTableFieldBuilder-output.json +++ b/scripts/InputTableFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225516286","jnpfKey":"inputTable","label":"明细","tipLabel":"","labelWidth":null,"showLabel":true,"required":true,"tag":"JnpfInputTable","tagIcon":"icon-ym icon-ym-generator-table","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":[],"layout":"rowFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"noShow":false,"showTitle":true,"children":[],"tableName":"","complexHeaderList":[]},"disabled":false,"showSummary":false,"summaryField":[],"isNumLimit":false,"numLimit":1000,"defaultValue":[],"columnBtnsList":[{"value":"copy","label":"复制","labelI18nCode":"common.copyText","show":true,"btnType":"primary","btnIcon":"icon-ym icon-ym-btn-edit"},{"value":"remove","label":"删除","labelI18nCode":"common.delText","show":true,"btnType":"danger","btnIcon":"icon-ym icon-ym-btn-clearn","showConfirm":true}],"footerBtnsList":[{"value":"add","label":"添加","labelI18nCode":"common.add1Text","show":true,"btnType":"primary","btnIcon":"icon-ym icon-ym-btn-add"},{"value":"batchRemove","label":"批量删除","labelI18nCode":"common.batchDelText","show":true,"btnType":"danger","btnIcon":"icon-ym icon-ym-btn-clearn","showConfirm":true}],"layoutType":"table","defaultExpandAll":true,"hasPage":false,"pageSize":10} -======= -{"__config__":{"formId":"formItem1781225352753","jnpfKey":"inputTable","label":"明细","tipLabel":"","labelWidth":null,"showLabel":true,"required":true,"tag":"JnpfInputTable","tagIcon":"icon-ym icon-ym-generator-table","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":[],"layout":"rowFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"noShow":false,"showTitle":true,"children":[],"tableName":"","complexHeaderList":[]},"disabled":false,"showSummary":false,"summaryField":[],"isNumLimit":false,"numLimit":1000,"defaultValue":[],"columnBtnsList":[{"value":"copy","label":"复制","labelI18nCode":"common.copyText","show":true,"btnType":"primary","btnIcon":"icon-ym icon-ym-btn-edit"},{"value":"remove","label":"删除","labelI18nCode":"common.delText","show":true,"btnType":"danger","btnIcon":"icon-ym icon-ym-btn-clearn","showConfirm":true}],"footerBtnsList":[{"value":"add","label":"添加","labelI18nCode":"common.add1Text","show":true,"btnType":"primary","btnIcon":"icon-ym icon-ym-btn-add"},{"value":"batchRemove","label":"批量删除","labelI18nCode":"common.batchDelText","show":true,"btnType":"danger","btnIcon":"icon-ym icon-ym-btn-clearn","showConfirm":true}],"layoutType":"table","defaultExpandAll":true,"hasPage":false,"pageSize":10} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225672268","jnpfKey":"inputTable","label":"明细","tipLabel":"","labelWidth":null,"showLabel":true,"required":true,"tag":"JnpfInputTable","tagIcon":"icon-ym icon-ym-generator-table","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":[],"layout":"rowFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"noShow":false,"showTitle":true,"children":[],"tableName":"","complexHeaderList":[]},"disabled":false,"showSummary":false,"summaryField":[],"isNumLimit":false,"numLimit":1000,"defaultValue":[],"columnBtnsList":[{"value":"copy","label":"复制","labelI18nCode":"common.copyText","show":true,"btnType":"primary","btnIcon":"icon-ym icon-ym-btn-edit"},{"value":"remove","label":"删除","labelI18nCode":"common.delText","show":true,"btnType":"danger","btnIcon":"icon-ym icon-ym-btn-clearn","showConfirm":true}],"footerBtnsList":[{"value":"add","label":"添加","labelI18nCode":"common.add1Text","show":true,"btnType":"primary","btnIcon":"icon-ym icon-ym-btn-add"},{"value":"batchRemove","label":"批量删除","labelI18nCode":"common.batchDelText","show":true,"btnType":"danger","btnIcon":"icon-ym icon-ym-btn-clearn","showConfirm":true}],"layoutType":"table","defaultExpandAll":true,"hasPage":false,"pageSize":10} \ No newline at end of file diff --git a/scripts/LinkFieldBuilder-output.json b/scripts/LinkFieldBuilder-output.json index 1a6773a..97bbe87 100644 --- a/scripts/LinkFieldBuilder-output.json +++ b/scripts/LinkFieldBuilder-output.json @@ -1 +1 @@ -{"__config__":{"formId":"formItem1781225353218","visibility":["pc","app"],"jnpfKey":"link","noShow":false,"tableFixed":"none","dragDisabled":false,"className":[],"required":false,"layout":"colFormItem","span":24,"tagIcon":"icon-ym icon-ym-generator-link","tag":"JnpfLink","tableAlign":"left","showLabel":false,"label":""},"__vModel__":"f_link","field":"f_link","on":{"click":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"content":"文本链接","href":"","target":"_self","textStyle":{"text-align":"left"}} \ No newline at end of file +{"__config__":{"formId":"formItem1781225671886","visibility":["pc","app"],"jnpfKey":"link","noShow":false,"tableFixed":"none","dragDisabled":false,"className":[],"required":false,"layout":"colFormItem","span":24,"tagIcon":"icon-ym icon-ym-generator-link","tag":"JnpfLink","tableAlign":"left","showLabel":false,"label":""},"__vModel__":"f_link","field":"f_link","on":{"click":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"content":"文本链接","href":"","target":"_self","textStyle":{"text-align":"left"}} \ No newline at end of file diff --git a/scripts/LocationFieldBuilder-output.json b/scripts/LocationFieldBuilder-output.json index 072514a..cef5e94 100644 --- a/scripts/LocationFieldBuilder-output.json +++ b/scripts/LocationFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225516311","jnpfKey":"location","label":"位置","tipLabel":"","showLabel":true,"tag":"JnpfLocation","tagIcon":"icon-ym icon-ym-generator-location","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","defaultCurrent":false,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225516311},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请选择位置","selectType":"point","apiKey":"","autoLocation":false,"level":"point","__vModel__":"f_location"} -======= -{"__config__":{"formId":"formItem1781225353481","jnpfKey":"location","label":"位置","tipLabel":"","showLabel":true,"tag":"JnpfLocation","tagIcon":"icon-ym icon-ym-generator-location","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","defaultCurrent":false,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225353481},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请选择位置","selectType":"point","apiKey":"","autoLocation":false,"level":"point","__vModel__":"f_location"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225672291","jnpfKey":"location","label":"位置","tipLabel":"","showLabel":true,"tag":"JnpfLocation","tagIcon":"icon-ym icon-ym-generator-location","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","defaultCurrent":false,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225672291},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请选择位置","selectType":"point","apiKey":"","autoLocation":false,"level":"point","__vModel__":"f_location"} \ No newline at end of file diff --git a/scripts/OcrFieldBuilder-output.json b/scripts/OcrFieldBuilder-output.json index 5152464..03f3297 100644 --- a/scripts/OcrFieldBuilder-output.json +++ b/scripts/OcrFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225515979","jnpfKey":"textOcr","label":"文本识别","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfOcr","tagIcon":"icon-ym icon-ym-ocr-text","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":null,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","renderKey":1781225515980,"noShow":false,"regList":[],"trigger":"blur","storageType":1,"transferList":[]},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"ocrType":"textOcr","disabled":false,"transferList":[],"__vModel__":"f_ocr","id":"f_ocr"} -======= -{"__config__":{"formId":"formItem1781225353278","jnpfKey":"textOcr","label":"文本识别","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfOcr","tagIcon":"icon-ym icon-ym-ocr-text","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":null,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","renderKey":1781225353278,"noShow":false,"regList":[],"trigger":"blur","storageType":1,"transferList":[]},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"ocrType":"textOcr","disabled":false,"transferList":[],"__vModel__":"f_ocr","id":"f_ocr"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671972","jnpfKey":"textOcr","label":"文本识别","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfOcr","tagIcon":"icon-ym icon-ym-ocr-text","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":null,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","renderKey":1781225671972,"noShow":false,"regList":[],"trigger":"blur","storageType":1,"transferList":[]},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"ocrType":"textOcr","disabled":false,"transferList":[],"__vModel__":"f_ocr","id":"f_ocr"} \ No newline at end of file diff --git a/scripts/OrgRightFieldBuilder-output.json b/scripts/OrgRightFieldBuilder-output.json index 36d91e0..40bfdc7 100644 --- a/scripts/OrgRightFieldBuilder-output.json +++ b/scripts/OrgRightFieldBuilder-output.json @@ -1 +1 @@ -{"__config__":{"formId":"formItem1781225353249","visibility":["pc","app"],"jnpfKey":"orgRight","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"所属组织","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225353250,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-company","tag":"JnpfOrganizeSelect","regList":[],"tableAlign":"left","span":24,"defaultValue":"","defaultCurrent":false},"__vModel__":"f_org","field":"f_org","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"style":{"width":"100%"},"placeholder":"请选择","selectType":"all","ableIds":[],"multiple":false,"clearable":true,"disabled":false,"id":"f_org","fullName":"所属组织","fullNameI18nCode":[""],"relationField":"","orgRelationField":"","roleRelationField":""} \ No newline at end of file +{"__config__":{"formId":"formItem1781225671445","visibility":["pc","app"],"jnpfKey":"orgRight","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"所属组织","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225671445,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-company","tag":"JnpfOrganizeSelect","regList":[],"tableAlign":"left","span":24,"defaultValue":"","defaultCurrent":false},"__vModel__":"f_org","field":"f_org","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"style":{"width":"100%"},"placeholder":"请选择","selectType":"all","ableIds":[],"multiple":false,"clearable":true,"disabled":false,"id":"f_org","fullName":"所属组织","fullNameI18nCode":[""],"relationField":"","orgRelationField":"","roleRelationField":""} \ No newline at end of file diff --git a/scripts/OrganizeFieldBuilder-output.json b/scripts/OrganizeFieldBuilder-output.json index cbeea00..ebcf4bd 100644 --- a/scripts/OrganizeFieldBuilder-output.json +++ b/scripts/OrganizeFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225516384","jnpfKey":"organizeSelect","label":"部门","tipLabel":"","showLabel":true,"tag":"JnpfOrganizeSelect","tagIcon":"icon-ym icon-ym-generator-company","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","defaultCurrent":false,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225516384},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请选择","selectType":"all","ableIds":[],"multiple":false,"clearable":true,"filterable":false,"disabled":false,"__vModel__":"f_dep_select"} -======= -{"__config__":{"formId":"formItem1781225352937","jnpfKey":"organizeSelect","label":"部门","tipLabel":"","showLabel":true,"tag":"JnpfOrganizeSelect","tagIcon":"icon-ym icon-ym-generator-company","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","defaultCurrent":false,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225352937},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请选择","selectType":"all","ableIds":[],"multiple":false,"clearable":true,"filterable":false,"disabled":false,"__vModel__":"f_dep_select"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225672354","jnpfKey":"organizeSelect","label":"部门","tipLabel":"","showLabel":true,"tag":"JnpfOrganizeSelect","tagIcon":"icon-ym icon-ym-generator-company","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","defaultCurrent":false,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225672354},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请选择","selectType":"all","ableIds":[],"multiple":false,"clearable":true,"filterable":false,"disabled":false,"__vModel__":"f_dep_select"} \ No newline at end of file diff --git a/scripts/PopupAttrFieldBuilder-output.json b/scripts/PopupAttrFieldBuilder-output.json index 2e9d2b7..fea65d7 100644 --- a/scripts/PopupAttrFieldBuilder-output.json +++ b/scripts/PopupAttrFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225516447","jnpfKey":"popupAttr","label":"弹窗选择属性","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfPopupAttr","tagIcon":"icon-ym icon-ym-generator-popup-attr","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","required":false,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"noShow":false},"style":{"width":"100%"},"showField":"f_name","relationField":"f_id","isStorage":1,"__vModel__":"f_popup_attr","id":"f_popup_attr"} -======= -{"__config__":{"formId":"formItem1781225353245","jnpfKey":"popupAttr","label":"弹窗选择属性","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfPopupAttr","tagIcon":"icon-ym icon-ym-generator-popup-attr","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","required":false,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"noShow":false},"style":{"width":"100%"},"showField":"f_name","relationField":"f_id","isStorage":1,"__vModel__":"f_popup_attr","id":"f_popup_attr"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225672399","jnpfKey":"popupAttr","label":"弹窗选择属性","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfPopupAttr","tagIcon":"icon-ym icon-ym-generator-popup-attr","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","required":false,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"noShow":false},"style":{"width":"100%"},"showField":"f_name","relationField":"f_id","isStorage":1,"__vModel__":"f_popup_attr","id":"f_popup_attr"} \ No newline at end of file diff --git a/scripts/PopupSelectFieldBuilder-output.json b/scripts/PopupSelectFieldBuilder-output.json index 7334db0..296916f 100644 --- a/scripts/PopupSelectFieldBuilder-output.json +++ b/scripts/PopupSelectFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225515494","jnpfKey":"popupSelect","label":"弹窗选择","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfPopupSelect","tagIcon":"icon-ym icon-ym-generator-popup","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","transferList":[],"useCache":true},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请选择","interfaceId":"iface002","interfaceName":"部门数据接口","templateJson":[],"hasPage":false,"pageSize":20,"extraOptions":[],"columnOptions":[{"value":"f_id","label":"ID"},{"value":"f_name","label":"部门名"}],"propsValue":"f_id","relationField":"f_name","popupType":"dialog","popupTitle":"选择数据","popupWidth":"800px","disabled":false,"clearable":true,"__vModel__":"f_popup_sel","id":"f_popup_sel","multiple":false,"filterable":false} -======= -{"__config__":{"formId":"formItem1781225353456","jnpfKey":"popupSelect","label":"弹窗选择","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfPopupSelect","tagIcon":"icon-ym icon-ym-generator-popup","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","transferList":[],"useCache":true},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请选择","interfaceId":"iface002","interfaceName":"部门数据接口","templateJson":[],"hasPage":false,"pageSize":20,"extraOptions":[],"columnOptions":[{"value":"f_id","label":"ID"},{"value":"f_name","label":"部门名"}],"propsValue":"f_id","relationField":"f_name","popupType":"dialog","popupTitle":"选择数据","popupWidth":"800px","disabled":false,"clearable":true,"__vModel__":"f_popup_sel","id":"f_popup_sel","multiple":false,"filterable":false} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671591","jnpfKey":"popupSelect","label":"弹窗选择","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfPopupSelect","tagIcon":"icon-ym icon-ym-generator-popup","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","transferList":[],"useCache":true},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请选择","interfaceId":"iface002","interfaceName":"部门数据接口","templateJson":[],"hasPage":false,"pageSize":20,"extraOptions":[],"columnOptions":[{"value":"f_id","label":"ID"},{"value":"f_name","label":"部门名"}],"propsValue":"f_id","relationField":"f_name","popupType":"dialog","popupTitle":"选择数据","popupWidth":"800px","disabled":false,"clearable":true,"__vModel__":"f_popup_sel","id":"f_popup_sel","multiple":false,"filterable":false} \ No newline at end of file diff --git a/scripts/PopupTableFieldBuilder-output.json b/scripts/PopupTableFieldBuilder-output.json index 38a6971..b4c854e 100644 --- a/scripts/PopupTableFieldBuilder-output.json +++ b/scripts/PopupTableFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225516185","jnpfKey":"popupTableSelect","label":"下拉表格","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfPopupTableSelect","tagIcon":"icon-ym icon-ym-generator-popupTableSelect","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","useCache":true},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请选择","interfaceId":"iface001","interfaceName":"用户数据接口","templateJson":[],"hasPage":false,"pageSize":20,"extraOptions":[],"columnOptions":[{"value":"f_id","label":"ID"},{"value":"f_name","label":"姓名"}],"propsValue":"f_id","relationField":"f_name","popupType":"popover","popupTitle":"选择数据","popupWidth":"800px","disabled":false,"clearable":true,"__vModel__":"f_popup_tbl","id":"f_popup_tbl","multiple":false,"filterable":true} -======= -{"__config__":{"formId":"formItem1781225352662","jnpfKey":"popupTableSelect","label":"下拉表格","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfPopupTableSelect","tagIcon":"icon-ym icon-ym-generator-popupTableSelect","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","useCache":true},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请选择","interfaceId":"iface001","interfaceName":"用户数据接口","templateJson":[],"hasPage":false,"pageSize":20,"extraOptions":[],"columnOptions":[{"value":"f_id","label":"ID"},{"value":"f_name","label":"姓名"}],"propsValue":"f_id","relationField":"f_name","popupType":"popover","popupTitle":"选择数据","popupWidth":"800px","disabled":false,"clearable":true,"__vModel__":"f_popup_tbl","id":"f_popup_tbl","multiple":false,"filterable":true} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225672151","jnpfKey":"popupTableSelect","label":"下拉表格","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfPopupTableSelect","tagIcon":"icon-ym icon-ym-generator-popupTableSelect","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","useCache":true},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请选择","interfaceId":"iface001","interfaceName":"用户数据接口","templateJson":[],"hasPage":false,"pageSize":20,"extraOptions":[],"columnOptions":[{"value":"f_id","label":"ID"},{"value":"f_name","label":"姓名"}],"propsValue":"f_id","relationField":"f_name","popupType":"popover","popupTitle":"选择数据","popupWidth":"800px","disabled":false,"clearable":true,"__vModel__":"f_popup_tbl","id":"f_popup_tbl","multiple":false,"filterable":true} \ No newline at end of file diff --git a/scripts/QrcodeFieldBuilder-output.json b/scripts/QrcodeFieldBuilder-output.json index af28ced..733502f 100644 --- a/scripts/QrcodeFieldBuilder-output.json +++ b/scripts/QrcodeFieldBuilder-output.json @@ -1 +1 @@ -{"__config__":{"formId":"formItem1781225352702","visibility":["pc","app"],"jnpfKey":"qrcode","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"defaultValue":"","layout":"colFormItem","span":24,"tagIcon":"icon-ym icon-ym-generator-qrcode","tag":"JnpfQrcode","showLabel":true,"label":"二维码","regList":[],"tableName":""},"__vModel__":"f_qrcode","field":"f_qrcode","colorDark":"#000","colorLight":"#fff","width":100,"dataType":"static","staticText":"二维码","joint":"","relationField":""} \ No newline at end of file +{"__config__":{"formId":"formItem1781225671402","visibility":["pc","app"],"jnpfKey":"qrcode","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"defaultValue":"","layout":"colFormItem","span":24,"tagIcon":"icon-ym icon-ym-generator-qrcode","tag":"JnpfQrcode","showLabel":true,"label":"二维码","regList":[],"tableName":""},"__vModel__":"f_qrcode","field":"f_qrcode","colorDark":"#000","colorLight":"#fff","width":100,"dataType":"static","staticText":"二维码","joint":"","relationField":""} \ No newline at end of file diff --git a/scripts/RadioFieldBuilder-output.json b/scripts/RadioFieldBuilder-output.json index 782d120..e311301 100644 --- a/scripts/RadioFieldBuilder-output.json +++ b/scripts/RadioFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225515747","visibility":["pc","app"],"jnpfKey":"radio","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"性别","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225515747,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","tag":"JnpfRadio","regList":[],"tableAlign":"left","span":24,"defaultValue":null,"dataType":"static","dictionaryType":"","propsUrl":"","propsName":"","useCache":true,"templateJson":[]},"__vModel__":"f_gender","field":"f_gender","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"style":{"width":"100%"},"options":[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],"props":{"label":"fullName","value":"id"},"direction":"horizontal","optionType":"default","buttonStyle":"solid","size":"default","disabled":false,"id":"f_gender","fullName":"性别","fullNameI18nCode":[""],"dropdownClassName":"","maxTagCount":null} -======= -{"__config__":{"formId":"formItem1781225352890","visibility":["pc","app"],"jnpfKey":"radio","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"性别","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225352890,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","tag":"JnpfRadio","regList":[],"tableAlign":"left","span":24,"defaultValue":null,"dataType":"static","dictionaryType":"","propsUrl":"","propsName":"","useCache":true,"templateJson":[]},"__vModel__":"f_gender","field":"f_gender","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"style":{"width":"100%"},"options":[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],"props":{"label":"fullName","value":"id"},"direction":"horizontal","optionType":"default","buttonStyle":"solid","size":"default","disabled":false,"id":"f_gender","fullName":"性别","fullNameI18nCode":[""],"dropdownClassName":"","maxTagCount":null} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671728","visibility":["pc","app"],"jnpfKey":"radio","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"性别","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225671728,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","tag":"JnpfRadio","regList":[],"tableAlign":"left","span":24,"defaultValue":null,"dataType":"static","dictionaryType":"","propsUrl":"","propsName":"","useCache":true,"templateJson":[]},"__vModel__":"f_gender","field":"f_gender","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"style":{"width":"100%"},"options":[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],"props":{"label":"fullName","value":"id"},"direction":"horizontal","optionType":"default","buttonStyle":"solid","size":"default","disabled":false,"id":"f_gender","fullName":"性别","fullNameI18nCode":[""],"dropdownClassName":"","maxTagCount":null} \ No newline at end of file diff --git a/scripts/RateFieldBuilder-output.json b/scripts/RateFieldBuilder-output.json index 4a3c328..4b1238a 100644 --- a/scripts/RateFieldBuilder-output.json +++ b/scripts/RateFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225516121","jnpfKey":"rate","label":"评分","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfRate","tagIcon":"icon-ym icon-ym-generator-rate","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":0,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225516121},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"count":5,"allowHalf":false,"disabled":false,"__vModel__":"f_rate","id":"f_rate"} -======= -{"__config__":{"formId":"formItem1781225353267","jnpfKey":"rate","label":"评分","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfRate","tagIcon":"icon-ym icon-ym-generator-rate","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":0,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225353267},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"count":5,"allowHalf":false,"disabled":false,"__vModel__":"f_rate","id":"f_rate"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225672096","jnpfKey":"rate","label":"评分","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfRate","tagIcon":"icon-ym icon-ym-generator-rate","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":0,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225672096},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"count":5,"allowHalf":false,"disabled":false,"__vModel__":"f_rate","id":"f_rate"} \ No newline at end of file diff --git a/scripts/RelationFormAttrFieldBuilder-output.json b/scripts/RelationFormAttrFieldBuilder-output.json index 8cf1ca5..606cc65 100644 --- a/scripts/RelationFormAttrFieldBuilder-output.json +++ b/scripts/RelationFormAttrFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225515207","jnpfKey":"relationFormAttr","label":"关联表单属性","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfRelationFormAttr","tagIcon":"icon-ym icon-ym-generator-nature","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","required":false,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"noShow":false},"style":{"width":"100%"},"showField":"f_full_name","relationField":"f_id","isStorage":1,"__vModel__":"f_relation_attr","id":"f_relation_attr"} -======= -{"__config__":{"formId":"formItem1781225353387","jnpfKey":"relationFormAttr","label":"关联表单属性","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfRelationFormAttr","tagIcon":"icon-ym icon-ym-generator-nature","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","required":false,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"noShow":false},"style":{"width":"100%"},"showField":"f_full_name","relationField":"f_id","isStorage":1,"__vModel__":"f_relation_attr","id":"f_relation_attr"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671381","jnpfKey":"relationFormAttr","label":"关联表单属性","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfRelationFormAttr","tagIcon":"icon-ym icon-ym-generator-nature","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","required":false,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"noShow":false},"style":{"width":"100%"},"showField":"f_full_name","relationField":"f_id","isStorage":1,"__vModel__":"f_relation_attr","id":"f_relation_attr"} \ No newline at end of file diff --git a/scripts/RelationFormFieldBuilder-output.json b/scripts/RelationFormFieldBuilder-output.json index ec46d52..5c7cd99 100644 --- a/scripts/RelationFormFieldBuilder-output.json +++ b/scripts/RelationFormFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225516426","jnpfKey":"relationForm","label":"关联表单","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfRelationForm","tagIcon":"icon-ym icon-ym-generator-menu","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225516426,"transferList":[]},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请选择","modelId":"form123","relationField":"f_name","hasPage":false,"pageSize":20,"queryType":0,"propsValue":"f_id","extraOptions":[],"columnOptions":[{"value":"f_id","label":"ID"},{"value":"f_name","label":"名称"}],"clearable":true,"popupType":"dialog","popupTitle":"选择数据","popupWidth":"800px","filterable":false,"disabled":false,"__vModel__":"f_relate","id":"f_relate","multiple":false,"actionType":"table"} -======= -{"__config__":{"formId":"formItem1781225353417","jnpfKey":"relationForm","label":"关联表单","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfRelationForm","tagIcon":"icon-ym icon-ym-generator-menu","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225353417,"transferList":[]},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请选择","modelId":"form123","relationField":"f_name","hasPage":false,"pageSize":20,"queryType":0,"propsValue":"f_id","extraOptions":[],"columnOptions":[{"value":"f_id","label":"ID"},{"value":"f_name","label":"名称"}],"clearable":true,"popupType":"dialog","popupTitle":"选择数据","popupWidth":"800px","filterable":false,"disabled":false,"__vModel__":"f_relate","id":"f_relate","multiple":false,"actionType":"table"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225672385","jnpfKey":"relationForm","label":"关联表单","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfRelationForm","tagIcon":"icon-ym icon-ym-generator-menu","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225672385,"transferList":[]},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"placeholder":"请选择","modelId":"form123","relationField":"f_name","hasPage":false,"pageSize":20,"queryType":0,"propsValue":"f_id","extraOptions":[],"columnOptions":[{"value":"f_id","label":"ID"},{"value":"f_name","label":"名称"}],"clearable":true,"popupType":"dialog","popupTitle":"选择数据","popupWidth":"800px","filterable":false,"disabled":false,"__vModel__":"f_relate","id":"f_relate","multiple":false,"actionType":"table"} \ No newline at end of file diff --git a/scripts/RelationQueryFieldBuilder-output.json b/scripts/RelationQueryFieldBuilder-output.json index 386d824..91f1bd9 100644 --- a/scripts/RelationQueryFieldBuilder-output.json +++ b/scripts/RelationQueryFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225515663","jnpfKey":"relationQuery","label":"关联查询","tipLabel":"","labelWidth":null,"showLabel":false,"tag":"JnpfRelationQuery","tagIcon":"icon-ym icon-ym-generator-relationQuery","className":[],"defaultValue":null,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc"],"noShow":false},"style":{"width":"100%"},"title":"关联查询","showTitle":true,"modelId":"model001","columnOptions":[{"value":"f_id","label":"ID"},{"value":"f_name","label":"名称"}],"defaultEmpty":true,"sortRule":[],"queryRule":{"conditionList":[],"matchLogic":"and"},"hasPage":false,"pageSize":20,"__vModel__":"f_rel_query","id":"f_rel_query"} -======= -{"__config__":{"formId":"formItem1781225353375","jnpfKey":"relationQuery","label":"关联查询","tipLabel":"","labelWidth":null,"showLabel":false,"tag":"JnpfRelationQuery","tagIcon":"icon-ym icon-ym-generator-relationQuery","className":[],"defaultValue":null,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc"],"noShow":false},"style":{"width":"100%"},"title":"关联查询","showTitle":true,"modelId":"model001","columnOptions":[{"value":"f_id","label":"ID"},{"value":"f_name","label":"名称"}],"defaultEmpty":true,"sortRule":[],"queryRule":{"conditionList":[],"matchLogic":"and"},"hasPage":false,"pageSize":20,"__vModel__":"f_rel_query","id":"f_rel_query"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671675","jnpfKey":"relationQuery","label":"关联查询","tipLabel":"","labelWidth":null,"showLabel":false,"tag":"JnpfRelationQuery","tagIcon":"icon-ym icon-ym-generator-relationQuery","className":[],"defaultValue":null,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc"],"noShow":false},"style":{"width":"100%"},"title":"关联查询","showTitle":true,"modelId":"model001","columnOptions":[{"value":"f_id","label":"ID"},{"value":"f_name","label":"名称"}],"defaultEmpty":true,"sortRule":[],"queryRule":{"conditionList":[],"matchLogic":"and"},"hasPage":false,"pageSize":20,"__vModel__":"f_rel_query","id":"f_rel_query"} \ No newline at end of file diff --git a/scripts/RowFieldBuilder-output.json b/scripts/RowFieldBuilder-output.json index ca27210..acf257b 100644 --- a/scripts/RowFieldBuilder-output.json +++ b/scripts/RowFieldBuilder-output.json @@ -1 +1 @@ -{"__config__":{"formId":"formItem1781225353088","visibility":["pc","app"],"jnpfKey":"row","noShow":false,"dragDisabled":false,"className":[],"layout":"rowFormItem","span":24,"tagIcon":"icon-ym icon-ym-generator-layout","tag":"ARow","showLabel":false,"label":"","required":false},"type":"default","justify":"start","align":"top"} \ No newline at end of file +{"__config__":{"formId":"formItem1781225671618","visibility":["pc","app"],"jnpfKey":"row","noShow":false,"dragDisabled":false,"className":[],"layout":"rowFormItem","span":24,"tagIcon":"icon-ym icon-ym-generator-layout","tag":"ARow","showLabel":false,"label":"","required":false},"type":"default","justify":"start","align":"top"} \ No newline at end of file diff --git a/scripts/SelectFieldBuilder-output.json b/scripts/SelectFieldBuilder-output.json index 8a120b8..1b988cd 100644 --- a/scripts/SelectFieldBuilder-output.json +++ b/scripts/SelectFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225515400","visibility":["pc","app"],"jnpfKey":"select","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"状态","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225515400,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","tag":"JnpfSelect","regList":[],"tableAlign":"left","span":24,"dictionaryType":"","defaultValue":"","dataType":"static","propsUrl":"","propsName":"","useCache":true,"templateJson":[]},"__vModel__":"f_status","field":"f_status","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"style":{"width":"100%"},"options":[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],"props":{"label":"fullName","value":"id"},"placeholder":"请选择","clearable":true,"disabled":false,"filterable":false,"multiple":false,"id":"f_status","fullName":"状态","fullNameI18nCode":[""],"dropdownClassName":"","maxTagCount":null,"allowCreate":false,"defaultActiveFirstOption":true} -======= -{"__config__":{"formId":"formItem1781225353354","visibility":["pc","app"],"jnpfKey":"select","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"状态","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225353354,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","tag":"JnpfSelect","regList":[],"tableAlign":"left","span":24,"dictionaryType":"","defaultValue":"","dataType":"static","propsUrl":"","propsName":"","useCache":true,"templateJson":[]},"__vModel__":"f_status","field":"f_status","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"style":{"width":"100%"},"options":[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],"props":{"label":"fullName","value":"id"},"placeholder":"请选择","clearable":true,"disabled":false,"filterable":false,"multiple":false,"id":"f_status","fullName":"状态","fullNameI18nCode":[""],"dropdownClassName":"","maxTagCount":null,"allowCreate":false,"defaultActiveFirstOption":true} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671516","visibility":["pc","app"],"jnpfKey":"select","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"状态","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225671516,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","tag":"JnpfSelect","regList":[],"tableAlign":"left","span":24,"dictionaryType":"","defaultValue":"","dataType":"static","propsUrl":"","propsName":"","useCache":true,"templateJson":[]},"__vModel__":"f_status","field":"f_status","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"style":{"width":"100%"},"options":[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],"props":{"label":"fullName","value":"id"},"placeholder":"请选择","clearable":true,"disabled":false,"filterable":false,"multiple":false,"id":"f_status","fullName":"状态","fullNameI18nCode":[""],"dropdownClassName":"","maxTagCount":null,"allowCreate":false,"defaultActiveFirstOption":true} \ No newline at end of file diff --git a/scripts/SignFieldBuilder-output.json b/scripts/SignFieldBuilder-output.json index 3410cf0..055a6db 100644 --- a/scripts/SignFieldBuilder-output.json +++ b/scripts/SignFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225516464","jnpfKey":"sign","label":"手写签名","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfSign","tagIcon":"icon-ym icon-ym-signature","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","defaultCurrent":false,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","renderKey":1781225516464,"noShow":false,"regList":[],"trigger":"change"},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"isInvoke":true,"disabled":false,"isDefault":0,"signTip":"添加签名","submitOnConfirm":false,"__vModel__":"f_sign","id":"f_sign"} -======= -{"__config__":{"formId":"formItem1781225353228","jnpfKey":"sign","label":"手写签名","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfSign","tagIcon":"icon-ym icon-ym-signature","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","defaultCurrent":false,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","renderKey":1781225353228,"noShow":false,"regList":[],"trigger":"change"},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"isInvoke":true,"disabled":false,"isDefault":0,"signTip":"添加签名","submitOnConfirm":false,"__vModel__":"f_sign","id":"f_sign"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225672415","jnpfKey":"sign","label":"手写签名","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfSign","tagIcon":"icon-ym icon-ym-signature","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","defaultCurrent":false,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","renderKey":1781225672415,"noShow":false,"regList":[],"trigger":"change"},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"isInvoke":true,"disabled":false,"isDefault":0,"signTip":"添加签名","submitOnConfirm":false,"__vModel__":"f_sign","id":"f_sign"} \ No newline at end of file diff --git a/scripts/SignatureFieldBuilder-output.json b/scripts/SignatureFieldBuilder-output.json index e7459f9..4891237 100644 --- a/scripts/SignatureFieldBuilder-output.json +++ b/scripts/SignatureFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225516142","jnpfKey":"signature","label":"电子签章","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfSignature","tagIcon":"icon-ym icon-ym-signature1","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","defaultCurrent":false,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","renderKey":1781225516142,"noShow":false,"regList":[],"trigger":"change"},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"ableIds":[],"disabled":false,"signTip":"电子签章","__vModel__":"f_signature","id":"f_signature"} -======= -{"__config__":{"formId":"formItem1781225352952","jnpfKey":"signature","label":"电子签章","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfSignature","tagIcon":"icon-ym icon-ym-signature1","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","defaultCurrent":false,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","renderKey":1781225352952,"noShow":false,"regList":[],"trigger":"change"},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"ableIds":[],"disabled":false,"signTip":"电子签章","__vModel__":"f_signature","id":"f_signature"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225672109","jnpfKey":"signature","label":"电子签章","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfSignature","tagIcon":"icon-ym icon-ym-signature1","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":"","defaultCurrent":false,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","renderKey":1781225672109,"noShow":false,"regList":[],"trigger":"change"},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"ableIds":[],"disabled":false,"signTip":"电子签章","__vModel__":"f_signature","id":"f_signature"} \ No newline at end of file diff --git a/scripts/SliderFieldBuilder-output.json b/scripts/SliderFieldBuilder-output.json index 1049d62..facc122 100644 --- a/scripts/SliderFieldBuilder-output.json +++ b/scripts/SliderFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225515904","jnpfKey":"slider","label":"滑块","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfSlider","tagIcon":"icon-ym icon-ym-generator-slider","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":0,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225515904},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"disabled":false,"min":0,"max":100,"step":1,"__vModel__":"f_slider","id":"f_slider"} -======= -{"__config__":{"formId":"formItem1781225353471","jnpfKey":"slider","label":"滑块","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfSlider","tagIcon":"icon-ym icon-ym-generator-slider","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":0,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225353471},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"disabled":false,"min":0,"max":100,"step":1,"__vModel__":"f_slider","id":"f_slider"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671851","jnpfKey":"slider","label":"滑块","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfSlider","tagIcon":"icon-ym icon-ym-generator-slider","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":0,"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","noShow":false,"regList":[],"trigger":"change","renderKey":1781225671851},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"style":{"width":"100%"},"disabled":false,"min":0,"max":100,"step":1,"__vModel__":"f_slider","id":"f_slider"} \ No newline at end of file diff --git a/scripts/StepsFieldBuilder-output.json b/scripts/StepsFieldBuilder-output.json index 476b27a..c609875 100644 --- a/scripts/StepsFieldBuilder-output.json +++ b/scripts/StepsFieldBuilder-output.json @@ -1 +1 @@ -{"__config__":{"formId":"formItem1781225353187","visibility":["pc","app"],"jnpfKey":"steps","noShow":false,"dragDisabled":false,"className":[],"layout":"rowFormItem","span":24,"tagIcon":"icon-ym icon-ym-generator-steps","tag":"ASteps","showLabel":false,"label":"","required":false},"children":[{"title":"步骤1","name":"1","icon":"","__config__":{"jnpfKey":"stepItem","children":[]}},{"title":"步骤2","name":"2","icon":"","__config__":{"jnpfKey":"stepItem","children":[]}}],"active":0,"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"simple":false,"processStatus":"process"} \ No newline at end of file +{"__config__":{"formId":"formItem1781225671326","visibility":["pc","app"],"jnpfKey":"steps","noShow":false,"dragDisabled":false,"className":[],"layout":"rowFormItem","span":24,"tagIcon":"icon-ym icon-ym-generator-steps","tag":"ASteps","showLabel":false,"label":"","required":false},"children":[{"title":"步骤1","name":"1","icon":"","__config__":{"jnpfKey":"stepItem","children":[]}},{"title":"步骤2","name":"2","icon":"","__config__":{"jnpfKey":"stepItem","children":[]}}],"active":0,"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"simple":false,"processStatus":"process"} \ No newline at end of file diff --git a/scripts/SubTableFieldBuilder-output.json b/scripts/SubTableFieldBuilder-output.json index 180a55e..60f8cdb 100644 --- a/scripts/SubTableFieldBuilder-output.json +++ b/scripts/SubTableFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225517098","visibility":["pc","app"],"jnpfKey":"table","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"订单明细","trigger":"blur","showLabel":false,"required":true,"tableName":"t_order_detail","renderKey":1781225517098,"layout":"rowFormItem","tagIcon":"icon-ym icon-ym-generator-table","tag":"JnpfInputTable","regList":[],"tableAlign":"left","span":24,"dictionaryType":"","defaultValue":[],"showTitle":true,"children":[],"complexHeaderList":[],"relationField":"f_order_id"},"__vModel__":"f_order_detail","field":"f_order_detail","disabled":false,"showSummary":false,"summaryField":[],"isNumLimit":false,"numLimit":1000,"defaultValue":[],"columnBtnsList":[{"value":"copy","label":"复制","labelI18nCode":"common.copyText","show":true,"btnType":"primary","btnIcon":"icon-ym icon-ym-btn-edit"},{"value":"remove","label":"删除","labelI18nCode":"common.delText","show":true,"btnType":"danger","btnIcon":"icon-ym icon-ym-btn-clearn","showConfirm":true}],"footerBtnsList":[{"value":"add","label":"添加","labelI18nCode":"common.add1Text","show":true,"btnType":"primary","btnIcon":"icon-ym icon-ym-btn-add"},{"value":"batchRemove","label":"批量删除","labelI18nCode":"common.batchDelText","show":true,"btnType":"danger","btnIcon":"icon-ym icon-ym-btn-clearn","showConfirm":true}],"layoutType":"table","defaultExpandAll":true,"hasPage":false,"pageSize":10} -======= -{"__config__":{"formId":"formItem1781225354110","visibility":["pc","app"],"jnpfKey":"table","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"订单明细","trigger":"blur","showLabel":false,"required":true,"tableName":"t_order_detail","renderKey":1781225354110,"layout":"rowFormItem","tagIcon":"icon-ym icon-ym-generator-table","tag":"JnpfInputTable","regList":[],"tableAlign":"left","span":24,"dictionaryType":"","defaultValue":[],"showTitle":true,"children":[],"complexHeaderList":[],"relationField":"f_order_id"},"__vModel__":"f_order_detail","field":"f_order_detail","disabled":false,"showSummary":false,"summaryField":[],"isNumLimit":false,"numLimit":1000,"defaultValue":[],"columnBtnsList":[{"value":"copy","label":"复制","labelI18nCode":"common.copyText","show":true,"btnType":"primary","btnIcon":"icon-ym icon-ym-btn-edit"},{"value":"remove","label":"删除","labelI18nCode":"common.delText","show":true,"btnType":"danger","btnIcon":"icon-ym icon-ym-btn-clearn","showConfirm":true}],"footerBtnsList":[{"value":"add","label":"添加","labelI18nCode":"common.add1Text","show":true,"btnType":"primary","btnIcon":"icon-ym icon-ym-btn-add"},{"value":"batchRemove","label":"批量删除","labelI18nCode":"common.batchDelText","show":true,"btnType":"danger","btnIcon":"icon-ym icon-ym-btn-clearn","showConfirm":true}],"layoutType":"table","defaultExpandAll":true,"hasPage":false,"pageSize":10} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225673119","visibility":["pc","app"],"jnpfKey":"table","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"订单明细","trigger":"blur","showLabel":false,"required":true,"tableName":"t_order_detail","renderKey":1781225673119,"layout":"rowFormItem","tagIcon":"icon-ym icon-ym-generator-table","tag":"JnpfInputTable","regList":[],"tableAlign":"left","span":24,"dictionaryType":"","defaultValue":[],"showTitle":true,"children":[],"complexHeaderList":[],"relationField":"f_order_id"},"__vModel__":"f_order_detail","field":"f_order_detail","disabled":false,"showSummary":false,"summaryField":[],"isNumLimit":false,"numLimit":1000,"defaultValue":[],"columnBtnsList":[{"value":"copy","label":"复制","labelI18nCode":"common.copyText","show":true,"btnType":"primary","btnIcon":"icon-ym icon-ym-btn-edit"},{"value":"remove","label":"删除","labelI18nCode":"common.delText","show":true,"btnType":"danger","btnIcon":"icon-ym icon-ym-btn-clearn","showConfirm":true}],"footerBtnsList":[{"value":"add","label":"添加","labelI18nCode":"common.add1Text","show":true,"btnType":"primary","btnIcon":"icon-ym icon-ym-btn-add"},{"value":"batchRemove","label":"批量删除","labelI18nCode":"common.batchDelText","show":true,"btnType":"danger","btnIcon":"icon-ym icon-ym-btn-clearn","showConfirm":true}],"layoutType":"table","defaultExpandAll":true,"hasPage":false,"pageSize":10} \ No newline at end of file diff --git a/scripts/SwitchFieldBuilder-output.json b/scripts/SwitchFieldBuilder-output.json index 416d72a..97d7486 100644 --- a/scripts/SwitchFieldBuilder-output.json +++ b/scripts/SwitchFieldBuilder-output.json @@ -1 +1 @@ -{"__config__":{"formId":"formItem1781225353286","visibility":["pc","app"],"jnpfKey":"switch","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"启用","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225353286,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-switch","tag":"JnpfSwitch","regList":[],"tableAlign":"left","span":24,"defaultValue":0},"__vModel__":"f_enabled","field":"f_enabled","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"disabled":false,"activeTxt":"开","inactiveTxt":"关","activeValue":1,"inactiveValue":0} \ No newline at end of file +{"__config__":{"formId":"formItem1781225671161","visibility":["pc","app"],"jnpfKey":"switch","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"启用","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225671161,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-switch","tag":"JnpfSwitch","regList":[],"tableAlign":"left","span":24,"defaultValue":0},"__vModel__":"f_enabled","field":"f_enabled","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"disabled":false,"activeTxt":"开","inactiveTxt":"关","activeValue":1,"inactiveValue":0} \ No newline at end of file diff --git a/scripts/TabFieldBuilder-output.json b/scripts/TabFieldBuilder-output.json index f4b42c5..3dd0749 100644 --- a/scripts/TabFieldBuilder-output.json +++ b/scripts/TabFieldBuilder-output.json @@ -1 +1 @@ -{"__config__":{"formId":"formItem1781225352978","visibility":["pc","app"],"jnpfKey":"tab","noShow":false,"dragDisabled":false,"className":[],"layout":"rowFormItem","span":24,"tagIcon":"icon-ym icon-ym-generator-label","tag":"ATab","showLabel":false,"label":"","required":false},"children":[{"title":"Tab 1","name":"1","__config__":{"jnpfKey":"tabItem","children":[]}},{"title":"Tab 2","name":"2","__config__":{"jnpfKey":"tabItem","children":[]}}],"active":"1","on":{"tabClick":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"type":"","tabPosition":"top"} \ No newline at end of file +{"__config__":{"formId":"formItem1781225672230","visibility":["pc","app"],"jnpfKey":"tab","noShow":false,"dragDisabled":false,"className":[],"layout":"rowFormItem","span":24,"tagIcon":"icon-ym icon-ym-generator-label","tag":"ATab","showLabel":false,"label":"","required":false},"children":[{"title":"Tab 1","name":"1","__config__":{"jnpfKey":"tabItem","children":[]}},{"title":"Tab 2","name":"2","__config__":{"jnpfKey":"tabItem","children":[]}}],"active":"1","on":{"tabClick":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"type":"","tabPosition":"top"} \ No newline at end of file diff --git a/scripts/TableGridFieldBuilder-output.json b/scripts/TableGridFieldBuilder-output.json index 4b2234a..b93a10b 100644 --- a/scripts/TableGridFieldBuilder-output.json +++ b/scripts/TableGridFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225515884","visibility":["pc","app"],"jnpfKey":"tableGrid","noShow":false,"label":"","showLabel":false,"className":[],"required":false,"layout":"rowFormItem","span":24,"dragDisabled":false,"tagIcon":"icon-ym icon-ym-generator-tableGrid","tag":"Table","defaultValue":[],"borderType":"solid","borderColor":"#E2E0E0","borderWidth":1,"children":[{"title":"tr","__config__":{"jnpfKey":"tableGridTr","children":[{"title":"td","__config__":{"jnpfKey":"tableGridTd","merged":false,"colspan":1,"rowspan":1,"children":[],"backgroundColor":""}}]}}]},"__vModel__":"f_grid"} -======= -{"__config__":{"formId":"formItem1781225353126","visibility":["pc","app"],"jnpfKey":"tableGrid","noShow":false,"label":"","showLabel":false,"className":[],"required":false,"layout":"rowFormItem","span":24,"dragDisabled":false,"tagIcon":"icon-ym icon-ym-generator-tableGrid","tag":"Table","defaultValue":[],"borderType":"solid","borderColor":"#E2E0E0","borderWidth":1,"children":[{"title":"tr","__config__":{"jnpfKey":"tableGridTr","children":[{"title":"td","__config__":{"jnpfKey":"tableGridTd","merged":false,"colspan":1,"rowspan":1,"children":[],"backgroundColor":""}}]}}]},"__vModel__":"f_grid"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671832","visibility":["pc","app"],"jnpfKey":"tableGrid","noShow":false,"label":"","showLabel":false,"className":[],"required":false,"layout":"rowFormItem","span":24,"dragDisabled":false,"tagIcon":"icon-ym icon-ym-generator-tableGrid","tag":"Table","defaultValue":[],"borderType":"solid","borderColor":"#E2E0E0","borderWidth":1,"children":[{"title":"tr","__config__":{"jnpfKey":"tableGridTr","children":[{"title":"td","__config__":{"jnpfKey":"tableGridTd","merged":false,"colspan":1,"rowspan":1,"children":[],"backgroundColor":""}}]}}]},"__vModel__":"f_grid"} \ No newline at end of file diff --git a/scripts/TextareaFieldBuilder-output.json b/scripts/TextareaFieldBuilder-output.json index 7e40da6..508ef6f 100644 --- a/scripts/TextareaFieldBuilder-output.json +++ b/scripts/TextareaFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225515960","visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"家庭住址","trigger":"blur","showLabel":true,"required":false,"tableName":"","renderKey":1781225515960,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24,"tableFixed":"none","tableAlign":"left"},"__vModel__":"f_address","autoSize":{"minRows":4,"maxRows":4},"style":{"width":"100%"},"clearable":true,"readonly":false,"disabled":false,"placeholder":"请输入","on":{"change":"","blur":""},"showCount":false} -======= -{"__config__":{"formId":"formItem1781225353310","visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"家庭住址","trigger":"blur","showLabel":true,"required":false,"tableName":"","renderKey":1781225353310,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24,"tableFixed":"none","tableAlign":"left"},"__vModel__":"f_address","autoSize":{"minRows":4,"maxRows":4},"style":{"width":"100%"},"clearable":true,"readonly":false,"disabled":false,"placeholder":"请输入","on":{"change":"","blur":""},"showCount":false} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671956","visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"家庭住址","trigger":"blur","showLabel":true,"required":false,"tableName":"","renderKey":1781225671956,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24,"tableFixed":"none","tableAlign":"left"},"__vModel__":"f_address","autoSize":{"minRows":4,"maxRows":4},"style":{"width":"100%"},"clearable":true,"readonly":false,"disabled":false,"placeholder":"请输入","on":{"change":"","blur":""},"showCount":false} \ No newline at end of file diff --git a/scripts/TimePickerFieldBuilder-output.json b/scripts/TimePickerFieldBuilder-output.json index ce3a7dc..0861c9e 100644 --- a/scripts/TimePickerFieldBuilder-output.json +++ b/scripts/TimePickerFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225516229","visibility":["pc","app"],"jnpfKey":"timePicker","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"提醒时间","trigger":"change","showLabel":true,"required":false,"tableName":"","renderKey":1781225516229,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-time","tag":"JnpfTimePicker","regList":[],"tableAlign":"left","span":24,"endRelationField":"","endTimeRule":false,"endTimeTarget":1,"endTimeType":1,"startRelationField":"","startTimeRule":false,"startTimeTarget":1,"startTimeType":1,"defaultCurrent":false},"__vModel__":"f_remindTime","clearable":true,"format":"HH:mm:ss","style":{"width":"100%"},"disabled":false,"placeholder":"请选择","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}} -======= -{"__config__":{"formId":"formItem1781225353511","visibility":["pc","app"],"jnpfKey":"timePicker","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"提醒时间","trigger":"change","showLabel":true,"required":false,"tableName":"","renderKey":1781225353511,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-time","tag":"JnpfTimePicker","regList":[],"tableAlign":"left","span":24,"endRelationField":"","endTimeRule":false,"endTimeTarget":1,"endTimeType":1,"startRelationField":"","startTimeRule":false,"startTimeTarget":1,"startTimeType":1,"defaultCurrent":false},"__vModel__":"f_remindTime","clearable":true,"format":"HH:mm:ss","style":{"width":"100%"},"disabled":false,"placeholder":"请选择","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225672176","visibility":["pc","app"],"jnpfKey":"timePicker","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"提醒时间","trigger":"change","showLabel":true,"required":false,"tableName":"","renderKey":1781225672176,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-time","tag":"JnpfTimePicker","regList":[],"tableAlign":"left","span":24,"endRelationField":"","endTimeRule":false,"endTimeTarget":1,"endTimeType":1,"startRelationField":"","startTimeRule":false,"startTimeTarget":1,"startTimeType":1,"defaultCurrent":false},"__vModel__":"f_remindTime","clearable":true,"format":"HH:mm:ss","style":{"width":"100%"},"disabled":false,"placeholder":"请选择","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}} \ No newline at end of file diff --git a/scripts/TreeSelectFieldBuilder-output.json b/scripts/TreeSelectFieldBuilder-output.json index de755a2..f98f0f1 100644 --- a/scripts/TreeSelectFieldBuilder-output.json +++ b/scripts/TreeSelectFieldBuilder-output.json @@ -1 +1 @@ -{"__config__":{"formId":"formItem1781225352790","visibility":["pc","app"],"jnpfKey":"treeSelect","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"部门","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225352790,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-tree","tag":"JnpfTreeSelect","regList":[],"tableAlign":"left","span":24,"defaultValue":null,"dataType":"static","dictionaryType":"","propsUrl":"","propsName":"","useCache":true,"templateJson":[]},"__vModel__":"f_dept","field":"f_dept","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"style":{"width":"100%"},"options":[{"id":"1","fullName":"选项1","children":[{"id":"2","fullName":"选项1-1"}]}],"props":{"value":"id","label":"fullName","children":"children"},"placeholder":"请选择","multiple":false,"clearable":true,"filterable":false,"disabled":false,"id":"f_dept","fullName":"部门","fullNameI18nCode":[""],"showCheckbox":false,"checkStrictly":false,"defaultExpandAll":false,"dropdownClassName":"","maxTagCount":null,"treeCheckable":false,"searchable":true} \ No newline at end of file +{"__config__":{"formId":"formItem1781225671937","visibility":["pc","app"],"jnpfKey":"treeSelect","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"部门","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225671937,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-tree","tag":"JnpfTreeSelect","regList":[],"tableAlign":"left","span":24,"defaultValue":null,"dataType":"static","dictionaryType":"","propsUrl":"","propsName":"","useCache":true,"templateJson":[]},"__vModel__":"f_dept","field":"f_dept","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"style":{"width":"100%"},"options":[{"id":"1","fullName":"选项1","children":[{"id":"2","fullName":"选项1-1"}]}],"props":{"value":"id","label":"fullName","children":"children"},"placeholder":"请选择","multiple":false,"clearable":true,"filterable":false,"disabled":false,"id":"f_dept","fullName":"部门","fullNameI18nCode":[""],"showCheckbox":false,"checkStrictly":false,"defaultExpandAll":false,"dropdownClassName":"","maxTagCount":null,"treeCheckable":false,"searchable":true} \ No newline at end of file diff --git a/scripts/UploadFileFieldBuilder-output.json b/scripts/UploadFileFieldBuilder-output.json index c34c07a..6ce2e1f 100644 --- a/scripts/UploadFileFieldBuilder-output.json +++ b/scripts/UploadFileFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225515081","jnpfKey":"uploadFile","label":"附件","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfUploadFile","tagIcon":"icon-ym icon-ym-generator-upload","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":[],"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","renderKey":1781225515081,"noShow":false,"regList":[],"trigger":"change"},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"disabled":false,"accept":"","fileSize":10,"sizeUnit":"MB","buttonText":"点击上传","limit":9,"pathType":"defaultPath","sortRule":[],"timeFormat":"YYYY","folder":"","tipText":"","showType":"button","__vModel__":"f_attachment","isAccount":0,"id":"f_attachment"} -======= -{"__config__":{"formId":"formItem1781225352919","jnpfKey":"uploadFile","label":"附件","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfUploadFile","tagIcon":"icon-ym icon-ym-generator-upload","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":[],"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","renderKey":1781225352919,"noShow":false,"regList":[],"trigger":"change"},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"disabled":false,"accept":"","fileSize":10,"sizeUnit":"MB","buttonText":"点击上传","limit":9,"pathType":"defaultPath","sortRule":[],"timeFormat":"YYYY","folder":"","tipText":"","showType":"button","__vModel__":"f_attachment","isAccount":0,"id":"f_attachment"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225671211","jnpfKey":"uploadFile","label":"附件","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfUploadFile","tagIcon":"icon-ym icon-ym-generator-upload","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":[],"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","renderKey":1781225671211,"noShow":false,"regList":[],"trigger":"change"},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"disabled":false,"accept":"","fileSize":10,"sizeUnit":"MB","buttonText":"点击上传","limit":9,"pathType":"defaultPath","sortRule":[],"timeFormat":"YYYY","folder":"","tipText":"","showType":"button","__vModel__":"f_attachment","isAccount":0,"id":"f_attachment"} \ No newline at end of file diff --git a/scripts/UploadImgFieldBuilder-output.json b/scripts/UploadImgFieldBuilder-output.json index b90ba36..ff6ed2e 100644 --- a/scripts/UploadImgFieldBuilder-output.json +++ b/scripts/UploadImgFieldBuilder-output.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"__config__":{"formId":"formItem1781225516346","jnpfKey":"uploadImg","label":"头像","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfUploadImg","tagIcon":"icon-ym icon-ym-generator-upload","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":[],"required":false,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","renderKey":1781225516346,"noShow":false,"regList":[],"trigger":"change"},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"disabled":false,"fileSize":10,"sizeUnit":"MB","buttonText":"点击上传","limit":9,"pathType":"defaultPath","sortRule":[],"timeFormat":"YYYY","folder":"","tipText":"","showType":"card","__vModel__":"f_avatar","id":"f_avatar"} -======= -{"__config__":{"formId":"formItem1781225353020","jnpfKey":"uploadImg","label":"头像","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfUploadImg","tagIcon":"icon-ym icon-ym-generator-upload","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":[],"required":false,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","renderKey":1781225353020,"noShow":false,"regList":[],"trigger":"change"},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"disabled":false,"fileSize":10,"sizeUnit":"MB","buttonText":"点击上传","limit":9,"pathType":"defaultPath","sortRule":[],"timeFormat":"YYYY","folder":"","tipText":"","showType":"card","__vModel__":"f_avatar","id":"f_avatar"} ->>>>>>> v13-f1-form +{"__config__":{"formId":"formItem1781225672311","jnpfKey":"uploadImg","label":"头像","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfUploadImg","tagIcon":"icon-ym icon-ym-generator-upload","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":[],"required":false,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","renderKey":1781225672311,"noShow":false,"regList":[],"trigger":"change"},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"disabled":false,"fileSize":10,"sizeUnit":"MB","buttonText":"点击上传","limit":9,"pathType":"defaultPath","sortRule":[],"timeFormat":"YYYY","folder":"","tipText":"","showType":"card","__vModel__":"f_avatar","id":"f_avatar"} \ No newline at end of file diff --git a/scripts/UserSelectFieldBuilder-output.json b/scripts/UserSelectFieldBuilder-output.json index ebd8188..947a22c 100644 --- a/scripts/UserSelectFieldBuilder-output.json +++ b/scripts/UserSelectFieldBuilder-output.json @@ -1 +1 @@ -{"__config__":{"formId":"formItem1781225353297","visibility":["pc","app"],"jnpfKey":"userSelect","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"用户","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225353297,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-user","tag":"JnpfUserSelect","regList":[],"tableAlign":"left","span":24,"defaultValue":null,"defaultCurrent":false},"__vModel__":"f_user","field":"f_user","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"style":{"width":"100%"},"placeholder":"请选择","selectType":"all","ableIds":[],"ableRelationIds":[],"relationField":"","multiple":false,"clearable":true,"disabled":false,"id":"f_user","fullName":"用户"} \ No newline at end of file +{"__config__":{"formId":"formItem1781225671867","visibility":["pc","app"],"jnpfKey":"userSelect","noShow":false,"tipLabel":"","tableFixed":"none","dragDisabled":false,"className":[],"label":"用户","trigger":"change","showLabel":true,"required":true,"tableName":"","renderKey":1781225671867,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-user","tag":"JnpfUserSelect","regList":[],"tableAlign":"left","span":24,"defaultValue":null,"defaultCurrent":false},"__vModel__":"f_user","field":"f_user","on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n\n}"},"style":{"width":"100%"},"placeholder":"请选择","selectType":"all","ableIds":[],"ableRelationIds":[],"relationField":"","multiple":false,"clearable":true,"disabled":false,"id":"f_user","fullName":"用户"} \ No newline at end of file