发布2.3测试版

2021-05-02 05:55:42 +08:00
parent 8732c85312
commit ef8224d20e
83 changed files with 635 additions and 1361 deletions
@@ -1,9 +1,3 @@
-<style>
-.close-header { margin: 0 15px 0; }
-</style>
-
-<button type="button" data-dismiss="dialog" class="close close-header">&times;</button>
-
 <ul class="nav nav-tabs padder m-t" id="api-dialog">
    <li class="active"><a href="#modal-department" data-toggle="tab">部门</a></li>
    <li><a href="#modal-role" data-toggle="tab">角色</a></li>
@@ -15,7 +9,29 @@

 <script>
 (function($) {
-    var params = {{json_encode($gets)}};
+    var params = JSON.parse('{{json_encode($gets)}}');
+
+    var option = gdoo.formKey(params);
+    var doc = getIframeDocument(params.iframe_id);
+    if (doc) {
+        var $option_id = $('#' + option.id, doc);
+        var $option_text = $('#'+option.id + '_text', doc);
+    } else {
+        var $option_id = $('#' + option.id);
+        var $option_text = $('#' + option.id + '_text');
+    }
+    var id = $option_id.val();
+    var text = $option_text.val();
+    var res = {};
+    if (id) {
+        var ids = id.split(',');
+        var texts = text.split(',');
+        for (var i = 0; i < ids.length; i++) {
+            res[ids[i]] = texts[i];
+        }
+    }
+    dialogCacheSelected[option.id] = res;
+
    var routes = {
        '#modal-user': 'user/user/dialog',
        '#modal-role': 'user/role/dialog',
@@ -28,6 +44,7 @@

    function loadData(target) {
        params['prefix'] = 1;
+        params['is_org'] = 1;
        $.get(app.url(routes[target], params), function(html) {
            $('#tab-content').html(html);
        });
@@ -114,7 +114,7 @@
        <form method="post" id="widget-edit" name="widget_edit">
        <div class="quick-edit">
            <div class="row row-sm">
-                <gdooDraggable
+                <gdoo-draggable
                    v-model="menus"
                    item-key="id"
                    group="menus"
@@ -131,7 +131,7 @@
                            <div class="title">{{element.name}}</div>
                        </div>
                    </template>
-                </gdooDraggable>
+                </gdoo-draggable>
                <div class="quick-edit-text">
                    <a href="javascript:;" @click="quickAdd">
                        <div class="quick-icon quick-edit-add">
@@ -143,7 +143,7 @@
            </div>
        </div>
        
-        <gdooDraggable 
+        <gdoo-draggable 
            class="row row-sm todo-edit"
            v-model="infos"
            handle=".todo-edit-l-t"
@@ -176,10 +176,10 @@
                </div>
            </div>
            </template>
-        </gdooDraggable>
+        </gdoo-draggable>
        
        <div class="row row-sm widget-edit">
-            <gdooDraggable
+            <gdoo-draggable
                class="col-xs-12 col-sm-8"
                v-model="leftWidgets"
                handle=".panel-heading"
@@ -207,9 +207,9 @@
                        </div>
                    </div>
                </template>
-            </gdooDraggable>
+            </gdoo-draggable>

-            <gdooDraggable
+            <gdoo-draggable
                class="col-xs-12 col-sm-4"
                v-model="rightWidgets"
                handle=".panel-heading"
@@ -237,17 +237,18 @@
                        </div>
                    </div>
                </template>
-            </gdooDraggable>
+            </gdoo-draggable>
        </div>
    </div>
 </div>
@endverbatim

 <script>
+
 var configData = {{$json}};
 var settingWidget = Vue.createApp({
    components: {
-        gdooDraggable
+        gdooDraggable,
    },
    data() {
        return {
@@ -291,7 +291,7 @@ a { outline: none; }

 <div class="dashboard-footer">
    <div class="box">
-    {{$version}} {{$licenseType ? $licenseType : '开源版'}}
+    {{$version}}
    </div>
 </div>

@@ -2,7 +2,7 @@
 <html>
 <head>
    <meta charset="utf-8" />
-    <title>{{$setting['title']}} - Powered By {{$setting['powered']}}</title>
+    <title>{{$setting['title']}} - {{$powered}}</title>
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=yes" />
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

@@ -5,7 +5,7 @@
            软件版本
        </td>
        <td align="left" style="border-top:0;">
-            {{$version}} {{$licenseType ? $licenseType : '开源版'}}
+            {{$version}}
        </td>
    </tr>
    <tr>