update

taoyu65 · Jan 30, 2020 · fd608af · fd608af
1 parent d8b7a3a
commit fd608af
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/src/Config/umi.php b/src/Config/umi.php
@@ -10,7 +10,7 @@
     |
     */
 
-    'assets_path' => 'umi/lte',
+    'assets_path' => 'umi/ace',
 
     /*
     |--------------------------------------------------------------------------
@@ -20,7 +20,7 @@
     |--------------------------------------------------------------------------
     */
 
-    'current_ui' => 'lte',
+    'current_ui' => 'ace',
 
     /*
     |--------------------------------------------------------------------------

diff --git a/src/Config/umiEnum.php b/src/Config/umiEnum.php
@@ -24,7 +24,8 @@
         'umi_field_display_add'         => 'umi_field_display_add',
         'umi_field_display_browser'     => 'umi_field_display_browser',
         'umi_field_display_read'        => 'umi_field_display_read',
-        'umi_field_display_edit'        => 'umi_field_display_edit'
+        'umi_field_display_edit'        => 'umi_field_display_edit',
+        'class'                         => 'class',
     ],
 
     #数据类型 browser, read 和 edit, add 会加载不同的数据类型.
@@ -174,6 +175,9 @@
         ],
         'umi_tables'                => [
             'table_name', 'type', 'created_at', 'updated_at'
-        ]
+        ],
+        'class'                     => [
+            'class_name', 'class_star',
+        ],
     ]
 ];
diff --git a/src/Database/seeds/umi_field_display_add_seeder.php b/src/Database/seeds/umi_field_display_add_seeder.php
@@ -804,7 +804,7 @@ public function run()
             array(
                 'id'                => 62,
                 'table_id'          => 12,
-                'field'             => 'customer_rule_name',
+                'field'             => 'custom_rule_name',
                 'type'              => 'textBox',
                 'relation_display'  => '',
                 'custom_value'      => '',

diff --git a/src/Database/seeds/umi_field_display_edit_seeder.php b/src/Database/seeds/umi_field_display_edit_seeder.php
@@ -960,7 +960,7 @@ public function run()
             array(
                 'id'                => 74,
                 'table_id'          => 12,
-                'field'             => 'customer_rule_name',
+                'field'             => 'custom_rule_name',
                 'type'              => 'textBox',
                 'relation_display'  => '',
                 'custom_value'      => '',

diff --git a/src/Database/seeds/umi_field_display_read_seeder.php b/src/Database/seeds/umi_field_display_read_seeder.php
@@ -921,7 +921,7 @@ public function run()
             array(
                 'id'                => 92,
                 'table_id'          => 12,
-                'field'             => 'customer_rule_name',
+                'field'             => 'custom_rule_name',
                 'type'              => 'label4Read',
                 'relation_display'  => '',
                 'display_name'      => '',

diff --git a/src/Http/Controllers/relationOperationController.php b/src/Http/Controllers/relationOperationController.php
@@ -49,7 +49,7 @@ public function operationAdd(Request $request)
             'targetValue'   => 'required'*/
         ])->validate();
 
-        $customer_rule_name = $request->ruleName === null ? '' : $request->ruleName;
+        $custom_rule_name = $request->ruleName === null ? '' : $request->ruleName;
         $rule_name = $request->rule_name;
         $operation_type = $request->operationType;
         $is_extra_operation = $request->input('is_extra_operation');
@@ -66,7 +66,7 @@ public function operationAdd(Request $request)
         $details = $request->detail;
 
         $list = compact(
-            'customer_rule_name',
+            'custom_rule_name',
             'rule_name',
             'operation_type',
             'is_extra_operation',

diff --git a/src/Umi/TableRelation/UmiTableRelation.php b/src/Umi/TableRelation/UmiTableRelation.php
@@ -22,7 +22,7 @@ public function showConfirmation($activeFieldValues)
             $RO = $factory->getInstanceOfRelationOperation(
                 $rule->rule_name,
                 $rule->operation_type,
-                $rule->customer_rule_name
+                $rule->custom_rule_name
                 );
 
             $re = '';
@@ -68,7 +68,7 @@ public function executeExtraOperation($activeFieldValues)
             $RO = $factory->getInstanceOfRelationOperation(
                 $rule->rule_name,
                 $rule->operation_type,
-                $rule->customer_rule_name
+                $rule->custom_rule_name
             );
 
             $activeTableName = YM::getTableNameById($rule->active_table_id);