htui-yllkbz 1.3.22 → 1.3.25

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "htui-yllkbz",
-  "version": "1.3.22",
+  "version": "1.3.25",
+  "port": "8082",
   "typings": "types/index.d.ts",
   "main": "lib/htui.common.js",
   "style": "lib/htui.css",
@@ -23,9 +24,10 @@
     "core-js": "^3.6.5",
     "element-ui": "^2.14.1",
     "html2canvas": "1.0.0-rc.1",
-    "htui-yllkbz": "^1.2.35",
+    "htui-yllkbz": "^1.3.24",
     "mavon-editor": "^2.10.4",
     "moment": "^2.29.1",
+    "oidc-client": "^1.11.5",
     "vue": "^2.6.11",
     "vue-class-component": "^7.2.3",
     "vue-kst-auth": "^2.1.15",

package/src/App.vue

@@ -4,36 +4,36 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2021-12-21 17:25:49
+ * @LastEditTime: 2022-05-10 10:39:13
 -->
 <template>
   <div id="app">
-    <SelectTable :columns="[]"
-                 :config="JSON.stringify({
-           key: 'code',
-           disabled:false,
-           clearable:true,
-           value:undefined,
-           name:'id',
-           ajax:{
-          type:'get',
-          url: '/asset-model/api/app/asset-model-instance',
-           },  
-         text:'name',
-         })"></SelectTable>
-
+    <el-button type=""
+               @click="test">测试</el-button>
+    <HtSelectBaseData dataTypeId="chengbenzhongxin"
+                      v-model="state.value"
+                      @change="change"></HtSelectBaseData>
+    <HtSelectBaseData dataTypeId="positions"
+                      :multiple="false"
+                      v-model="state.value"
+                      @change="change"></HtSelectBaseData>
     <router-view></router-view>
   </div>
 </template>
 
 <script lang="ts">
 import { Component, Vue } from "vue-property-decorator";
-import SelectTable from "@/packages/SelectTable/index.vue";
-
+import HtSelectBaseData from "@/packages/HtSelectBaseData";
+import { mgr } from "@/plugins/oidc-client";
 @Component({
-  components: { SelectTable },
+  components: {
+    HtSelectBaseData,
+  },
 })
 export default class App extends Vue {
+  state = {
+    value: undefined,
+  };
   /** 生命周期 */
   created() {
     // 动态加载引用文件
@@ -51,6 +51,61 @@ export default class App extends Vue {
     });
     document.getElementsByTagName("head")[0].innerHTML = heatStr;
   }
+  change() {
+    // console.log("eeee", e);
+  }
+  test(e: any) {
+    //mgr.removeUser();
+    // mgr.events.
+    //console.log("eeee", mgr.getUser().then(res));
+    // mgr.getUser().then((res) => {
+    //   console.log("eeee", res);
+    // });
+
+    e.preventDefault();
+    e.stopPropagation();
+
+    mgr.signoutRedirect();
+    // mgr.revokeAccessToken();
+    // mgr.signoutCallback(window.location.href, true).then((res) => {
+    //   alert;
+    //   console.log("rrres", res);
+    //   //
+    // });
+    mgr.signinRedirect();
+    // mgr.signoutRedirectCallback().then(() => {
+    //   mgr.getUser().then((user) => {
+    //     console.log("user", user);
+    //   });
+    // });
+    //   console.log("ttt", tt, mgr.getUser());
+    // });
+    //mgr.signinSilent();
+    // mgr.removeUser().then((res) => {
+    //   console.log("rres", res);
+    //   mgr.signinRedirect();
+    // });
+    // mgr.signoutRedirect(); //退出登录
+    //mgr.removeUser();
+    // mgr.signoutRedirectCallback().then((res) => {
+    //   console.log("res", res);
+    // }); //登录
+    // mgr.getUser(); //获取用户信息
+    // mgr.signinRedirectCallback(); //callback
+    //  mgr.revokeAccessToken();
+    //mgr.
+    //mgr.signoutPopup();
+    //mgr.signinPopup();
+    // mgr.signoutRedirectCallback(window.location.href).then((res) => {
+    //   //window.location.href = window.location.href;
+    //   console.log("res", res);
+    //   // mgr.signinRedirect();
+    // });
+    //  mgr.signoutRedirect();
+    //mgr.clearStaleState();
+    // mgr.signinRedirectCallback(window.location.href);
+    // mgr.signinRedirect();
+  }
 }
 </script>
 

package/src/main.ts

@@ -1,14 +1,24 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: hutao
+ * @Date: 2021-11-15 14:41:40
+ * @LastEditors: hutao
+ * @LastEditTime: 2022-04-29 17:05:53
+ */
 import Vue from "vue";
 import App from "./App.vue";
 import VueRouter from "vue-router";
 import routes from "./router";
 import store from "./store";
 import ElementUI from "element-ui";
+import HtUi from "htui-yllkbz";
 import "./styles.scss";
 import { _axios, baseConfig } from "vue-kst-auth";
 // import axios from "axios";
 Vue.use(ElementUI);
 Vue.use(VueRouter);
+Vue.use(HtUi);
 
 /** 设置axios返回类型 */
 Vue.config.productionTip = false;

package/src/packages/HtBaseData/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div>
+
     <!-- 选择部门 -->
     <template v-if="
         state.configJson['departmentId'] &&
@@ -28,7 +29,7 @@
         }"
                    @click.native="selectClick($event)"
                    ref="departmentId"
-                   @change="setSelctData('departmentId')"
+                   @change="setSelctData('departmentId',$event)"
                    :options="organizationUsersTree">
       </el-cascader>
       <el-cascader-panel v-if="state.configJson['departmentId'].panel"
@@ -47,7 +48,7 @@
           multiple: state.configJson['departmentId'].multiple,
         }"
                          ref="departmentId"
-                         @change="setSelctData('departmentId')"
+                         @change="setSelctData('departmentId',$event)"
                          :options="organizationUsersTree">
         <template slot-scope="{ data }">
           <span>{{ data.label }}</span>
@@ -116,7 +117,7 @@
         }"
                    ref="departmentUser"
                    @click.native="selectClick($event)"
-                   @change="setSelctData('departmentUser')"
+                   @change="setSelctData('departmentUser',$event)"
                    :options="organizationUsersTreeUser">
         <template slot-scope="{ data }">
           <p class="ht-user-dot"
@@ -163,7 +164,7 @@
           multiple: state.configJson['departmentUser'].multiple,
         }"
                          ref="departmentUser"
-                         @change="setSelctData('departmentUser')"
+                         @change="setSelctData('departmentUser',$event)"
                          :options="organizationUsersTreeUser">
         <template slot-scope="{ data }">
           <p class="ht-user-dot"
@@ -281,10 +282,10 @@
               multiple: state.configJson[item.code].multiple,
             }"
                        :ref="`${item.code}`"
-                       @change="setSelctData(item.code)"
+                       @change="setSelctData(item.code,$event)"
                        :options="getbaseDataInfo[item.id]"></el-cascader>
           <el-cascader-panel v-else
-                             @click.native="selectClick($event)"
+                             @click.native="selectClick($event,)"
                              :placeholder="`请选择${item.name}`"
                              class="component-item"
                              :key="item.id"
@@ -300,7 +301,7 @@
               multiple: state.configJson[item.code].multiple,
             }"
                              :ref="`${item.code}`"
-                             @change="setSelctData(item.code)"
+                             @change="setSelctData(item.code,$event)"
                              :options="getbaseDataInfo[item.id]"></el-cascader-panel>
         </template>
       </template>
@@ -650,15 +651,27 @@ export default class CommonDatas extends Vue {
     // });
   }
   /** 设置下拉数据(级联选择) */
-  setSelctData(key: string) {
+  setSelctData(key: string, e?: string) {
+    const value = e ? e : this.state.selectVal[key];
     const ref: any | undefined = (this.$refs[key] as any)[0] || this.$refs[key];
-    const checkList = ref ? ref.getCheckedNodes() : [];
+
+    let checkList = [];
+    if (ref && ref.getCheckedNodes() && ref.getCheckedNodes()[0] !== null) {
+      checkList = ref.getCheckedNodes();
+    } else if (
+      ref &&
+      ref.getCheckedNodes() &&
+      ref.getCheckedNodes()[0] === null
+    ) {
+      checkList = [ref.panel.getNodeByValue(value)];
+    }
+
     /** 过滤在多选模式下，Tag时触发删除 */
     const checkNodes = checkList.filter((item: any) => {
-      return this.state.selectVal[key]?.includes(item.data.id);
+      return value?.includes(item.data.id);
     });
-    this.state.selectValData[key] = [];
     if (checkNodes && checkNodes.length && checkNodes[0] !== null) {
+      this.state.selectValData[key] = [];
       checkNodes.forEach(
         (item: { data?: { id: string; name: string } } | undefined) => {
           const { data } = item || { data: "" };

package/src/packages/index.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-10-21 10:08:41
  * @LastEditors: hutao
- * @LastEditTime: 2022-04-13 13:56:15
+ * @LastEditTime: 2022-05-05 09:12:46
  */
 
 // 导入组件
@@ -28,6 +28,7 @@ import HtBaseData from './HtBaseData/index'
 
 
 
+
 // 存储组件列表
 const components = [HtBaseData, HtSelectTable, HtPagination, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo]
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册

package/src/plugins/oidc-client.ts

@@ -0,0 +1,37 @@
+/* eslint-disable @typescript-eslint/camelcase */
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: hutao
+ * @Date: 2022-05-06 17:56:08
+ * @LastEditors: hutao
+ * @LastEditTime: 2022-05-09 14:20:45
+ */
+import Oidc from "oidc-client";
+function getCurrentUrl() {
+  let href = window.location.pathname;
+  if (href.charAt(href.length - 1) === '/') {
+    href = href.substring(0, href.length - 1)
+  }
+  console.log('href', href, window.location);
+  console.log('window.location.host + href', window.location.origin + href);
+  return window.location.origin + href
+}
+export const mgr = new Oidc.UserManager({
+  // authority: "oauth2/api",//认证服务器
+  authority: "http://192.168.3.237:44318",//认证服务器
+  client_id: "AuthServer_App", //表示客户端的ID，必选项
+  //redirect_uri: "http://192.168.3.113:8082/product_architecture", //表示重定向URI，认证服务器回调的客户端页面。可选项
+  redirect_uri: getCurrentUrl(), //表示重定向URI，认证服务器回调的客户端页面。可选项
+  // redirect_uri: "http://192.168.3.252:4200", //表示重定向URI，认证服务器回调的客户端页面。可选项
+  response_type: "code", // response_type：表示授权类型，必选项
+  userStore: new Oidc.WebStorageStateStore({ store: window.localStorage }),
+  scope: "offline_access AuthServer", //scope：表示申请的权限范围，可选项
+  post_logout_redirect_uri: getCurrentUrl(),
+  automaticSilentRenew: false,
+
+  extraQueryParams: {
+    _tenant: 'default'
+  }
+
+});

package/src/views/About.vue

@@ -4,10 +4,11 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2022-04-13 13:51:23
+ * @LastEditTime: 2022-05-09 10:05:08
 -->
 <template>
   <div>
+    ...................
     <HtSelectUser :value="['be12db32-1718-a43d-1cf8-39f97d1d872f','5f2d6558-4e98-9054-413f-39fc4c63ebac','959f6988-a74b-f6f7-0fb6-3a0314e0eaad']"
                   :multiple="true"></HtSelectUser>
     <!-- <el-button type=""
@@ -60,6 +61,7 @@ import { Component, Vue } from "vue-property-decorator";
 import HtTable from "@/packages/HtTable/index.vue";
 import HtCountDown from "@/packages/HtCountDown/index.vue";
 import HtSelectUser from "@/packages/HtSelectUser/index.vue";
+
 import "htui-yllkbz/lib/htui.css";
 interface State {
   /** 数据状态 */