ap-dev 1.1.0 → 1.1.4

package/dev/ApiPanel/menus.js

@@ -22,22 +22,19 @@ const menus = [
         children: [
             {
                 id: 'ApiLayout',
-                label: '2.1 页面布局组件'
+                label: '2.1 布局相关组件'
             }, {
                 id: 'ApiGrid',
                 label: '2.2 表格组件'
+            },{
+                id: 'ApiRequest',
+                label: '2.3 request'
             }, {
                 id: 'ApiApButton',
-                label: '2.3 按钮组件'
-            }, {
-                id: 'ApiFormSearchTree',
-                label: '2.4 表单-树查询'
+                label: '2.4 按钮组件'
             }, {
-                id: 'ApiApSearchPick',
-                label: '2.5 表单-树-表选择'
-            },{
-                id: 'ApiRequest',
-                label: '2.6 request'
+                id: 'ApiForm',
+                label: '2.5 表单相关组件'
             }]
     }, {
         id: 'ApiDefault',
@@ -61,7 +58,7 @@ const menus = [
         label: '四、前端规范',
         children: [
             {
-                id: 'ApiStyle',
+                id: 'ApiCss',
                 label: '4.1 通用CSS'
             },{
                 id: 'ApiColor',

package/dev/ApiPanel/modules/ApiAAA.vue

@@ -0,0 +1,29 @@
+<template>
+    <api-tabs :options.sync="opts"></api-tabs>
+</template>
+
+<script>
+import ApiTabs from './../components/ApiTabs'
+
+export default {
+    name: "ApiAAA",
+    components: {ApiTabs},
+    data() {
+        let opts = [
+            {
+                label: "1.测试",
+                component: "ApiTest"
+            },{
+                label: "2.测试",
+                component: "ApiTest"
+            }
+        ];
+        return {
+            opts: opts
+        }
+    }
+}
+</script>
+
+<style scoped>
+</style>

package/dev/ApiPanel/modules/ApiCss.vue

@@ -0,0 +1,32 @@
+<template>
+    <api-tabs :options.sync="opts"></api-tabs>
+</template>
+
+<script>
+import ApiTabs from './../components/ApiTabs'
+
+export default {
+    name: "ApiCss",
+    components: {ApiTabs},
+    data() {
+        let opts = [
+            {
+                label: "1.弹性盒子",
+                component: "ApiCssFlex"
+            },{
+                label: "2.表单",
+                component: "ApiCssForm"
+            },{
+                label: "3.其他",
+                component: "ApiCssOther"
+            }
+        ];
+        return {
+            opts: opts
+        }
+    }
+}
+</script>
+
+<style scoped>
+</style>

package/dev/ApiPanel/modules/ApiDcOrgController.vue

@@ -15,7 +15,7 @@
             <b>Method</b>: POST<br>
             <b>说明</b>：只获取<span class="api-code">启用</span>组织部门数据<br>
           </api-content>
-          <api-tittle-2>3、获取启动组织部门简化信息</api-tittle-2>
+          <api-tittle-2>3、获取启用组织部门简化信息</api-tittle-2>
           <api-content>
             <b>Url</b>: /dc/open/org/getEnableSimplifyOrgList<br>
             <b>Method</b>: POST<br>
@@ -27,6 +27,18 @@
             <b>Method</b>: POST<br>
             <b>说明</b>：使用表格分页形式获取全部组织部门数据<br>
           </api-content>
+            <api-tittle-2>5、获取启用厂别信息</api-tittle-2>
+            <api-content>
+                <b>Url</b>: /dc/open/org/getEnableFactList<br>
+                <b>Method</b>: POST<br>
+                <b>说明</b>：只获取<span class="api-code">启用</span>厂别<span class="api-code">（attr为4(厂别)，flagA为1(生产单位)）</span>数据<br>
+            </api-content>
+            <api-tittle-2>6、获取启用厂别简化信息</api-tittle-2>
+            <api-content>
+                <b>Url</b>: /dc/open/org/getEnableSimplifyFactList<br>
+                <b>Method</b>: POST<br>
+                <b>说明</b>：只获取<span class="api-code">启用</span>厂别<span class="api-code">（attr为4(厂别)，flagA为1(生产单位)）</span>，且服务器<span class="api-code">只返回必要字段（fdId,fdCompanyId,fdParentId,fdName）</span><br>
+            </api-content>
           <api-tittle-1>共用参数:</api-tittle-1>
           <api-table :data="orgDataData" :columns="dataCols" />
         </div>
@@ -57,6 +69,12 @@
             <b>Method</b>: POST<br>
             <b>说明</b>：使用表格分页形式获取<span class="api-code">启用</span>组织人员数据<br>
           </api-content>
+            <api-tittle-2>5、获取启用组织人员简化信息</api-tittle-2>
+            <api-content>
+                <b>Url</b>: /dc/open/person/getEnableSimplifyPersonList<br>
+                <b>Method</b>: POST<br>
+                <b>说明</b>：只获取<span class="api-code">启用</span>组织人员数据，且服务器<span class="api-code">只返回必要字段（fdId,fdCompanyId,fdNo,fdName,fdFullName,fdDeptId,fdDeptCode,fdDeptName）</span><br>
+            </api-content>
           <api-tittle-1>共用参数:</api-tittle-1>
           <api-table :data="personDataData" :columns="dataCols" />
         </div>
@@ -97,6 +115,26 @@ export default {
         default: '',
         memo: '多个父节点Id拼接（使用“,”拼接）'
       }, {
+            name: 'factNo',
+            type: '字符串',
+            default: '',
+            memo: '厂别Id'
+        }, {
+            name: 'factNos',
+            type: '字符串',
+            default: '',
+            memo: '多个厂别Id拼接（使用“,”拼接）'
+        }, {
+            name: 'classNo',
+            type: '字符串',
+            default: '',
+            memo: '课别Id'
+        }, {
+            name: 'classNos',
+            type: '字符串',
+            default: '',
+            memo: '多个课别Id拼接（使用“,”拼接）'
+        }, {
         name: 'deptId',
         type: '字符串',
         default: '',
@@ -107,11 +145,52 @@ export default {
         default: '',
         memo: '多个部门Id拼接（使用“,”拼接）'
       }, {
+            name: 'attr',
+            type: '字符串',
+            default: '',
+            memo: '部门属性'
+        }, {
+            name: 'attrs',
+            type: '字符串',
+            default: '',
+            memo: '多个部门属性拼接（使用“,”拼接）'
+        }, {
+            name: 'type',
+            type: '字符串',
+            default: '',
+            memo: '部门类型'
+        }, {
+            name: 'types',
+            type: '字符串',
+            default: '',
+            memo: '多个部门类型拼接（使用“,”拼接）'
+        }, {
+            name: 'flagA',
+            type: '字符串',
+            default: '',
+            memo: '部门标识A'
+        }, {
+            name: 'flagAs',
+            type: '字符串',
+            default: '',
+            memo: '多个部门标识A拼接（使用“,”拼接）'
+        }, {
         name: 'disabled',
         type: '数值',
         default: '',
         memo: '是否禁用<span class="api-code">（0：启用，1：禁用）</span>'
-      }]
+      }, {
+            name: 'listType',
+            type: '字符串',
+            default: 'model',
+            memo: '返回数类型，默认返回Model对象列表<span class="api-code">（keyVale：返回键值对列表）</span>'
+        }, {
+            name: 'keyValueType',
+            type: '字符串',
+            default: 'fdId',
+            memo: '键值对类型，默认以fdId作为值<span class="api-code">（fdCode：以fdCode作为值）</span>，fdName作为键<br/>' +
+                '<span class="api-memo">listType为KeyValue时生效</span>'
+        }]
 
     const personDataData = [
       {
@@ -144,7 +223,18 @@ export default {
         type: '数值',
         default: '',
         memo: '是否禁用<span class="api-code">（0：启用，1：禁用）</span>'
-      }]
+      }, {
+            name: 'listType',
+            type: '字符串',
+            default: 'model',
+            memo: '返回数类型，默认返回Model对象列表<span class="api-code">（keyVale：返回键值对列表）</span>'
+        }, {
+            name: 'keyValueType',
+            type: '字符串',
+            default: 'fdId',
+            memo: '键值对类型，默认以fdId作为值<span class="api-code">（fdNo：以fdNo作为值）</span>，fdName作为键<br/>' +
+                '<span class="api-memo">listType为KeyValue时生效</span>'
+        }]
 
     return {
       activeName: 'orgController',
@@ -158,4 +248,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

package/dev/ApiPanel/modules/ApiForm.vue

@@ -0,0 +1,29 @@
+<template>
+    <api-tabs :options.sync="opts"></api-tabs>
+</template>
+
+<script>
+import ApiTabs from './../components/ApiTabs'
+
+export default {
+    name: "ApiForm",
+    components: {ApiTabs},
+    data() {
+        let opts = [
+            {
+                label: "1.树查询",
+                component: "ApiFormSearchTree"
+            }, {
+                label: "2.树-表选择",
+                component: "ApiApSearchPick"
+            }
+        ];
+        return {
+            opts: opts
+        }
+    }
+}
+</script>
+
+<style scoped>
+</style>

package/dev/ApiPanel/modules/ApiGrid.vue

@@ -16,10 +16,10 @@
             </el-radio-group>
           </div>
           <div class="flex-1 api-grid-tab-ctn-table">
-            <api-table
-              :data="gridAttrData"
+            <api-table
+              :data="gridAttrData"
               :columns="gridAttrCols"
-              :span-method="gridSpanMethod"
+              :span-method="gridSpanMethod"
             />
           </div>
         </div>
@@ -1224,9 +1224,9 @@ searchPickerParamsMain: (row, col, selectedNode) => {
     searchPickerUrlMain: "/xxx",
     searchPickerRenderKey: {idKey:"fdTypeId"},
     searchPickerSelectMultipleMain: true,
-    searchPickerConfirm: (row, checkedNodes) => {
-        row.fdTypeId = checkedNodes[0].fdId;
-        row.fdTypeName = checkedNodes[0].fdName;
+    searchPickerConfirm: (row, selectedRows) => {
+        row.fdTypeId = selectedRows[0].fdId;
+        row.fdTypeName = selectedRows[0].fdName;
         return true;
     },
     searchPickerClear: (row) => {
@@ -1359,7 +1359,11 @@ searchPickerParamsMain: (row, col, selectedNode) => {
         name: 'clearSelected',
         memo: '清空选中数据。',
         code: '<span class="api-code">this.$refs.tableRef.clearSelected();</span>'
-      }]
+      }, {
+            name: 'clearHighlight',
+            memo: '清空高亮背景。',
+            code: '<span class="api-code">this.$refs.tableRef.clearHighlight();</span>'
+     }]
     const methodData_toggle = [
       {
         group: '触发事件',
@@ -1496,7 +1500,7 @@ searchPickerParamsMain: (row, col, selectedNode) => {
 
       // 方法
       const getDataRowSpan = 9
-      const operateRowSpan = 5
+      const operateRowSpan = 6
       const toggleRowSpan = 5
       const otherRowSpan = 1
 
@@ -1636,4 +1640,4 @@ searchPickerParamsMain: (row, col, selectedNode) => {
     .api-grid /deep/ .el-tabs__content {
         flex: 1;
     }
-</style>
+</style>

package/dev/ApiPanel/modules/ApiLayout.vue

@@ -1,238 +1,29 @@
 <template>
-  <div>
-    <api-tittle-1>页面布局：</api-tittle-1>
-    <api-content>
-      该布局组件为element自带布局组件的增强版本。所有页面的基础布局需要使用该布局方式。
-    </api-content>
-    <api-tittle-2>一、通用布局容器</api-tittle-2>
-    <api-tittle-2>1.1 外层容器 &lt;ap-container&gt;</api-tittle-2>
-    <api-content>
-      当子元素中包含 &lt;ap-header&gt; 或 &lt;ap-footer&gt; 时，全部子元素会垂直上下排列，否则会水平左右排列。
-    </api-content>
-    <api-tittle-2>1.2 顶栏容器 &lt;ap-header&gt;</api-tittle-2>
-    <api-content>
-      高度默认auto，可自定义高度：
-      <api-code>&lt;ap-header height="400px"/&gt;</api-code>
-      <api-code>&lt;ap-header height="50%"/&gt;</api-code>
-      1.2.1 顶栏表单式样：覆盖表单默认式样
-      <api-code>&lt;ap-header&gt;<br>
-        &lt;el-form class="layout-header-form"&gt;<br>
-        &lt;el-form-item class="layout-header-form-item"&gt;&lt;el-form-item&gt;<br>
-        &lt;el-form&gt;<br>
-        &lt;ap-header&gt;
-      </api-code>
-    </api-content>
-    <api-tittle-2>1.3 侧边容器 &lt;ap-aside&gt;</api-tittle-2>
-    <api-content>
-      宽度默认300px，可自定义高度：
-      <api-code>&lt;ap-aside width="500px"/&gt; <br>&lt;ap-aside width="50%"/&gt;</api-code>
-      注：&lt;ap-aside&gt;子元素默认使用flex布局、垂直排列。<br>
-      1.3.1 侧边容器常用布局方式<br>
-      <api-code>
-        &lt;ap-aside&gt;<br>
-        &lt;div class="layout-aside-header"&gt;<br>
-        &lt;div class="layout-aside-header-title"&gt; 标题 &lt;/div&gt;<br>
-        &lt;div class="layout-aside-header-icon"&gt; icon图表&lt;/div&gt;<br>
-        &lt;/div&gt;<br>
-        &lt;div class="layout-aside-content"&gt;主要内容&lt;/div&gt;<br>
-        &lt;/ap-aside&gt;</api-code>
-    </api-content>
-    <api-tittle-2>1.4 主要区域容器 &lt;ap-main&gt;</api-tittle-2>
-    <api-content>
-      主要区域容器
-    </api-content>
-    <api-tittle-2>1.5 底栏容器 &lt;ap-footer&gt;</api-tittle-2>
-    <api-content>
-      高度默认60px，可自定义高度：
-      <api-code>&lt;ap-footer height="400px"/&gt;</api-code>
-      <api-code>&lt;ap-footer height="50%"/&gt;</api-code>
-    </api-content>
-    <api-content>
-      <br>
-      <b>注意：</b>
-      <br>1. 以上组件采用了 flex 布局，使用前请确定目标浏览器是否兼容。
-      <br>2. &lt;ap-container&gt; 的子元素只能是后四者，后四者的父元素也只能是 &lt;ap-container&gt;
-      <br>3. 除了&lt;ap-container&gt; ，其他四个均支持margin参数。参数固定四位，每一位表示是否有margin。
-      <br>如：<span class="api-code">margin="0111"</span>从左到右，分别表示：margin-top:0px、margin-right:10px、margin-bottom:10px、margin-left:10px
-    </api-content>
-
-    <api-tittle-2>二、常用布局</api-tittle-2>
-    <api-tittle-2>2.1 单个布局</api-tittle-2>
-    <div class="layout-ctn">
-      <div class="layout-box" style="width: 100%;height: 100%;">
-        页面内容
-      </div>
-    </div>
-    <api-content>
-      <api-code>{{ js1 }}</api-code>
-    </api-content>
-    <api-tittle-2>2.2 上下布局</api-tittle-2>
-    <div class="layout-ctn">
-      <div class="layout-box" style="width: 100%;height: 30px;">
-        header内容
-      </div>
-      <div class="layout-box" style="width: 100%;height: 65px;margin-top: 5px">
-        main内容
-      </div>
-    </div>
-    <api-content>
-      <api-code>{{ js2 }}</api-code>
-    </api-content>
-    <api-tittle-2>2.3 左右布局:</api-tittle-2>
-    <div class="layout-ctn">
-      <div class="layout-box" style="width: 50px;height: 100%;float: left">
-        左侧内容
-      </div>
-      <div class="layout-box" style="width: 145px;height: 100%;margin-left: 5px">
-        main内容
-      </div>
-    </div>
-    <api-content>
-      <api-code>{{ js3 }}</api-code>
-    </api-content>
-    <api-tittle-2>2.4 左右布局</api-tittle-2>
-    <div class="layout-ctn">
-      <div class="layout-box" style="width: 50px;height: 100%;float: left">
-        左侧内容
-      </div>
-      <div class="layout-box" style="width: 145px;height: 25px;margin-left: 5px">
-        header内容
-      </div>
-      <div class="layout-box" style="width: 145px;height: 70px;margin-left: 5px; margin-top: 5px">
-        main内容
-      </div>
-    </div>
-    <api-content>
-      <api-code>{{ js4 }}</api-code>
-    </api-content>
-
-    <api-tittle-2>2.5 上下主从布局</api-tittle-2>
-    <div class="layout-ctn">
-      <div class="layout-box" style="width: 100%;height: 20px;">
-        header内容
-      </div>
-      <div class="layout-box" style="width: 100%;height: 35px;margin-top: 5px">
-        main：主内容
-      </div>
-      <div class="layout-box" style="width: 100%;height: 35px;margin-top: 5px">
-        main：明细内容
-      </div>
-    </div>
-    <api-content>
-      <api-code>{{ js5 }}</api-code>
-    </api-content>
-    <api-tittle-2>2.6 左右主从布局</api-tittle-2>
-    <div class="layout-ctn">
-      <div class="layout-box" style="width: 100%;height: 25px;">
-        header内容
-      </div>
-      <div class="layout-box" style="width: 95px;height: 70px;float: left;margin-top: 5px;">
-        main：主内容
-      </div>
-      <div class="layout-box" style="width: 100px;height: 70px;margin-left: 5px;margin-top: 5px;">
-        main：明细内容
-      </div>
-    </div>
-    <api-content>
-      <api-code>{{ js6 }}</api-code>
-    </api-content>
-  </div>
+    <api-tabs :options.sync="opts"></api-tabs>
 </template>
 
 <script>
-import { ApiCode, ApiContent, ApiTable, ApiTittle1, ApiTittle2 } from './../components'
+import ApiTabs from './../components/ApiTabs'
 
 export default {
-  name: 'ApiLayout',
-  components: {
-    ApiTable, ApiCode, ApiTittle1, ApiContent, ApiTittle2
-  },
-  data() {
-    const js1 = `<template>
-    <ap-container>
-        <ap-main margin="1111">
-            main内容...
-        </ap-main>
-    </ap-container>
-</template>`
-    const js2 = `<template>
-    <ap-container>
-        <ap-header margin="1111">header内容</ap-header>
-        <ap-main margin="0111">main内容</ap-main>
-    </ap-container>
-</template>`
-    const js3 = `<template>
-    <ap-container>
-        <ap-aside margin="1111">左侧内容...</ap-aside>
-        <ap-main margin="1110">main内容...</ap-main>
-    </ap-container>
-</template>`
-    const js4 = `<template>
-    <ap-container>
-        <ap-aside margin="1111">左侧内容...</ap-aside>
-        <ap-container>
-            <ap-header margin="1110">header内容...</ap-header>
-            <ap-main margin="0110">main内容...</ap-main>
-        </ap-container>
-    </ap-container>
-</template>`
-    const js5 = `<template>
-    <ap-container>
-        <ap-header margin="1111">header内容...</ap-header>
-        <ap-container>
-            <ap-header height="50%" margin="0111">主内容...</ap-header>
-            <ap-main margin="0111">明细内容...</ap-main>
-        </ap-container>
-    </ap-container>
-</template>
-或：主内容和明细内容等分时
-<template>
-    <ap-container>
-        <ap-header margin="1111">header内容...</ap-header>
-        <ap-container>
-            <ap-main margin="0111">主内容...</ap-main>
-            <ap-main margin="0111">明细内容...</ap-main>
-        </ap-container>
-    </ap-container>
-</template>`
-    const js6 = `<template>
-    <ap-container>
-        <ap-header margin="1111">header内容...</ap-header>
-        <ap-container>
-            <ap-aside width="40%" margin="0111">主内容...</ap-aside>
-            <ap-main margin="0110">明细内容...</ap-main>
-        </ap-container>
-    </ap-container>
-</template>
-或：主内容和明细内容等分时
-<template>
-    <ap-container>
-        <ap-header margin="1111">header内容...</ap-header>
-        <ap-container>
-            <ap-main margin="0111">主内容...</ap-main>
-            <ap-main margin="0110">明细内容...</ap-main>
-        </ap-container>
-    </ap-container>
-</template>`
-
-    return { js1, js2, js3, js4, js5, js6 }
-  }
+    name: "ApiLayout.vue",
+    components: {ApiTabs},
+    data() {
+        let opts = [
+            {
+                label: "1.基础布局",
+                component: "ApiBaseLayout"
+            }, {
+                label: "2.左侧树布局",
+                component: "ApiApAsideTree"
+            }
+        ];
+        return {
+            opts: opts
+        }
+    }
 }
 </script>
 
 <style scoped>
-    .layout-ctn {
-        width: 212px;
-        height: 112px;
-        border: 1px dashed #9E9E9E;
-        padding: 5px;
-        background-color: #e2e7ef;
-    }
-
-    .layout-box {
-        float: left;
-        font-size: 12px;
-        padding: 5px;
-        background-color: white;
-    }
-</style>
+</style>

package/dev/ApiPanel/modules/ApiRequest.vue

@@ -37,7 +37,11 @@ export default {
     method: 'post',
     data:{}
 }).then(response => {
+    console.log("成功返回")
+}).catch((error) => {
+    console.log("异常处理")
 }).finally(() => {
+    console.log("最终回调")
 })`
     const js2 = `import Vue from 'vue'
 
@@ -56,4 +60,4 @@ export function xxxFn() {
 
 <style scoped>
 
-</style>
+</style>