1.6

Author: ydtg1993

src/DLPViewer.php

@@ -51,7 +51,7 @@ public static function makeComponentDot(Form $form, string $column, string $titl
      * @param Form $form
      * @param string $column 数据字段名
      * @param string $title 名称
-     * @param string $data json数据
+     * @param array $data 二维结构数据 [[column=>value,...],...]
      * @param array $settings 配置项[setting,...]
      * settings.columns   array  多列配置项 (必须填)
      *          columns = [
@@ -68,7 +68,7 @@ public static function makeComponentDot(Form $form, string $column, string $titl
      *              'delete'=>true     删除操作
      *          ]
      */
-    public static function makeComponentLine(Form $form, string $column, string $title, string $data, array $settings = [])
+    public static function makeComponentLine(Form $form, string $column, string $title, array $data, array $settings = [])
     {
         $strict = isset($settings['strict']) && $settings['strict'] ? true : false;
         $width = isset($settings['width']) ? $settings['width'] : '100%';
@@ -77,8 +77,9 @@ public static function makeComponentLine(Form $form, string $column, string $tit
         if (!isset($settings['columns'])) return;
         $columns = $settings['columns'];
         if ($strict) {
-            $data = (array)json_decode($data, true);
             $data = DLPHelper::safeJson($data);
+        }else{
+            $data = json_encode($data, JSON_UNESCAPED_UNICODE | JSON_HEX_QUOT | JSON_HEX_APOS);
         }
         $columns = json_encode($columns, JSON_UNESCAPED_UNICODE | JSON_HEX_QUOT | JSON_HEX_APOS);
         Admin::script(<<<EOF