diff --git a/.bk.production.env b/.bk.production.env index 59e1d73e5..ef493e14f 100644 --- a/.bk.production.env +++ b/.bk.production.env @@ -33,6 +33,7 @@ BK_API_GATEWAY_ORIGIN = ${BK_API_URL_TMPL} // 静态资源前缀 BK_STATIC_URL = {{ BK_STATIC_URL }} + // itsm 地址 BK_ITSM_URL = diff --git a/.gitignore b/.gitignore index d9a86a7d6..2faeb3b4c 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,7 @@ lib/server/conf/data-source.js lib/server/conf/encrypt-secret-key.js lib/server/conf/no-code.js lib/server/conf/iam.js +lib/server/conf/flow.js !lib/server/project-template/project-init-code/bin lib/server/project-template/project-target* diff --git a/lib/client/src/App.vue b/lib/client/src/App.vue index eb5a309df..5b35a0483 100644 --- a/lib/client/src/App.vue +++ b/lib/client/src/App.vue @@ -19,6 +19,7 @@
+
@@ -38,6 +39,8 @@ import ApplyPage from './components/apply-permission/apply-page.vue' import NoticeComponent from '@blueking/notice-component-vue2' import '@blueking/notice-component-vue2/dist/style.css' + import ChromeTips from '@blueking/chrome-tips/vue2' + import '@blueking/chrome-tips/vue2/vue2.css' import { getPlatformConfig, setDocumentTitle, setShortcutIcon } from '@blueking/platform-config'; @@ -45,10 +48,12 @@ name: 'app', components: { ApplyPage, - NoticeComponent + NoticeComponent, + ChromeTips }, data () { return { + cookieDomain: window.BKPAAS_BK_DOMAIN, noticeUrl: `${process.env.BK_AJAX_URL_PREFIX}/notice-center/getNoticeList`, systemCls: 'mac', position: 'middle', diff --git a/lib/client/src/bk-icon/demo.html b/lib/client/src/bk-icon/demo.html new file mode 100644 index 000000000..007eafbdf --- /dev/null +++ b/lib/client/src/bk-icon/demo.html @@ -0,0 +1,4233 @@ + + + + + + + + + Icon Cool + + +
+

+ +

+
+
单色图标
+
彩色图标
+
+
+
    +
  • + +

    assembly-line

    +
    • +
  • + +

    feature-conversion

    +
    • +
  • + +

    home

    +
    • +
  • + +

    minus-circle

    +
    • +
  • + +

    plus-circle

    +
    • +
  • + +

    setting

    +
    • +
  • + +

    check-circle-fill

    +
    • +
  • + +

    assembly-line-fill

    +
    • +
  • + +

    close-circle-fill

    +
    • +
  • + +

    setting-fill

    +
    • +
  • + +

    exclamation-fill

    +
    • +
  • + +

    play

    +
    • +
  • + +

    delete

    +
    • +
  • + +

    undo

    +
    • +
  • + +

    add-fill

    +
    • +
  • + +

    reduce-fill

    +
    • +
  • + +

    link

    +
    • +
  • + +

    full-screen

    +
    • +
  • + +

    delet

    +
    • +
  • + +

    upload

    +
    • +
  • + +

    set

    +
    • +
  • + +

    image

    +
    • +
  • + +

    download

    +
    • +
  • + +

    member

    +
    • +
  • + +

    info-tips

    +
    • +
  • + +

    edit

    +
    • +
  • + +

    close-small

    +
    • +
  • + +

    arrow-down

    +
    • +
  • + +

    batch-edit

    +
    • +
  • + +

    jump-link

    +
    • +
  • + +

    stretch

    +
    • +
  • + +

    drag

    +
    • +
  • + +

    circle-shape

    +
    • +
  • + +

    angle-left

    +
    • +
  • + +

    arrow-back

    +
    • +
  • + +

    badge

    +
    • +
  • + +

    46

    +
    • +
  • + +

    animatenumber

    +
    • +
  • + +

    button

    +
    • +
  • + +

    collapse

    +
    • +
  • + +

    checkbox

    +
    • +
  • + +

    dialog

    +
    • +
  • + +

    exception

    +
    • +
  • + +

    dropdownmenu

    +
    • +
  • + +

    info

    +
    • +
  • + +

    input

    +
    • +
  • + +

    form

    +
    • +
  • + +

    loading

    +
    • +
  • + +

    message

    +
    • +
  • + +

    nav

    +
    • +
  • + +

    notify

    +
    • +
  • + +

    pagination

    +
    • +
  • + +

    play-2

    +
    • +
  • + +

    popconfrim

    +
    • +
  • + +

    progress

    +
    • +
  • + +

    radio

    +
    • +
  • + +

    rate

    +
    • +
  • + +

    save

    +
    • +
  • + +

    roundprogress

    +
    • +
  • + +

    select

    +
    • +
  • + +

    sideslider

    +
    • +
  • + +

    slider

    +
    • +
  • + +

    step

    +
    • +
  • + +

    swiper

    +
    • +
  • + +

    switcher

    +
    • +
  • + +

    tab

    +
    • +
  • + +

    table

    +
    • +
  • + +

    text

    +
    • +
  • + +

    tag

    +
    • +
  • + +

    timeline

    +
    • +
  • + +

    tooltip

    +
    • +
  • + +

    transfer

    +
    • +
  • + +

    tree

    +
    • +
  • + +

    ctr+y

    +
    • +
  • + +

    ctr+z

    +
    • +
  • + +

    keyboard

    +
    • +
  • + +

    grid-2

    +
    • +
  • + +

    grid-3

    +
    • +
  • + +

    grid-4

    +
    • +
  • + +

    grid-6

    +
    • +
  • + +

    grid-5

    +
    • +
  • + +

    grid-7

    +
    • +
  • + +

    grid-8

    +
    • +
  • + +

    grid-9

    +
    • +
  • + +

    grid-10

    +
    • +
  • + +

    grid-11

    +
    • +
  • + +

    grid-12

    +
    • +
  • + +

    grid-1

    +
    • +
  • + +

    copy

    +
    • +
  • + +

    search

    +
    • +
  • + +

    diff

    +
    • +
  • + +

    user

    +
    • +
  • + +

    time-2

    +
    • +
  • + +

    date

    +
    • +
  • + +

    text-2

    +
    • +
  • + +

    border-y

    +
    • +
  • + +

    border-x

    +
    • +
  • + +

    border-all

    +
    • +
  • + +

    border-s

    +
    • +
  • + +

    radius-all

    +
    • +
  • + +

    border-z

    +
    • +
  • + +

    radius-s

    +
    • +
  • + +

    radius-sj

    +
    • +
  • + +

    radius-ys

    +
    • +
  • + +

    radius-yx

    +
    • +
  • + +

    radius-zs

    +
    • +
  • + +

    tishi_gaozhi

    +
    • +
  • + +

    tixing

    +
    • +
  • + +

    yulan

    +
    • +
  • + +

    github-logo

    +
    • +
  • + +

    update-log-fill

    +
    • +
  • + +

    histogram

    +
    • +
  • + +

    line-chart

    +
    • +
  • + +

    pie-chart

    +
    • +
  • + +

    refresh-line

    +
    • +
  • + +

    nav-toggle

    +
    • +
  • + +

    function-fill

    +
    • +
  • + +

    info-fill

    +
    • +
  • + +

    favorite

    +
    • +
  • + +

    template-fill

    +
    • +
  • + +

    summary-fill

    +
    • +
  • + +

    favorite-o

    +
    • +
  • + +

    list-fill

    +
    • +
  • + +

    user-group

    +
    • +
  • + +

    project-list

    +
    • +
  • + +

    more-dot

    +
    • +
  • + +

    grag-fill

    +
    • +
  • + +

    custom-comp-default

    +
    • +
  • + +

    folder-fill

    +
    • +
  • + +

    template-logo

    +
    • +
  • + +

    flow-fill

    +
    • +
  • + +

    function-fill

    +
    • +
  • + +

    un-full-screen

    +
    • +
  • + +

    code-full-screen

    +
    • +
  • + +

    angle-down-fill

    +
    • +
  • + +

    angle-up-fill

    +
    • +
  • + +

    angle-right-fill

    +
    • +
  • + +

    angle-left-fill

    +
    • +
  • + +

    close-line

    +
    • +
  • + +

    add-line

    +
    • +
  • + +

    save-line

    +
    • +
  • + +

    cc-jump-link

    +
    • +
  • + +

    offshelf

    +
    • +
  • + +

    add-3

    +
    • +
  • + +

    picture-fail-line

    +
    • +
  • + +

    1_deploy-fill

    +
    • +
  • + +

    loading-2

    +
    • +
  • + +

    router

    +
    • +
  • + +

    sync-failed

    +
    • +
  • + +

    sync-pending

    +
    • +
  • + +

    sync-success

    +
    • +
  • + +

    paste

    +
    • +
  • + +

    sync-default

    +
    • +
  • + +

    un-full-screen-2

    +
    • +
  • + +

    filliscreen-line

    +
    • +
  • + +

    card

    +
    • +
  • + +

    popover-2

    +
    • +
  • + +

    colorpick

    +
    • +
  • + +

    bigtree

    +
    • +
  • + +

    cascade-jilianxuankuang

    +
    • +
  • + +

    link1

    +
    • +
  • + +

    vesion-fill

    +
    • +
  • + +

    process

    +
    • +
  • + +

    off-shelf

    +
    • +
  • + +

    alert-line

    +
    • +
  • + +

    reflash-line

    +
    • +
  • + +

    token-fill

    +
    • +
  • + +

    template-fill-2

    +
    • +
  • + +

    breadcrumb

    +
    • +
  • + +

    bottom-group

    +
    • +
  • + +

    freedrag

    +
    • +
  • + +

    abnormal

    +
    • +
  • + +

    normal

    +
    • +
  • + +

    unknown

    +
    • +
  • + +

    copy-line

    +
    • +
  • + +

    comment-fill

    +
    • +
  • + +

    download-line

    +
    • +
  • + +

    invisible-eye

    +
    • +
  • + +

    level-down

    +
    • +
  • + +

    audit

    +
    • +
  • + +

    unfold

    +
    • +
  • + +

    fold

    +
    • +
  • + +

    directives

    +
    • +
  • + +

    variable

    +
    • +
  • + +

    variable-manage

    +
    • +
  • + +

    yemianhanshu

    +
    • +
  • + +

    hanshuku

    +
    • +
  • + +

    page-variable

    +
    • +
  • + +

    yuanma

    +
    • +
  • + +

    shanchu

    +
    • +
  • + +

    fankui

    +
    • +
  • + +

    auth-set

    +
    • +
  • + +

    json

    +
    • +
  • + +

    logo

    +
    • +
  • + +

    visible-eye

    +
    • +
  • + +

    process

    +
    • +
  • + +

    huabu

    +
    • +
  • + +

    drag-small

    +
    • +
  • + +

    dianzan-tianchong

    +
    • +
  • + +

    dianzan

    +
    • +
  • + +

    sync-waiting-01

    +
    • +
  • + +

    select-value

    +
    • +
  • + +

    select-variable

    +
    • +
  • + +

    select-expression

    +
    • +
  • + +

    drag-small1

    +
    • +
  • + +

    icon-manage

    +
    • +
  • + +

    document

    +
    • +
  • + +

    qiyeweixin

    +
    • +
  • + +

    erweima

    +
    • +
  • + +

    lianxi

    +
    • +
  • + +

    qq-2

    +
    • +
  • + +

    gaojing

    +
    • +
  • + +

    bubble-chart

    +
    • +
  • + +

    scatter-chart

    +
    • +
  • + +

    radar-chart

    +
    • +
  • + +

    bk-bubble-chart

    +
    • +
  • + +

    bk-scatter-chart

    +
    • +
  • + +

    fix

    +
    • +
  • + +

    export

    +
    • +
  • + +

    sql

    +
    • +
  • + +

    csv

    +
    • +
  • + +

    shuipingjuzhuduiqi

    +
    • +
  • + +

    diduiqi

    +
    • +
  • + +

    chuizhijuzhongduiqi

    +
    • +
  • + +

    youduiqi

    +
    • +
  • + +

    dingduiqi

    +
    • +
  • + +

    zuoduiqi

    +
    • +
  • + +

    data-table

    +
    • +
  • + +

    data-source-manage

    +
    • +
  • + +

    version

    +
    • +
  • + +

    mobilephone

    +
    • +
  • + +

    pc

    +
    • +
  • + +

    templateline

    +
    • +
  • + +

    file-video

    +
    • +
  • + +

    file-image

    +
    • +
  • + +

    file-text

    +
    • +
  • + +

    file-zip

    +
    • +
  • + +

    file-pdf

    +
    • +
  • + +

    file-audio

    +
    • +
  • + +

    file-doc

    +
    • +
  • + +

    file-excel

    +
    • +
  • + +

    file-ppt

    +
    • +
  • + +

    cellcellgroup

    +
    • +
  • + +

    circle

    +
    • +
  • + +

    empty

    +
    • +
  • + +

    countdown

    +
    • +
  • + +

    divider

    +
    • +
  • + +

    noticebar

    +
    • +
  • + +

    loading

    +
    • +
  • + +

    navbar

    +
    • +
  • + +

    numberkeyborad

    +
    • +
  • + +

    passwordinput

    +
    • +
  • + +

    picker

    +
    • +
  • + +

    search-2

    +
    • +
  • + +

    skeleton

    +
    • +
  • + +

    step

    +
    • +
  • + +

    treeselect

    +
    • +
  • + +

    stepper

    +
    • +
  • + +

    icon-2

    +
    • +
  • + +

    it-new-desktop

    +
    • +
  • + +

    set-fill

    +
    • +
  • + +

    battery

    +
    • +
  • + +

    wifi

    +
    • +
  • + +

    cellular-connection

    +
    • +
  • + +

    column

    +
    • +
  • + +

    grid

    +
    • +
  • + +

    info

    +
    • +
  • + +

    page

    +
    • +
  • + +

    image-small

    +
    • +
  • + +

    flow

    +
    • +
  • + +

    source

    +
    • +
  • + +

    column

    +
    • +
  • + +

    grid

    +
    • +
  • + +

    display-card

    +
    • +
  • + +

    display-list

    +
    • +
  • + +

    links

    +
    • +
  • + +

    compoment-count

    +
    • +
  • + +

    fc-count

    +
    • +
  • + +

    project-count

    +
    • +
  • + +

    user-count

    +
    • +
  • + +

    project

    +
    • +
  • + +

    chanpinjieshao

    +
    • +
  • + +

    chuizhijunfen

    +
    • +
  • + +

    shuipingjunfen

    +
    • +
  • + +

    shuipingjuzhong

    +
    • +
  • + +

    1_diduiqi

    +
    • +
  • + +

    1_dingduiqi

    +
    • +
  • + +

    1_juzhongduiqi

    +
    • +
  • + +

    1_youduiqi

    +
    • +
  • + +

    1_zuoduiqi

    +
    • +
  • + +

    shangxiachengkai

    +
    • +
  • + +

    shangxialashen

    +
    • +
  • + +

    xiangxiazishiying

    +
    • +
  • + +

    youshangjiaolashen

    +
    • +
  • + +

    youxiajiaolashen

    +
    • +
  • + +

    yuanjiao

    +
    • +
  • + +

    zuoyouchengkai

    +
    • +
  • + +

    zuoyoulashen

    +
    • +
  • + +

    zuoyouchengman

    +
    • +
  • + +

    delete-fill

    +
    • +
  • + +

    more

    +
    • +
  • + +

    attention-fill

    +
    • +
  • + +

    rengongjiedian

    +
    • +
  • + +

    shenpijiedian

    +
    • +
  • + +

    huiqianjiedian

    +
    • +
  • + +

    apijiedian

    +
    • +
  • + +

    shujuchulijiedian

    +
    • +
  • + +

    end

    +
    • +
  • + +

    parallel

    +
    • +
  • + +

    converge

    +
    • +
  • + +

    start

    +
    • +
  • + +

    danxingwenben

    +
    • +
  • + +

    danxuankuang

    +
    • +
  • + +

    danxuanrenyuanxuanze

    +
    • +
  • + +

    danxuanxiala

    +
    • +
  • + +

    duoxuankuang

    +
    • +
  • + +

    duoxuanrenyuanxuanze

    +
    • +
  • + +

    duoxingwenben

    +
    • +
  • + +

    duoxuanxiala

    +
    • +
  • + +

    fengexian

    +
    • +
  • + +

    fuwenben

    +
    • +
  • + +

    keshurudanxuanxiala

    +
    • +
  • + +

    lianjie

    +
    • +
  • + +

    miaoshuwenben

    +
    • +
  • + +

    riqi

    +
    • +
  • + +

    shangchuan

    +
    • +
  • + +

    shijian

    +
    • +
  • + +

    tupian

    +
    • +
  • + +

    shuzi

    +
    • +
  • + +

    zidingyibiaoge

    +
    • +
  • + +

    sort

    +
    • +
  • + +

    liebiao

    +
    • +
  • + +

    kapian

    +
    • +
  • + +

    refill

    +
    • +
  • + +

    warning-2

    +
    • +
  • + +

    delete

    +
    • +
  • + +

    xlsx

    +
    • +
  • + +

    tree1

    +
    • +
  • + +

    2-jiantou-you

    +
    • +
  • + +

    2-jiantou-zuo

    +
    • +
  • + +

    xuanzhongfuji

    +
    • +
  • + +

    qianjin

    +
    • +
  • + +

    undo-2

    +
    • +
  • + +

    tubiao

    +
    • +
  • + +

    zuixiaokuandu

    +
    • +
  • + +

    zuidagaodu

    +
    • +
  • + +

    juhe

    +
    • +
  • + +

    zuidakuandu

    +
    • +
  • + +

    ziti

    +
    • +
  • + +

    zuixiaogaodu

    +
    • +
  • + +

    zizhong

    +
    • +
  • + +

    xinggao

    +
    • +
  • + +

    zitiyangshi

    +
    • +
  • + +

    xiahuaxian

    +
    • +
  • + +

    shanghuaxian

    +
    • +
  • + +

    zhonghuaxian

    +
    • +
  • + +

    suojin

    +
    • +
  • + +

    zijianju

    +
    • +
  • + +

    zuoduiqi-2

    +
    • +
  • + +

    juzhongduiqi

    +
    • +
  • + +

    youduiqi-2

    +
    • +
  • + +

    liangduanduiqi

    +
    • +
  • + +

    dancijianju

    +
    • +
  • + +

    zitidaxiao

    +
    • +
  • + +

    shujuyuan

    +
    • +
  • + +

    zidingyiye

    +
    • +
  • + +

    markdown

    +
    • +
  • + +

    biaodan

    +
    • +
  • + +

    liuchengtidanye

    +
    • +
  • + +

    yuanma-2

    +
    • +
  • + +

    shangxiaduicheng

    +
    • +
  • + +

    zuoyouduicheng

    +
    • +
  • + +

    zuobianju

    +
    • +
  • + +

    dingbianju

    +
    • +
  • + +

    shubiaozhizhen

    +
    • +
  • + +

    crosshair

    +
    • +
  • + +

    text-3

    +
    • +
  • + +

    wait

    +
    • +
  • + +

    move

    +
    • +
  • + +

    help

    +
    • +
  • + +

    gaodu

    +
    • +
  • + +

    kuandu

    +
    • +
  • + +

    xing-2

    +
    • +
  • + +

    lie-2

    +
    • +
  • + +

    ziyoubuju

    +
    • +
  • + +

    display-3

    +
    • +
  • + +

    morenziti

    +
    • +
  • + +

    xieti

    +
    • +
  • + +

    pointer

    +
    • +
  • + +

    ai

    +
    • +
  • + +

    fasong

    +
    • +
  • + +

    qingsao

    +
    • +
  • + +

    shangxialashen-2

    +
    • +
  • + +

    shangxiajuhe

    +
    • +
  • + +

    shanchu-2

    +
    • +
  • + +

    tag-3

    +
    • +
  • + +

    liaotianchuang

    +
    • +
  • + +

    yinyongchuangjian

    +
    • +
  • + +

    yinyong-2

    +
    • +
  • + +

    saoba

    +
    • +
  • + +

    quanquan

    +
    • +
  • + +

    builder

    +
    • +
  • + +

    tuopu

    +
    • +
  • + +

    jiedian

    +
    • +
  • + +

    rongqi

    +
    • +
+

为什么使用

+
    +
  • 弹性，在网页或者 app 上，展示字体是很便捷的。用字体图标可以很方便的改变 icon 的颜色，或者加入一些其他的效果
    • +
  • 可缩放，可以很方便的改变图标的大小
    • +
  • 矢量，字体图标是矢量的并且具有独立的分辨率，不管在高分辨率还是低分辨率，不管是在网页还是手机端，都具有很好的展示效果，不会出现锯齿或者马赛克模糊
    • +
  • 节省加载时间，字体图标很小，每个小图标只有几 kb，大大节省了加载时间
    • +
+

如何使用

+
    +
  • 将整个目录复制到您的项目里
    • +
  • 引入 style.css
    • +
  • 挑选相应图标并获取类名，如 .bk-icon .icon-demo
    • +
+
+
+
    +
  • + + + +

    assembly-line

    +
    • +
  • + + + +

    feature-conversion

    +
    • +
  • + + + +

    home

    +
    • +
  • + + + +

    minus-circle

    +
    • +
  • + + + +

    plus-circle

    +
    • +
  • + + + +

    setting

    +
    • +
  • + + + +

    check-circle-fill

    +
    • +
  • + + + +

    assembly-line-fill

    +
    • +
  • + + + +

    close-circle-fill

    +
    • +
  • + + + +

    setting-fill

    +
    • +
  • + + + +

    exclamation-fill

    +
    • +
  • + + + +

    play

    +
    • +
  • + + + +

    delete

    +
    • +
  • + + + +

    undo

    +
    • +
  • + + + +

    add-fill

    +
    • +
  • + + + +

    reduce-fill

    +
    • +
  • + + + +

    link

    +
    • +
  • + + + +

    full-screen

    +
    • +
  • + + + +

    delet

    +
    • +
  • + + + +

    upload

    +
    • +
  • + + + +

    set

    +
    • +
  • + + + +

    image

    +
    • +
  • + + + +

    download

    +
    • +
  • + + + +

    member

    +
    • +
  • + + + +

    info-tips

    +
    • +
  • + + + +

    edit

    +
    • +
  • + + + +

    close-small

    +
    • +
  • + + + +

    arrow-down

    +
    • +
  • + + + +

    batch-edit

    +
    • +
  • + + + +

    jump-link

    +
    • +
  • + + + +

    stretch

    +
    • +
  • + + + +

    drag

    +
    • +
  • + + + +

    circle-shape

    +
    • +
  • + + + +

    angle-left

    +
    • +
  • + + + +

    arrow-back

    +
    • +
  • + + + +

    badge

    +
    • +
  • + + + +

    46

    +
    • +
  • + + + +

    animatenumber

    +
    • +
  • + + + +

    button

    +
    • +
  • + + + +

    collapse

    +
    • +
  • + + + +

    checkbox

    +
    • +
  • + + + +

    dialog

    +
    • +
  • + + + +

    exception

    +
    • +
  • + + + +

    dropdownmenu

    +
    • +
  • + + + +

    info

    +
    • +
  • + + + +

    input

    +
    • +
  • + + + +

    form

    +
    • +
  • + + + +

    loading

    +
    • +
  • + + + +

    message

    +
    • +
  • + + + +

    nav

    +
    • +
  • + + + +

    notify

    +
    • +
  • + + + +

    pagination

    +
    • +
  • + + + +

    play-2

    +
    • +
  • + + + +

    popconfrim

    +
    • +
  • + + + +

    progress

    +
    • +
  • + + + +

    radio

    +
    • +
  • + + + +

    rate

    +
    • +
  • + + + +

    save

    +
    • +
  • + + + +

    roundprogress

    +
    • +
  • + + + +

    select

    +
    • +
  • + + + +

    sideslider

    +
    • +
  • + + + +

    slider

    +
    • +
  • + + + +

    step

    +
    • +
  • + + + +

    swiper

    +
    • +
  • + + + +

    switcher

    +
    • +
  • + + + +

    tab

    +
    • +
  • + + + +

    table

    +
    • +
  • + + + +

    text

    +
    • +
  • + + + +

    tag

    +
    • +
  • + + + +

    timeline

    +
    • +
  • + + + +

    tooltip

    +
    • +
  • + + + +

    transfer

    +
    • +
  • + + + +

    tree

    +
    • +
  • + + + +

    ctr+y

    +
    • +
  • + + + +

    ctr+z

    +
    • +
  • + + + +

    keyboard

    +
    • +
  • + + + +

    grid-2

    +
    • +
  • + + + +

    grid-3

    +
    • +
  • + + + +

    grid-4

    +
    • +
  • + + + +

    grid-6

    +
    • +
  • + + + +

    grid-5

    +
    • +
  • + + + +

    grid-7

    +
    • +
  • + + + +

    grid-8

    +
    • +
  • + + + +

    grid-9

    +
    • +
  • + + + +

    grid-10

    +
    • +
  • + + + +

    grid-11

    +
    • +
  • + + + +

    grid-12

    +
    • +
  • + + + +

    grid-1

    +
    • +
  • + + + +

    copy

    +
    • +
  • + + + +

    search

    +
    • +
  • + + + +

    diff

    +
    • +
  • + + + +

    user

    +
    • +
  • + + + +

    time-2

    +
    • +
  • + + + +

    date

    +
    • +
  • + + + +

    text-2

    +
    • +
  • + + + +

    border-y

    +
    • +
  • + + + +

    border-x

    +
    • +
  • + + + +

    border-all

    +
    • +
  • + + + +

    border-s

    +
    • +
  • + + + +

    radius-all

    +
    • +
  • + + + +

    border-z

    +
    • +
  • + + + +

    radius-s

    +
    • +
  • + + + +

    radius-sj

    +
    • +
  • + + + +

    radius-ys

    +
    • +
  • + + + +

    radius-yx

    +
    • +
  • + + + +

    radius-zs

    +
    • +
  • + + + +

    tishi_gaozhi

    +
    • +
  • + + + +

    tixing

    +
    • +
  • + + + +

    yulan

    +
    • +
  • + + + +

    github-logo

    +
    • +
  • + + + +

    update-log-fill

    +
    • +
  • + + + +

    histogram

    +
    • +
  • + + + +

    line-chart

    +
    • +
  • + + + +

    pie-chart

    +
    • +
  • + + + +

    refresh-line

    +
    • +
  • + + + +

    nav-toggle

    +
    • +
  • + + + +

    function-fill

    +
    • +
  • + + + +

    info-fill

    +
    • +
  • + + + +

    favorite

    +
    • +
  • + + + +

    template-fill

    +
    • +
  • + + + +

    summary-fill

    +
    • +
  • + + + +

    favorite-o

    +
    • +
  • + + + +

    list-fill

    +
    • +
  • + + + +

    user-group

    +
    • +
  • + + + +

    project-list

    +
    • +
  • + + + +

    more-dot

    +
    • +
  • + + + +

    grag-fill

    +
    • +
  • + + + +

    custom-comp-default

    +
    • +
  • + + + +

    folder-fill

    +
    • +
  • + + + +

    template-logo

    +
    • +
  • + + + +

    flow-fill

    +
    • +
  • + + + +

    function-fill

    +
    • +
  • + + + +

    un-full-screen

    +
    • +
  • + + + +

    code-full-screen

    +
    • +
  • + + + +

    angle-down-fill

    +
    • +
  • + + + +

    angle-up-fill

    +
    • +
  • + + + +

    angle-right-fill

    +
    • +
  • + + + +

    angle-left-fill

    +
    • +
  • + + + +

    close-line

    +
    • +
  • + + + +

    add-line

    +
    • +
  • + + + +

    save-line

    +
    • +
  • + + + +

    cc-jump-link

    +
    • +
  • + + + +

    offshelf

    +
    • +
  • + + + +

    add-3

    +
    • +
  • + + + +

    picture-fail-line

    +
    • +
  • + + + +

    1_deploy-fill

    +
    • +
  • + + + +

    loading-2

    +
    • +
  • + + + +

    router

    +
    • +
  • + + + +

    sync-failed

    +
    • +
  • + + + +

    sync-pending

    +
    • +
  • + + + +

    sync-success

    +
    • +
  • + + + +

    paste

    +
    • +
  • + + + +

    sync-default

    +
    • +
  • + + + +

    un-full-screen-2

    +
    • +
  • + + + +

    filliscreen-line

    +
    • +
  • + + + +

    card

    +
    • +
  • + + + +

    popover-2

    +
    • +
  • + + + +

    colorpick

    +
    • +
  • + + + +

    bigtree

    +
    • +
  • + + + +

    cascade-jilianxuankuang

    +
    • +
  • + + + +

    link1

    +
    • +
  • + + + +

    vesion-fill

    +
    • +
  • + + + +

    process

    +
    • +
  • + + + +

    off-shelf

    +
    • +
  • + + + +

    alert-line

    +
    • +
  • + + + +

    reflash-line

    +
    • +
  • + + + +

    token-fill

    +
    • +
  • + + + +

    template-fill-2

    +
    • +
  • + + + +

    breadcrumb

    +
    • +
  • + + + +

    bottom-group

    +
    • +
  • + + + +

    freedrag

    +
    • +
  • + + + +

    abnormal

    +
    • +
  • + + + +

    normal

    +
    • +
  • + + + +

    unknown

    +
    • +
  • + + + +

    copy-line

    +
    • +
  • + + + +

    comment-fill

    +
    • +
  • + + + +

    download-line

    +
    • +
  • + + + +

    invisible-eye

    +
    • +
  • + + + +

    level-down

    +
    • +
  • + + + +

    audit

    +
    • +
  • + + + +

    unfold

    +
    • +
  • + + + +

    fold

    +
    • +
  • + + + +

    directives

    +
    • +
  • + + + +

    variable

    +
    • +
  • + + + +

    variable-manage

    +
    • +
  • + + + +

    yemianhanshu

    +
    • +
  • + + + +

    hanshuku

    +
    • +
  • + + + +

    page-variable

    +
    • +
  • + + + +

    yuanma

    +
    • +
  • + + + +

    shanchu

    +
    • +
  • + + + +

    fankui

    +
    • +
  • + + + +

    auth-set

    +
    • +
  • + + + +

    json

    +
    • +
  • + + + +

    logo

    +
    • +
  • + + + +

    visible-eye

    +
    • +
  • + + + +

    process

    +
    • +
  • + + + +

    huabu

    +
    • +
  • + + + +

    drag-small

    +
    • +
  • + + + +

    dianzan-tianchong

    +
    • +
  • + + + +

    dianzan

    +
    • +
  • + + + +

    sync-waiting-01

    +
    • +
  • + + + +

    select-value

    +
    • +
  • + + + +

    select-variable

    +
    • +
  • + + + +

    select-expression

    +
    • +
  • + + + +

    drag-small1

    +
    • +
  • + + + +

    icon-manage

    +
    • +
  • + + + +

    document

    +
    • +
  • + + + +

    qiyeweixin

    +
    • +
  • + + + +

    erweima

    +
    • +
  • + + + +

    lianxi

    +
    • +
  • + + + +

    qq-2

    +
    • +
  • + + + +

    gaojing

    +
    • +
  • + + + +

    bubble-chart

    +
    • +
  • + + + +

    scatter-chart

    +
    • +
  • + + + +

    radar-chart

    +
    • +
  • + + + +

    bk-bubble-chart

    +
    • +
  • + + + +

    bk-scatter-chart

    +
    • +
  • + + + +

    fix

    +
    • +
  • + + + +

    export

    +
    • +
  • + + + +

    sql

    +
    • +
  • + + + +

    csv

    +
    • +
  • + + + +

    shuipingjuzhuduiqi

    +
    • +
  • + + + +

    diduiqi

    +
    • +
  • + + + +

    chuizhijuzhongduiqi

    +
    • +
  • + + + +

    youduiqi

    +
    • +
  • + + + +

    dingduiqi

    +
    • +
  • + + + +

    zuoduiqi

    +
    • +
  • + + + +

    data-table

    +
    • +
  • + + + +

    data-source-manage

    +
    • +
  • + + + +

    version

    +
    • +
  • + + + +

    mobilephone

    +
    • +
  • + + + +

    pc

    +
    • +
  • + + + +

    templateline

    +
    • +
  • + + + +

    file-video

    +
    • +
  • + + + +

    file-image

    +
    • +
  • + + + +

    file-text

    +
    • +
  • + + + +

    file-zip

    +
    • +
  • + + + +

    file-pdf

    +
    • +
  • + + + +

    file-audio

    +
    • +
  • + + + +

    file-doc

    +
    • +
  • + + + +

    file-excel

    +
    • +
  • + + + +

    file-ppt

    +
    • +
  • + + + +

    cellcellgroup

    +
    • +
  • + + + +

    circle

    +
    • +
  • + + + +

    empty

    +
    • +
  • + + + +

    countdown

    +
    • +
  • + + + +

    divider

    +
    • +
  • + + + +

    noticebar

    +
    • +
  • + + + +

    loading

    +
    • +
  • + + + +

    navbar

    +
    • +
  • + + + +

    numberkeyborad

    +
    • +
  • + + + +

    passwordinput

    +
    • +
  • + + + +

    picker

    +
    • +
  • + + + +

    search-2

    +
    • +
  • + + + +

    skeleton

    +
    • +
  • + + + +

    step

    +
    • +
  • + + + +

    treeselect

    +
    • +
  • + + + +

    stepper

    +
    • +
  • + + + +

    icon-2

    +
    • +
  • + + + +

    it-new-desktop

    +
    • +
  • + + + +

    set-fill

    +
    • +
  • + + + +

    battery

    +
    • +
  • + + + +

    wifi

    +
    • +
  • + + + +

    cellular-connection

    +
    • +
  • + + + +

    column

    +
    • +
  • + + + +

    grid

    +
    • +
  • + + + +

    info

    +
    • +
  • + + + +

    page

    +
    • +
  • + + + +

    image-small

    +
    • +
  • + + + +

    flow

    +
    • +
  • + + + +

    source

    +
    • +
  • + + + +

    column

    +
    • +
  • + + + +

    grid

    +
    • +
  • + + + +

    display-card

    +
    • +
  • + + + +

    display-list

    +
    • +
  • + + + +

    links

    +
    • +
  • + + + +

    compoment-count

    +
    • +
  • + + + +

    fc-count

    +
    • +
  • + + + +

    project-count

    +
    • +
  • + + + +

    user-count

    +
    • +
  • + + + +

    project

    +
    • +
  • + + + +

    chanpinjieshao

    +
    • +
  • + + + +

    chuizhijunfen

    +
    • +
  • + + + +

    shuipingjunfen

    +
    • +
  • + + + +

    shuipingjuzhong

    +
    • +
  • + + + +

    1_diduiqi

    +
    • +
  • + + + +

    1_dingduiqi

    +
    • +
  • + + + +

    1_juzhongduiqi

    +
    • +
  • + + + +

    1_youduiqi

    +
    • +
  • + + + +

    1_zuoduiqi

    +
    • +
  • + + + +

    shangxiachengkai

    +
    • +
  • + + + +

    shangxialashen

    +
    • +
  • + + + +

    xiangxiazishiying

    +
    • +
  • + + + +

    youshangjiaolashen

    +
    • +
  • + + + +

    youxiajiaolashen

    +
    • +
  • + + + +

    yuanjiao

    +
    • +
  • + + + +

    zuoyouchengkai

    +
    • +
  • + + + +

    zuoyoulashen

    +
    • +
  • + + + +

    zuoyouchengman

    +
    • +
  • + + + +

    delete-fill

    +
    • +
  • + + + +

    more

    +
    • +
  • + + + +

    attention-fill

    +
    • +
  • + + + +

    rengongjiedian

    +
    • +
  • + + + +

    shenpijiedian

    +
    • +
  • + + + +

    huiqianjiedian

    +
    • +
  • + + + +

    apijiedian

    +
    • +
  • + + + +

    shujuchulijiedian

    +
    • +
  • + + + +

    end

    +
    • +
  • + + + +

    parallel

    +
    • +
  • + + + +

    converge

    +
    • +
  • + + + +

    start

    +
    • +
  • + + + +

    danxingwenben

    +
    • +
  • + + + +

    danxuankuang

    +
    • +
  • + + + +

    danxuanrenyuanxuanze

    +
    • +
  • + + + +

    danxuanxiala

    +
    • +
  • + + + +

    duoxuankuang

    +
    • +
  • + + + +

    duoxuanrenyuanxuanze

    +
    • +
  • + + + +

    duoxingwenben

    +
    • +
  • + + + +

    duoxuanxiala

    +
    • +
  • + + + +

    fengexian

    +
    • +
  • + + + +

    fuwenben

    +
    • +
  • + + + +

    keshurudanxuanxiala

    +
    • +
  • + + + +

    lianjie

    +
    • +
  • + + + +

    miaoshuwenben

    +
    • +
  • + + + +

    riqi

    +
    • +
  • + + + +

    shangchuan

    +
    • +
  • + + + +

    shijian

    +
    • +
  • + + + +

    tupian

    +
    • +
  • + + + +

    shuzi

    +
    • +
  • + + + +

    zidingyibiaoge

    +
    • +
  • + + + +

    sort

    +
    • +
  • + + + +

    liebiao

    +
    • +
  • + + + +

    kapian

    +
    • +
  • + + + +

    refill

    +
    • +
  • + + + +

    warning-2

    +
    • +
  • + + + +

    delete

    +
    • +
  • + + + +

    xlsx

    +
    • +
  • + + + +

    tree1

    +
    • +
  • + + + +

    2-jiantou-you

    +
    • +
  • + + + +

    2-jiantou-zuo

    +
    • +
  • + + + +

    xuanzhongfuji

    +
    • +
  • + + + +

    qianjin

    +
    • +
  • + + + +

    undo-2

    +
    • +
  • + + + +

    tubiao

    +
    • +
  • + + + +

    zuixiaokuandu

    +
    • +
  • + + + +

    zuidagaodu

    +
    • +
  • + + + +

    juhe

    +
    • +
  • + + + +

    zuidakuandu

    +
    • +
  • + + + +

    ziti

    +
    • +
  • + + + +

    zuixiaogaodu

    +
    • +
  • + + + +

    zizhong

    +
    • +
  • + + + +

    xinggao

    +
    • +
  • + + + +

    zitiyangshi

    +
    • +
  • + + + +

    xiahuaxian

    +
    • +
  • + + + +

    shanghuaxian

    +
    • +
  • + + + +

    zhonghuaxian

    +
    • +
  • + + + +

    suojin

    +
    • +
  • + + + +

    zijianju

    +
    • +
  • + + + +

    zuoduiqi-2

    +
    • +
  • + + + +

    juzhongduiqi

    +
    • +
  • + + + +

    youduiqi-2

    +
    • +
  • + + + +

    liangduanduiqi

    +
    • +
  • + + + +

    dancijianju

    +
    • +
  • + + + +

    zitidaxiao

    +
    • +
  • + + + +

    shujuyuan

    +
    • +
  • + + + +

    zidingyiye

    +
    • +
  • + + + +

    markdown

    +
    • +
  • + + + +

    biaodan

    +
    • +
  • + + + +

    liuchengtidanye

    +
    • +
  • + + + +

    yuanma-2

    +
    • +
  • + + + +

    shangxiaduicheng

    +
    • +
  • + + + +

    zuoyouduicheng

    +
    • +
  • + + + +

    zuobianju

    +
    • +
  • + + + +

    dingbianju

    +
    • +
  • + + + +

    shubiaozhizhen

    +
    • +
  • + + + +

    crosshair

    +
    • +
  • + + + +

    text-3

    +
    • +
  • + + + +

    wait

    +
    • +
  • + + + +

    move

    +
    • +
  • + + + +

    help

    +
    • +
  • + + + +

    gaodu

    +
    • +
  • + + + +

    kuandu

    +
    • +
  • + + + +

    xing-2

    +
    • +
  • + + + +

    lie-2

    +
    • +
  • + + + +

    ziyoubuju

    +
    • +
  • + + + +

    display-3

    +
    • +
  • + + + +

    morenziti

    +
    • +
  • + + + +

    xieti

    +
    • +
  • + + + +

    pointer

    +
    • +
  • + + + +

    ai

    +
    • +
  • + + + +

    fasong

    +
    • +
  • + + + +

    qingsao

    +
    • +
  • + + + +

    shangxialashen-2

    +
    • +
  • + + + +

    shangxiajuhe

    +
    • +
  • + + + +

    shanchu-2

    +
    • +
  • + + + +

    tag-3

    +
    • +
  • + + + +

    liaotianchuang

    +
    • +
  • + + + +

    yinyongchuangjian

    +
    • +
  • + + + +

    yinyong-2

    +
    • +
  • + + + +

    saoba

    +
    • +
  • + + + +

    quanquan

    +
    • +
  • + + + +

    builder

    +
    • +
  • + + + +

    tuopu

    +
    • +
  • + + + +

    jiedian

    +
    • +
  • + + + +

    rongqi

    +
    • +
+

为什么使用

+
    +
  • 支持彩色图标
    • +
  • 跨 SVG 使用，使用 use 可调用文档中加载的所有 SVG 图标
    • +
+

如何使用

+
    +
  • 将下载的资源文件中 iconcool.js 文件外部资源通过 script 标签引入
    • +
  • 在 html 模板文件中挑选对应的对应图标的名称使用，例如： + 
    +    <svg aria-hidden="true">
+      <use xlink:href="#icon-xxx"></use>
+    </svg>
+
    +
    • +
+
+
+ + + + \ No newline at end of file diff --git a/lib/client/src/bk-icon/fonts/iconcool.eot b/lib/client/src/bk-icon/fonts/iconcool.eot index 074655053..bd8853d3d 100644 Binary files a/lib/client/src/bk-icon/fonts/iconcool.eot and b/lib/client/src/bk-icon/fonts/iconcool.eot differ diff --git a/lib/client/src/bk-icon/fonts/iconcool.ttf b/lib/client/src/bk-icon/fonts/iconcool.ttf index 7bff0b5f7..76768a9ab 100644 Binary files a/lib/client/src/bk-icon/fonts/iconcool.ttf and b/lib/client/src/bk-icon/fonts/iconcool.ttf differ diff --git a/lib/client/src/bk-icon/fonts/iconcool.woff b/lib/client/src/bk-icon/fonts/iconcool.woff index 3e632e2e0..92b7484fe 100644 Binary files a/lib/client/src/bk-icon/fonts/iconcool.woff and b/lib/client/src/bk-icon/fonts/iconcool.woff differ diff --git a/lib/client/src/common/chart-color-sets.js b/lib/client/src/common/chart-color-sets.js index 9e3b27aee..11f2ba60c 100644 --- a/lib/client/src/common/chart-color-sets.js +++ b/lib/client/src/common/chart-color-sets.js @@ -34,6 +34,20 @@ const colorSets = [ '#d2f5a6', '#76f2f2' ] + }, + { + name: 'echartsDef', + list: [ + '#5470c6', + '#91cc75', + '#fac858', + '#ee6666', + '#73c0de', + '#3ba272', + '#fc8452', + '#9a60b4', + '#ea7ccc' + ] } ] diff --git a/lib/client/src/common/constant-en.js b/lib/client/src/common/constant-en.js index 9644f3ec9..5ffc30ab4 100644 --- a/lib/client/src/common/constant-en.js +++ b/lib/client/src/common/constant-en.js @@ -1 +1 @@ -export const FOLD_MENU_ROUTE_LIST = ['new', 'editNocode', 'createTicketPageEdit', 'flowConfig', 'flowAdvancedConfig'] +export const FOLD_MENU_ROUTE_LIST = ['new', 'editNocode', 'createTicketPageEdit', 'flowConfig', 'flowAdvancedConfig', 'flowTplCanvas', 'flowTplConfig'] diff --git a/lib/client/src/common/use-resource-lock.js b/lib/client/src/common/use-resource-lock.js index 29a8f05b7..6b95ee305 100644 --- a/lib/client/src/common/use-resource-lock.js +++ b/lib/client/src/common/use-resource-lock.js @@ -2,14 +2,16 @@ import { computed, getCurrentInstance, onBeforeUnmount -} from '@vue/composition-api' +} from 'vue' import { useStore } from '@/store' +import { useRoute } from '@/router' import { bkNotify, bkMessage } from 'bk-magic-vue' let lockNotify = '' export default function () { const store = useStore() + const route = useRoute() const currentInstance = getCurrentInstance() @@ -35,8 +37,12 @@ export default function () { * @desc 主动释放编辑权 */ const release = (params) => { - Object.assign(params, { activeUser: userInfo.value.username }) - store.dispatch('resourceLock/release', params) + Object.assign(params, { activeUser: userInfo.value.username, projectId: route.params.projectId }) + const data = new FormData() + Object.keys(params).forEach((attr) => { + data.append(attr, params[attr]) + }) + navigator.sendBeacon('/api/resourceLock/release', data) } /** * @desc 个状态下的消息提示 diff --git a/lib/client/src/common/util.js b/lib/client/src/common/util.js index 0d00bd6a3..9269ddaa6 100644 --- a/lib/client/src/common/util.js +++ b/lib/client/src/common/util.js @@ -398,8 +398,9 @@ export function getWindowHeight () { * * @return {string} uuid */ -export function uuid (len = 5, radix = 16) { - const chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('') +export function uuid (len = 5, radix = 16, lowercaseOnly = false) { + const allSets = lowercaseOnly ? 'abcdefghijklmnopqrstuvwxyz' : '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' + const chars = allSets.split('') const uuid = [] radix = radix || chars.length diff --git a/lib/client/src/components/api/choose-api.vue b/lib/client/src/components/api/choose-api.vue index 452bf6e20..e9181da07 100644 --- a/lib/client/src/components/api/choose-api.vue +++ b/lib/client/src/components/api/choose-api.vue @@ -40,7 +40,7 @@ }" @click="chooseApi(data, node)" > - {{data.name}} + {{data.name}} import { defineComponent - } from '@vue/composition-api' + } from 'vue' export default defineComponent({ props: { diff --git a/lib/client/src/components/api/common/single-scheme.tsx b/lib/client/src/components/api/common/single-scheme.tsx index ae7fe5eff..07b446744 100644 --- a/lib/client/src/components/api/common/single-scheme.tsx +++ b/lib/client/src/components/api/common/single-scheme.tsx @@ -10,7 +10,7 @@ import { toRef, ref, getCurrentInstance -} from '@vue/composition-api' +} from 'vue' import useCustomValidate from '@/hooks/use-custom-validate' export default defineComponent({ @@ -220,7 +220,7 @@ export default defineComponent({ id={option.name} name={option.name} key={option.name} - v-bk-tooltips={{ content: option.comment, disabled: !option.comment, maxWidth: 400 }} + v-bk-tooltips={{ content: option.comment, disabled: !option.comment, maxWidth: 400, allowHTML: false }} > )) @@ -304,7 +304,7 @@ export default defineComponent({ } this.update({ description })} diff --git a/lib/client/src/components/api/common/validate.vue b/lib/client/src/components/api/common/validate.vue index 7fbd50771..9b5d48f28 100644 --- a/lib/client/src/components/api/common/validate.vue +++ b/lib/client/src/components/api/common/validate.vue @@ -97,7 +97,7 @@ + diff --git a/lib/client/src/element-materials/modifier/component/directives/index.vue b/lib/client/src/element-materials/modifier/component/directives/index.vue index f650dee03..fcd756999 100644 --- a/lib/client/src/element-materials/modifier/component/directives/index.vue +++ b/lib/client/src/element-materials/modifier/component/directives/index.vue @@ -31,7 +31,8 @@ v-bk-tooltips="{ content: directive.tips && $t(directive.tips(lastDirectiveMap[genDirectiveKey(directive)])), disabled: !directive.tips, - width: 290 + width: 290, + allowHTML: false }" :class="{ 'under-line': directive.tips, diff --git a/lib/client/src/element-materials/modifier/component/events/children/choose-flow-action.vue b/lib/client/src/element-materials/modifier/component/events/children/choose-flow-action.vue new file mode 100644 index 000000000..3b1a3b663 --- /dev/null +++ b/lib/client/src/element-materials/modifier/component/events/children/choose-flow-action.vue @@ -0,0 +1,125 @@ + + + diff --git a/lib/client/src/element-materials/modifier/component/events/children/describe-function/render-ai.vue b/lib/client/src/element-materials/modifier/component/events/children/describe-function/render-ai.vue index 6473d90bb..cb63383c1 100644 --- a/lib/client/src/element-materials/modifier/component/events/children/describe-function/render-ai.vue +++ b/lib/client/src/element-materials/modifier/component/events/children/describe-function/render-ai.vue @@ -35,7 +35,7 @@ } from '@/common/ai' import { ref - } from '@vue/composition-api' + } from 'vue' import { messageError } from '@/common/bkmagic' diff --git a/lib/client/src/element-materials/modifier/component/events/children/plus-event.vue b/lib/client/src/element-materials/modifier/component/events/children/plus-event.vue index 71314c216..10adc4e6d 100644 --- a/lib/client/src/element-materials/modifier/component/events/children/plus-event.vue +++ b/lib/client/src/element-materials/modifier/component/events/children/plus-event.vue @@ -41,7 +41,7 @@ :width="200" boundary="window" > - {{ event.name }} + {{ getEventName(event) }} @@ -85,6 +85,12 @@ computedDisabled () { return !this.computedEventList.length && !this.searchEventName + }, + getEventName () { + return (event) => { + if (!event.displayName) return event.name + return `${event.displayName}(${event.name})` + } } }, diff --git a/lib/client/src/element-materials/modifier/component/events/children/render-event.vue b/lib/client/src/element-materials/modifier/component/events/children/render-event.vue index 320a3e9a0..388008ca3 100644 --- a/lib/client/src/element-materials/modifier/component/events/children/render-event.vue +++ b/lib/client/src/element-materials/modifier/component/events/children/render-event.vue @@ -21,7 +21,8 @@ disabled: !eventConfig.tips, placements: ['left-start'], width: 200, - boundary: 'window' + boundary: 'window', + allowHTML: false }" > {{ eventName }} @@ -57,8 +58,9 @@ :event-value="eventValue" @change="handleChangeEvent" /> + + diff --git a/lib/client/src/element-materials/modifier/component/form-container/components/prop-group.vue b/lib/client/src/element-materials/modifier/component/form-container/components/prop-group.vue index 3c3d7fc09..d737ada36 100644 --- a/lib/client/src/element-materials/modifier/component/form-container/components/prop-group.vue +++ b/lib/client/src/element-materials/modifier/component/form-container/components/prop-group.vue @@ -1,8 +1,8 @@ \ No newline at end of file +} +.prop-content { + padding: 8px 12px 16px; +} + diff --git a/lib/client/src/element-materials/modifier/component/form-container/index.vue b/lib/client/src/element-materials/modifier/component/form-container/index.vue index b023cc14b..e92a34c8c 100644 --- a/lib/client/src/element-materials/modifier/component/form-container/index.vue +++ b/lib/client/src/element-materials/modifier/component/form-container/index.vue @@ -1,12 +1,13 @@ diff --git a/lib/client/src/element-materials/modifier/component/slots/components/common/select-key.vue b/lib/client/src/element-materials/modifier/component/slots/components/common/select-key.vue index 216d4a52b..9a062a2d3 100644 --- a/lib/client/src/element-materials/modifier/component/slots/components/common/select-key.vue +++ b/lib/client/src/element-materials/modifier/component/slots/components/common/select-key.vue @@ -23,7 +23,8 @@ content: $t(key.tips), placements: ['left-start'], boundary: 'window', - maxWidth: 400 + maxWidth: 400, + allowHTML: false }" >{{ $t(key.label) }} ({ label: window.i18n.t('选项{0}', { n: index }), diff --git a/lib/client/src/element-materials/modifier/component/slots/index.vue b/lib/client/src/element-materials/modifier/component/slots/index.vue index b37b71aec..64d1aac34 100644 --- a/lib/client/src/element-materials/modifier/component/slots/index.vue +++ b/lib/client/src/element-materials/modifier/component/slots/index.vue @@ -2,14 +2,43 @@
- +
@@ -18,6 +47,7 @@ import LC from '@/element-materials/core' import renderSlot from './render-slot.vue' import { encodeRegexp } from '../../component/utils' + import { isEmpty } from '@/common/util' export default { components: { renderSlot @@ -43,6 +73,58 @@ result[key] = this.config[key] return result }, {}) + }, + slotGroupList () { + if (this.keyword.length) { + return this.filerConfig + } else { + const groups = this.componentNode?.material?.groups || [] + const slotGroups = [] + Object.keys(this.filerConfig).reduce((pre, cur) => { + // 该插槽无法用 值 变量 表达式 + if (this.filerConfig[cur].type.includes('remote')) { + const aGroup = { + value: cur, + label: this.filerConfig[cur]?.displayName, + isDisplay: true, + groupSlots: {} + } + aGroup.groupSlots[cur] = this.filerConfig[cur] + pre.push(aGroup) + } else { + const groupVal = this.filerConfig[cur]?.belongGroup || 'defSlot' + const groupItem = pre.find(item => item.value === groupVal) + if (!pre?.length || !groupItem) { + const aGroup = { + value: groupVal, + label: groupVal === 'defSlot' ? this.filerConfig[cur]?.displayName || '默认插槽' : groups.find(item => item.value === groupVal)?.label, + isDisplay: true, + groupSlots: {} + } + aGroup.groupSlots[cur] = this.filerConfig[cur] + pre.push(aGroup) + } + if (groupItem) { + groupItem.isDisplay ??= true + groupItem.groupSlots ??= {} + groupItem.groupSlots[cur] = this.filerConfig[cur] + } + } + return pre + }, slotGroups) + return slotGroups + } + }, + hasGroupSlot () { + return (group) => { + if (isEmpty(group.groupSlots)) { + return false + } + if (!Object.keys(group.groupSlots).length) { + return false + } + return true + } } }, created () { @@ -103,13 +185,46 @@ }) this.isInnerChange = true this.componentNode.setRenderSlots(slotData, slotName) - }, 60) + }, 60), + toggleShowGroupSlot (group) { + group.isDisplay = !group.isDisplay + this.$forceUpdate() + } } } diff --git a/lib/client/src/element-materials/modifier/component/slots/render-slot.vue b/lib/client/src/element-materials/modifier/component/slots/render-slot.vue index cb827aa72..c25cf890f 100644 --- a/lib/client/src/element-materials/modifier/component/slots/render-slot.vue +++ b/lib/client/src/element-materials/modifier/component/slots/render-slot.vue @@ -4,18 +4,11 @@ :value="formData" :remote-config="remoteConfig" :show="variableSelectEnable" - :show-content="isShowSlot" @change="handleVariableFormatChange"> diff --git a/lib/client/src/views/project/index.vue b/lib/client/src/views/project/index.vue index a8c56dbb6..4c7816369 100644 --- a/lib/client/src/views/project/index.vue +++ b/lib/client/src/views/project/index.vue @@ -144,7 +144,8 @@ }, asideFolded: false, asideHover: false, - showMenuFooter: true + showMenuFooter: true, + projectOldFlowLength: [] } }, computed: { @@ -179,8 +180,12 @@ next() }, watch: { - '$route' (to, from) { + async '$route' (to, from) { this.setDefaultActive() + if (to.params.projectId !== from.params.projectId) { + await this.getOldFlowList() + this.setNavList() + } } }, async created () { @@ -201,7 +206,7 @@ this.projectId = parseInt(this.$route.params.projectId) await this.updateProjectInfo() - + await this.getOldFlowList() this.setNavList() } catch (e) { console.error(e) @@ -230,6 +235,10 @@ await this.getProjectList() await this.setCurrentProject() }, + async getOldFlowList () { + const res = await this.$store.dispatch('nocode/flow/getFlowList', { project: this.projectId }) + this.projectOldFlowLength = res.count + }, setNavList () { this.navList = getProjectNavList() // 在 setCurrentProject 请求之后再赋值，因为 setCurrentProject 请求会给 curProject 设置 canXXXX 等操作的属性 @@ -254,8 +263,24 @@ if (!IAM_ENABLE) { navList = navList.filter(item => item?.id !== 'authManage') } - if (this.curProject?.framework === 'vue3') { - navList = navList.filter(item => item?.id !== 'flowList') + if (this.curProject?.framework !== 'vue3') { + const index = navList.findIndex(item => item.id === 'flowList') + if (index > -1) { + const childrenNav = navList[index].children.slice() + if (this.projectOldFlowLength > 0) { + childrenNav.unshift({ + title: window.i18n.t('流程设计(旧版)'), + icon: 'flow', + url: 'flowList', + iamAction: 'develop_app', + permission: false, + toPath: { + name: 'flowList' + } + }) + } + navList.splice(index, 1, { ...navList[index], children: childrenNav }) + } } if (!this.isSaasAvailable) { navList = navList.filter(item => item?.id !== 'backendModule') @@ -297,7 +322,9 @@ } // 流程管理子页面、左侧选中流程管理 - if (name?.startsWith('flow')) { + if (name?.startsWith('flowTpl')) { + name = 'flowTplList' + } else if (name?.startsWith('flow')) { name = 'flowList' } diff --git a/lib/client/src/views/project/layout/index.vue b/lib/client/src/views/project/layout/index.vue index b5065808f..42950ac53 100644 --- a/lib/client/src/views/project/layout/index.vue +++ b/lib/client/src/views/project/layout/index.vue @@ -22,7 +22,7 @@ -
{{ $t(layout.showName) }}
+
{{ $t(layout.showName) }}
{{ $t('路由: {0}', [layout.routePath]) }}
diff --git a/lib/client/src/views/project/page-manage/children/form-manage-page.vue b/lib/client/src/views/project/page-manage/children/form-manage-page.vue index cfc36e44d..f55308b86 100644 --- a/lib/client/src/views/project/page-manage/children/form-manage-page.vue +++ b/lib/client/src/views/project/page-manage/children/form-manage-page.vue @@ -25,7 +25,7 @@