Browse Source

移动confirm目录

xaboy 7 years ago
parent
commit
2316e49274
3 changed files with 9 additions and 6 deletions
  1. 5 3
      src/config/config.php
  2. 2 2
      src/Form.php
  3. 2 1
      src/components/TimePicker.php

+ 5 - 3
src/config/config.php

@@ -22,9 +22,11 @@ return [
     'script' => [
         'jq' => '<script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.min.js"></script>',
         'vue' => '<script src="https://cdn.bootcss.com/vue/2.5.13/vue.min.js"></script>',
-        'iview-css' => '<link href="https://cdn.bootcss.com/iview/2.13.0/styles/iview.css" rel="stylesheet">',
-        'iview' => '<script src="https://cdn.bootcss.com/iview/2.13.0/iview.min.js"></script>',
-        'form-create' => '<script src="https://cdn.jsdelivr.net/npm/form-create@1.2.3/dist/form-create.min.js"></script>',
+        //iview 版本 2.14.3
+        'iview-css' => '<link href="https://cdn.jsdelivr.net/npm/iview@2.14.3/dist/styles/iview.css" rel="stylesheet">',
+        'iview' => '<script src="https://cdn.jsdelivr.net/npm/iview@2.14.3/dist/iview.min.js"></script>',
+        //form-create 版本 1.3.0
+        'form-create' => '<script src="https://cdn.jsdelivr.net/gh/xaboy/form-create@1.3.0/dist/form-create.min.js"></script>',
         'city-data' => '<script src="https://cdn.jsdelivr.net/npm/form-create@1.2.3/district/province_city.js"></script>',
         'city-area-data' => '<script src="https://cdn.jsdelivr.net/npm/form-create@1.2.3/district/province_city_area.js"></script>'
     ]

+ 2 - 2
src/Form.php

@@ -98,7 +98,7 @@ class Form
             $this->append($component);
         }
         $this->action = $action;
-        $config = require_once 'config' . DIRECTORY_SEPARATOR . 'config.php';
+        $config = require_once '..'.DIRECTORY_SEPARATOR.'config' . DIRECTORY_SEPARATOR . 'config.php';
         $this->setSuccessScript($config['formSuccessScript']);
         $this->config = $config['form'];
         $this->script = $config['script'];
@@ -291,7 +291,7 @@ class Form
      */
     public static function script()
     {
-        $config = require_once 'config' . DIRECTORY_SEPARATOR . 'config.php';
+        $config = require_once '..'.DIRECTORY_SEPARATOR.'config' . DIRECTORY_SEPARATOR . 'config.php';
         return implode("\r\n", $config['script']);
     }
 

+ 2 - 1
src/components/TimePicker.php

@@ -37,7 +37,8 @@ class TimePicker extends FormComponentDriver
 
     protected $props = [
         'type' => self::TYPE_TIME,
-        'editable' => false
+        'editable' => false,
+        'confirm' => true
     ];
 
     protected static $propsRule = [