浏览代码

Merge branch 'master' into develop

master
Fabien Normand 3 年前
父节点
当前提交
52c67682f4
共有 3 个文件被更改,包括 2 次插入6 次删除
  1. +1
    -1
      Field/FileManagerField.php
  2. +1
    -0
      Resources/assets/functions/widgets.js
  3. +0
    -5
      Resources/views/adminlte/crud/form_theme.html.twig

+ 1
- 1
Field/FileManagerField.php 查看文件

@@ -23,7 +23,7 @@ final class FileManagerField implements FieldInterface
->setProperty($propertyName)
->setLabel($label)
->setTemplatePath('@LcSov/adminlte/crud/field/file.html.twig')
/*->addWebpackEncoreEntries('adminlte-field-filemanager')*/
//->addWebpackEncoreEntries('adminlte-field-filemanager')
->setCustomOption('managerDir', 'file')
->setCustomOption('type', 'file')
->setFormType(FileManagerType::class)

+ 1
- 0
Resources/assets/functions/widgets.js 查看文件

@@ -32,6 +32,7 @@ export class SovWidgets {
var event = new Event('change');
e.target.dispatchEvent(event);
});
SovTools.log(myselect);

return myselect;
}

+ 0
- 5
Resources/views/adminlte/crud/form_theme.html.twig 查看文件

@@ -2,7 +2,6 @@
{% use '@EasyAdmin/crud/form_theme.html.twig' %}

{% block form_start %}

{% if form.vars.errors|length > 0 and 'ea_crud' in form.vars.block_prefixes|default([]) %}
{{ form_errors(form) }}
{% endif %}
@@ -117,7 +116,6 @@
{%- endif -%}
{%- endif -%}


{% set entityNameOrObject = form.parent.vars.data %}

{% if form.parent.vars.translation_entity_name is defined %}
@@ -130,9 +128,6 @@
{% endif %}
#}

{% if translation_domain == null %}
{% set translation_domain = 'admin' %}
{% endif %}
<{{ element|default('label') }}{% if label_attr %}{% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}{% endif %}
>{{ (label is not empty and '.' in label) ? label|trans({}, translation_domain) : name|sov_trans_admin_field(entityNameOrObject) }}
</{{ element|default('label') }}>

正在加载...
取消
保存