1.9

Author: hikki

resources/assets/component.js

@@ -84,7 +84,7 @@ class ComponentDot {
     constructor(name, selected, select) {
         this.name = name;
         this.DOM = document.getElementById(name);
-        if (!Array.isArray(selected)) {
+        if (!Array.isArray(selected) || !Array.isArray(select)) {
             console.error('Dot param selected is not array!');
             return;
         }
@@ -218,10 +218,10 @@ class ComponentCascadeDot {
         delete: 'delete'
     };
 
-    constructor(name, selected, select, options) {
+    constructor(name, selected, select) {
         this.name = name;
         this.DOM = document.getElementById(name);
-        if (!Array.isArray(selected)) {
+        if (!Array.isArray(selected) || !Array.isArray(select)) {
             console.error('CascadeDot param selected is not array!');
             return;
         }

src/DLPHelper.php

@@ -9,6 +9,61 @@
  */
 class DLPHelper
 {
+    /**
+     * dot增减计算
+     * @param array $selected 过去已经选择
+     * @param array $select 已选择
+     * @return array [insert,delete]
+     */
+    public static function dotCalculate(array $selected,array $select)
+    {
+        $insert = [];
+        $delete = [];
+        $intersect = array_intersect($selected,$select);
+        $intersect_count = count($intersect);
+        $selected_count = count($selected);
+        $select_count = count($select);
+        if($intersect_count == $selected_count && $intersect_count == $select_count){
+            return [$insert,$delete];
+        }
+        if($intersect_count == $selected_count && $intersect_count < $select_count){
+            $insert = array_diff($select,$intersect);
+            return [$insert,$delete];
+        }
+        if($intersect_count < $selected_count && $intersect_count == $select_count){
+            $delete = array_diff($selected,$intersect);
+            return [$insert,$delete];
+        }
+        if($intersect_count < $selected_count && $intersect_count < $select_count){
+            $insert = array_diff($select,$intersect);
+            $delete = array_diff($selected,$intersect);
+            return [$insert,$delete];
+        }
+    }
+
+    /**
+     * 维度结构数据
+     * [[key=>integer,val=>string,par=>integer],...]
+     * @param array $data
+     */
+    public static function dimensionCalculate(array &$data)
+    {
+        foreach ($data as $key=>&$d){
+            $parent_node = $d['par'];
+            unset($d['par']);
+            foreach ($data as &$val){
+                if($val['key'] == $parent_node){
+                    if(!isset($val['nodes'])){
+                        $val['nodes'] = [];
+                    }
+                    $val['nodes'][] = $d;
+                    unset($data[$key]);
+                }
+            }
+        }
+        $data = array_values($data);
+    }
+
     /**
      * @param array $data
      * @return false|string

src/DLPViewer.php

@@ -21,7 +21,7 @@ class DLPViewer
      * @param string $column 数据字段名
      * @param string $title 名称
      * @param array $selected 已选择选项 [value1,value2,...]
-     * @param array $select 全部选项  [[value=>text],[value=>text]...]
+     * @param array $select 全部选项  [[value1=>text1],[value2=>text2]...]
      * @param array $settings 配置项[setting,...]
      * settings.strict      boolean json严格模式消除json敏感字符问题
      * settings.width       string 容器宽度设置
@@ -46,6 +46,40 @@ public static function makeComponentDot(Form $form, string $column, string $titl
         $form->html("<div id='{$column}' style='width:{$width};height: {$height};'></div>", $title);
     }
 
+    /**
+     * 维度.点
+     * @param Form $form
+     * @param string $column 数据字段名
+     * @param string $title 名称
+     * @param array $selected 已选择选项 [value1,value2,...]
+     * @param array $select 全部选项  [[key=>key1,val=>value1,nodes=>[...]],...]
+     * select.node.key      integer 键
+     * select.node.val      string  值
+     * select.node.nodes    array   子节点[node,node,...]
+     * @param array $settings 配置项[setting,...]
+     * settings.strict      boolean json严格模式消除json敏感字符问题
+     * settings.width       string 容器宽度设置
+     * settings.height      string 容器高度设置
+     */
+    public static function makeComponentCascadeDot(Form $form, string $column, string $title, array $selected = [], array $select = [], array $settings = [])
+    {
+        $strict = isset($settings['strict']) && $settings['strict'] ? true : false;
+        $width = isset($settings['width']) ? $settings['width'] : '100%';
+        $height = isset($settings['height']) ? $settings['height'] : '200px';
+        if ($strict) {
+            $selected = DLPHelper::safeJson($selected);
+            $select = DLPHelper::safeJson($select);
+        } else {
+            $selected = json_encode($selected, JSON_UNESCAPED_UNICODE | JSON_HEX_QUOT | JSON_HEX_APOS);
+            $select = json_encode($select, JSON_UNESCAPED_UNICODE | JSON_HEX_QUOT | JSON_HEX_APOS);
+        }
+        Admin::script(<<<EOF
+new ComponentCascadeDot("{$column}",JSON.parse('{$selected}'),JSON.parse('{$select}'));
+EOF
+        );
+        $form->html("<div id='{$column}' style='width:{$width};height: {$height};'></div>", $title);
+    }
+
     /**
      * 线
      * @param Form $form