Home Explore Help
Sign In
dever-package
/
manage
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

edit

dever 6 years ago
parent
9564edcce2
commit
eed41d2a76
9 changed files with 120 additions and 29 deletions
Unified View Show Diff Stats
  1. 1 1
      assets/layadmin/html/inc/head.html
  2. 1 1
      assets/layadmin/html/inc/script.html
  3. 8 1
      assets/layadmin/html/project/database/list.html
  4. 14 2
      assets/layadmin/html/project/database/update.html
  5. 1 1
      assets/moltran/html/inc/head.html
  6. 1 1
      assets/moltran/html/inc/script.html
  7. 81 21
      src/Database.php
  8. 6 1
      src/Lib/Input.php
  9. 7 0
      template/layadmin/project/database/list.php

+ 1 - 1
assets/layadmin/html/inc/head.html
View File 

@@ -14,7 +14,7 @@
 
 <link rel="stylesheet" type="text/css" href="../script/lib/color/colpick.css">

 <link rel="stylesheet" type="text/css" href="../script/lib/color/colpick.css">

 <link rel="stylesheet" type="text/css" href="../script/lib/kindeditor/themes/default/default.css" />

 <link rel="stylesheet" type="text/css" href="../script/lib/kindeditor/themes/default/default.css" />

 <link rel="stylesheet" type="text/css" href="../script/lib/valid/validationEngine.jquery.css">

 <link rel="stylesheet" type="text/css" href="../script/lib/valid/validationEngine.jquery.css">

-<link rel="stylesheet" type="text/css" href="../script/lib/pnotify/pnotify.css">

+<!--link rel="stylesheet" type="text/css" href="../script/lib/pnotify/pnotify.css"-->

 <link rel="stylesheet" type="text/css" href="../script/lib/fancybox/jquery.fancybox.css">

 <link rel="stylesheet" type="text/css" href="../script/lib/fancybox/jquery.fancybox.css">

 <link rel="stylesheet" type="text/css" href="../script/lib/highlight/highlight.min.css">

 <link rel="stylesheet" type="text/css" href="../script/lib/highlight/highlight.min.css">

 <link rel="stylesheet" type="text/css" href="../script/lib/datetime/jquery.datetimepicker.css">

 <link rel="stylesheet" type="text/css" href="../script/lib/datetime/jquery.datetimepicker.css">

+ 1 - 1
assets/layadmin/html/inc/script.html
View File 

@@ -14,7 +14,7 @@
 
 <script type="text/javascript" src="../script/lib/datetime/jquery.datetimepicker.min.js"></script>

 <script type="text/javascript" src="../script/lib/datetime/jquery.datetimepicker.min.js"></script>

 

 

 <!-- 加载notify提醒 -->

 <!-- 加载notify提醒 -->

-<script type="text/javascript" src="../script/lib/pnotify/pnotify.js"></script>

+<!--script type="text/javascript" src="../script/lib/pnotify/pnotify.js"></script-->

 

 

 <!-- 加载图片展示 -->

 <!-- 加载图片展示 -->

 <script type="text/javascript" src="../script/lib/fancybox/jquery.fancybox.js"></script>

 <script type="text/javascript" src="../script/lib/fancybox/jquery.fancybox.js"></script>

+ 8 - 1
assets/layadmin/html/project/database/list.html
View File 

@@ -29,7 +29,14 @@
 
 <div id="content_2">

 <div id="content_2">

   <div class="layui-fluid">

   <div class="layui-fluid">

     <div class="layui-card">

     <div class="layui-card">

-      <form id="form1" name="form1" method="post" target="f1">

+      <form id="form1" name="form1" method="get" target="f1">

+      <input type="hidden" name="l" id="l" value="msg"/>

+      <input type="hidden" name="project" id="project" value="msg"/>

+      <input type="hidden" name="table" id="tables" value="msg"/>

+      <input type="hidden" name="menu" id="menu" value="msg"/>

+      <input type="hidden" name="menu_id" id="menu_id" value="msg"/>

+      <input type="hidden" name="search_option_state" id="search_option_state" value="msg"/>

+

       <input type="hidden" name="function" id="function" value="msg"/>

       <input type="hidden" name="function" id="function" value="msg"/>

       <input type="hidden" name="url" id="url" value=""/>

       <input type="hidden" name="url" id="url" value=""/>

       <input type="hidden" name="method" id="method" value="search"/>

       <input type="hidden" name="method" id="method" value="search"/>

+ 14 - 2
assets/layadmin/html/project/database/update.html
View File 

@@ -10,6 +10,18 @@
 
     {

     {

       width: 50%;

       width: 50%;

     }

     }

+

+    textarea{

+      padding-top: 5px;

+    }

+

+    .dever-color {

+      width: 100%;

+    }

+

+    .dever_text_child {

+      padding:15px;

+    }

     </style>

     </style>

 </head>

 </head>

 <body>

 <body>

@@ -39,13 +51,13 @@
 
           <div class="layui-card-body" id="content">

           <div class="layui-card-body" id="content">

             <form class="layui-form" action="" lay-filter="component-form-element">

             <form class="layui-form" action="" lay-filter="component-form-element">

               <div class="layui-row layui-col-space10 layui-form-item">

               <div class="layui-row layui-col-space10 layui-form-item">

-                <div class="layui-col-lg6">

+                <div class="layui-col-lg12">

                   <label class="layui-form-label">员工姓名：</label>

                   <label class="layui-form-label">员工姓名：</label>

                   <div class="layui-input-block">

                   <div class="layui-input-block">

                     <input type="text" name="fullname" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">

                     <input type="text" name="fullname" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">

                   </div>

                   </div>

                 </div>

                 </div>

-                <div class="layui-col-lg6">

+                <div class="layui-col-lg12">

                   <label class="layui-form-label">技术工种：</label>

                   <label class="layui-form-label">技术工种：</label>

                   <div class="layui-input-block">

                   <div class="layui-input-block">

                     <select name="type" lay-verify="required" lay-filter="aihao">

                     <select name="type" lay-verify="required" lay-filter="aihao">

+ 1 - 1
assets/moltran/html/inc/head.html
View File 

@@ -9,7 +9,7 @@
 
 <link rel="stylesheet" type="text/css" href="../script/lib/layui/css/layui.css" />
 
 <link rel="stylesheet" type="text/css" href="../script/lib/layui/css/layui.css" />
 
 <link rel="stylesheet" type="text/css" href="../script/lib/bootstrap/css/bootstrap.min.css" />
 
 <link rel="stylesheet" type="text/css" href="../script/lib/bootstrap/css/bootstrap.min.css" />
 
 <link rel="stylesheet" type="text/css" href="../script/lib/valid/validationEngine.jquery.css">
 
 <link rel="stylesheet" type="text/css" href="../script/lib/valid/validationEngine.jquery.css">
 
-<link rel="stylesheet" type="text/css" href="../script/lib/pnotify/pnotify.css">
 
+<!--link rel="stylesheet" type="text/css" href="../script/lib/pnotify/pnotify.css"-->
 
 <link rel="stylesheet" type="text/css" href="../script/lib/fancybox/jquery.fancybox.css">
 
 <link rel="stylesheet" type="text/css" href="../script/lib/fancybox/jquery.fancybox.css">
 
 <link rel="stylesheet" type="text/css" href="../script/lib/highlight/highlight.min.css">
 
 <link rel="stylesheet" type="text/css" href="../script/lib/highlight/highlight.min.css">
 
 <link rel="stylesheet" type="text/css" href="../script/lib/datetime/jquery.datetimepicker.css">
 
 <link rel="stylesheet" type="text/css" href="../script/lib/datetime/jquery.datetimepicker.css">

+ 1 - 1
assets/moltran/html/inc/script.html
View File 

@@ -33,7 +33,7 @@
 
 <script type="text/javascript" src="../script/lib/datetime/jquery.datetimepicker.min.js"></script>
 
 <script type="text/javascript" src="../script/lib/datetime/jquery.datetimepicker.min.js"></script>
 
 
 
 <!-- 加载notify提醒 -->
 
 <!-- 加载notify提醒 -->
 
-<script type="text/javascript" src="../script/lib/pnotify/pnotify.js"></script>
 
+<!--script type="text/javascript" src="../script/lib/pnotify/pnotify.js"></script-->
 
 
 
 <!-- 加载图片展示 -->
 
 <!-- 加载图片展示 -->
 
 <script type="text/javascript" src="../script/lib/fancybox/jquery.fancybox.js"></script>
 
 <script type="text/javascript" src="../script/lib/fancybox/jquery.fancybox.js"></script>

+ 81 - 21
src/Database.php
View File 

@@ -158,7 +158,7 @@ class Database
 
     private function getUrlParam($key, $table, $suffix, $state)
 
     private function getUrlParam($key, $table, $suffix, $state)
 
     {
 
     {
 
         $param = '';
 
         $param = '';
 
-        $array = array('project', 'add', 'list', 'update');
 
+        $array = array('project', 'add', 'list', 'update', 'edit');
 
         if (in_array($key, $array) && !strstr($table, 'oper_')) {
 
         if (in_array($key, $array) && !strstr($table, 'oper_')) {
 
             $where = Dever::preInput('search_');
 
             $where = Dever::preInput('search_');
 
             if ($where) {
 
             if ($where) {
 
@@ -324,8 +324,12 @@ class Database
 
             'add' => $this->url('add'),
 
             'add' => $this->url('add'),
 
             'add_state' => $display,
 
             'add_state' => $display,
 
 
 
+            'state' => $this->getState(),
 
+            'l' => 'project/database/list',
 
             'project' => $this->project,
 
             'project' => $this->project,
 
             'table' => $this->table,
 
             'table' => $this->table,
 
+            'menu' => $this->menu,
 
+            'menu_id' => $this->menu_id,
 
             'id' => $this->id,
 
             'id' => $this->id,
 
             'main' => '数据管理' . $this->refer('url'),
 
             'main' => '数据管理' . $this->refer('url'),
 
 
 
@@ -2305,7 +2309,11 @@ class Database
 
                 $result[$k] = '<div class="form-group ' . $class . '"><div class="margin-top">';
 
                 $result[$k] = '<div class="form-group ' . $class . '"><div class="margin-top">';
 
 
 
                 if (layadmin()) {
 
                 if (layadmin()) {
 
-                    $result[$k] = '<div class="layui-form-item ' . $class . '"><div class="layui-col-lg6">';
 
+                    $result[$k] = '<div class="layui-form-item ' . $class . '"><div classs="layui-col-lg6">';
 
+
 
+                    if (isset($v['update']) && is_array($v['update'])) {
 
+                        $result[$k] = '<div class="layui-form-item ' . $class . '"><div class="layui-tab-card">';
 
+                    }
 
                 }
 
                 }
 
 
 
                 $result[$k] .= $this->create_update_html($k, $v, $data);
 
                 $result[$k] .= $this->create_update_html($k, $v, $data);
 
@@ -2509,29 +2517,72 @@ class Database
 
                 if (layadmin()) {
 
                 if (layadmin()) {
 
                     $c = 'layui-tab-title';
 
                     $c = 'layui-tab-title';
 
                 }
 
                 }
 
-                $result .= '<ul class="nav nav-tabs '.$c.'">{tab}<li><a href="javascript:;" class="dever_form_add" toggle_key="' . $key . '">增加一条</a></li></ul>';
 
 
 
-                $tab = '';
 
+                $delete = true;
 
+                if (isset($param['option'])) {
 
+                    $delete = false;
 
+                    $result .= '<ul class="nav nav-tabs '.$c.'">{tab}</ul>';
 
+
 
+                    $order = array
 
+                    (
 
+                        'col'       => $key,
 
+                        'name'      => $param['desc'],
 
+                        'default'   => '1',
 
+                        'desc'      => $param['desc'],
 
+                        'match'     => 'is_string',
 
+                        'update'    => 'hidden',
 
+                        'option'    => $param['option']
 
+                    );
 
+                    array_unshift($method, $order);
 
+
 
+                    if (isset($param['value']) && $param['value']) {
 
+                        $value = json_decode(base64_decode($param['value']), true);
 
+                        $param['value'] = array();
 
+                        foreach ($param['option'] as $k => $v) {
 
+                            foreach ($value[$k-1] as $k1 => $v1) {
 
+                                $param['value'][$v][$k1] = $v1;
 
+                            }
 
+                        }
 
+                    } else {
 
+                        $param['value'] = array();
 
+                        foreach ($param['option'] as $k => $v) {
 
+                            $param['value'][$v][$key] = $k;
 
+                        }
 
+                    }
 
 
 
-                $order = array
 
-                (
 
-                    'col'       => 'order',
 
-                    'name'      => '排序-按照数字正序排列',
 
-                    'default'   => '1',
 
-                    'desc'      => '排序',
 
-                    'match'     => 'is_string',
 
-                    'update'    => 'text',
 
-                );
 
-                array_unshift($method, $order);
 
+                } else {
 
+                    $result .= '<ul class="nav nav-tabs '.$c.'">{tab}<li><a href="javascript:;" class="dever_form_add" toggle_key="' . $key . '">增加一条</a></li></ul>';
 
 
 
-                $this->update_child(array(), $method, $key, $result, -1);
 
+                    $order = array
 
+                    (
 
+                        'col'       => 'order',
 
+                        'name'      => '排序-按照数字正序排列',
 
+                        'default'   => '1',
 
+                        'desc'      => '排序',
 
+                        'match'     => 'is_string',
 
+                        'update'    => 'text',
 
+                    );
 
+                    array_unshift($method, $order);
 
+                }
 
+
 
+                $tab = '';
 
+
 
+                $this->update_child(array(), $method, $key, $result, -1, $delete);
 
 
 
                 if (isset($param['value']) && $param['value']) {
 
                 if (isset($param['value']) && $param['value']) {
 
-                    $param['value'] = json_decode(base64_decode($param['value']), true);
 
+
 
+                    if (!is_array($param['value'])) {
 
+                        $param['value'] = json_decode(base64_decode($param['value']), true);
 
+                    }
 
 
 
                     if (is_array($param['value'])) {
 
                     if (is_array($param['value'])) {
 
+                        $i = 0;
 
                         foreach ($param['value'] as $k => $v) {
 
                         foreach ($param['value'] as $k => $v) {
 
-                            $this->update_child($v, $method, $key, $result, $k);
 
+                            $n = $k;
 
+                            if (is_string($k)) {
 
+                                $k = $i;
 
+                            }
 
+                            $this->update_child($v, $method, $key, $result, $k, $delete);
 
 
 
                             $active = '';
 
                             $active = '';
 
                             if ($k == 0) {
 
                             if ($k == 0) {
 
@@ -2541,12 +2592,16 @@ class Database
 
                                 $active .= ' layui-this';
 
                                 $active .= ' layui-this';
 
                             }
 
                             }
 
                             $k = $k + 1;
 
                             $k = $k + 1;
 
-                            $tab .= '<li class="' . $active . '"><a href="javascript:;" id="tab-' . $key . '-child-' . $k . '" toggle_key="' . $key . '" toggle_id="' . $k . '" toggle_child=".dever_' . $key . '_child" toggle="#' . $key . '-child-' . $k . '" onclick="showToggle($(this))">第' . $k . '条</a></li>';
 
+                            if (!is_string($n)) {
 
+                                $n = '第' . $k . '条';
 
+                            }
 
+                            $tab .= '<li class="' . $active . '"><a href="javascript:;" id="tab-' . $key . '-child-' . $k . '" toggle_key="' . $key . '" toggle_id="' . $k . '" toggle_child=".dever_' . $key . '_child" toggle="#' . $key . '-child-' . $k . '" onclick="showToggle($(this))">'.$n.'</a></li>';
 
+                            $i++;
 
                         }
 
                         }
 
                     }
 
                     }
 
                     
                     
                 } else {
 
                 } else {
 
-                    $this->update_child(array(), $method, $key, $result, 0);
 
+                    $this->update_child(array(), $method, $key, $result, 0, $delete);
 
 
 
                     $tab = '<li class="active layui-this"><a href="javascript:;" id="tab-' . $key . '-child-1" toggle_key="' . $key . '" toggle_id="1" toggle_child=".dever_' . $param['col'] . '_child" toggle="#' . $key . '-child-1" onclick="showToggle($(this))">第1条</a></li>';
 
                     $tab = '<li class="active layui-this"><a href="javascript:;" id="tab-' . $key . '-child-1" toggle_key="' . $key . '" toggle_id="1" toggle_child=".dever_' . $param['col'] . '_child" toggle="#' . $key . '-child-1" onclick="showToggle($(this))">第1条</a></li>';
 
                 }
 
                 }
 
@@ -2570,13 +2625,18 @@ class Database
 
      *
 
      *
 
      * @return array
 
      * @return array
 
      */
 
      */
 
-    private function update_child($data, $param, $key, &$result, $index)
 
+    private function update_child($data, $param, $key, &$result, $index, $delete = true)
 
     {
 
     {
 
         $style = '';
 
         $style = '';
 
         if ($index != 0) {
 
         if ($index != 0) {
 
             $style = 'style="display:none;"';
 
             $style = 'style="display:none;"';
 
         }
 
         }
 
-        $result .= '<div id="' . $key . '-child-' . ($index + 1) . '" class="dever_' . $key . '_child dever_form_add_child" ' . $style . '><div class="dever_form_delete">[删除]</div>';
 
+        $result .= '<div id="' . $key . '-child-' . ($index + 1) . '" class="dever_' . $key . '_child dever_form_add_child" ' . $style . '>';
 
+
 
+        if ($delete) {
 
+            $result .= '<div class="dever_form_delete">[删除]</div>';
 
+        }
 
+
 
         foreach ($param as $k => $v) {
 
         foreach ($param as $k => $v) {
 
             $v['type'] = $v['update'];
 
             $v['type'] = $v['update'];

+ 6 - 1
src/Lib/Input.php
View File 

@@ -165,10 +165,15 @@ class Input
 
         }
 
         }
 
 
 
         $class = '';
 
         $class = '';
 
+        $style = '';
 
         if (layadmin()) {
 
         if (layadmin()) {
 
             //$class = 'layui-form-label';
 
             //$class = 'layui-form-label';
 
+            if (isset($param['update']) && is_array($param['update'])) {
 
+                $style = ' style="margin:10px;"';
 
+            }
 
         }
 
         }
 
-        $html = '<div><label style="font-size:14px;font-weight:bold;" class="'.$class.'">' . $param['name'] . $param['cue'] . '</label></div>';
 
+        
+        $html = '<div '.$style.'><label style="font-size:14px;font-weight:bold;" class="'.$class.'">' . $param['name'] . $param['cue'] . '</label></div>';
 
 
 
         return $html;
 
         return $html;
 
     }
 
     }

+ 7 - 0
template/layadmin/project/database/list.php
View File 

@@ -52,6 +52,13 @@ $view
 
 
 
 ->fetch('#dever-name', 'manage/auth.config#title')
 
 ->fetch('#dever-name', 'manage/auth.config#title')
 
 
 
+->fetch('#l@value', 'manage/database.info#l')
 
+->fetch('#project@value', 'manage/database.info#project')
 
+->fetch('#tables@value', 'manage/database.info#table')
 
+->fetch('#menu@value', 'manage/database.info#menu')
 
+->fetch('#menu_id@value', 'manage/database.info#menu_id')
 
+->fetch('#search_option_state@value', 'manage/database.info#state')
 
+
 
 # 总数据　加在头部里吧
 
 # 总数据　加在头部里吧
 
 //->fetch('#list-desc', '<{Dever::load("manage/database.info#list_desc")}>(共<{Dever::total("current")}>条)')
 
 //->fetch('#list-desc', '<{Dever::load("manage/database.info#list_desc")}>(共<{Dever::total("current")}>条)')