This commit is contained in:
walkor 2022-12-06 21:23:34 +08:00
parent d5a6a2b326
commit 92a4cf22ee

View File

@ -539,8 +539,8 @@ EOF;
'type' => 'text', 'type' => 'text',
] ]
], $options['props']['model'] ?? []); ], $options['props']['model'] ?? []);
$options['props']['clickClose'] = $options['props']['clickClose'] ?? 'true'; $options['props']['clickClose'] = $options['props']['clickClose'] ?? true;
$options['props']['radio'] = $options['props']['radio'] ?? 'true'; $options['props']['radio'] = $options['props']['radio'] ?? true;
$this->apiSelect($options); $this->apiSelect($options);
} }
@ -569,8 +569,8 @@ EOF;
'type' => 'text', 'type' => 'text',
] ]
], $options['props']['model'] ?? []); ], $options['props']['model'] ?? []);
$options['props']['clickClose'] = $options['props']['clickClose'] ?? 'true'; $options['props']['clickClose'] = $options['props']['clickClose'] ?? true;
$options['props']['radio'] = $options['props']['radio'] ?? 'true'; $options['props']['radio'] = $options['props']['radio'] ?? true;
$options['props']['tree'] = array_merge_recursive([ $options['props']['tree'] = array_merge_recursive([
'show' => true, 'show' => true,
'strict' => false, 'strict' => false,
@ -612,8 +612,10 @@ EOF;
if (is_array($item)) { if (is_array($item)) {
$item = json_encode($item, JSON_UNESCAPED_UNICODE); $item = json_encode($item, JSON_UNESCAPED_UNICODE);
$options_string .= "\r\n".($url?' ':' ')."$key: $item,"; $options_string .= "\r\n".($url?' ':' ')."$key: $item,";
} else { } else if (is_string($item)) {
$options_string .= "\r\n".($url?' ':' ')."$key: \"$item\","; $options_string .= "\r\n".($url?' ':' ')."$key: \"$item\",";
} else {
$options_string .= "\r\n".($url?' ':' ')."$key: ".var_export($item, true).",";
} }
} }
@ -816,8 +818,8 @@ EOF;
$props = Util::getProps($info['control'], $info['control_args']); $props = Util::getProps($info['control'], $info['control_args']);
if (isset($props['url'])) { if (isset($props['url'])) {
$api .= "apis.push(['$field', '{$props['url']}']);\r\n"; $api .= "apis.push([\"$field\", \"{$props['url']}\"]);\r\n";
$api_result .= "apiResults['$field'] = [];\r\n"; $api_result .= "apiResults[\"$field\"] = [];\r\n";
} else if (!empty($props['data'])) { } else if (!empty($props['data'])) {
$options = []; $options = [];
foreach ($props['data'] as $option) { foreach ($props['data'] as $option) {
@ -825,7 +827,7 @@ EOF;
$options[$option['value']] = $option['name']; $options[$option['value']] = $option['name'];
} }
} }
$api_result .= "apiResults['$field'] = " . json_encode($options, JSON_UNESCAPED_UNICODE) . ";\r\n"; $api_result .= "apiResults[\"$field\"] = " . json_encode($options, JSON_UNESCAPED_UNICODE) . ";\r\n";
} }
$templet = <<<EOF $templet = <<<EOF