update: 更新为组件库组件

This commit is contained in:
xieyonghong 2023-04-03 14:19:49 +08:00
parent a42e6a8fb6
commit dd163c5611
35 changed files with 43 additions and 39 deletions

View File

@ -7,14 +7,13 @@
</template> </template>
<script lang="ts" setup name="JEmpty"> <script lang="ts" setup name="JEmpty">
import { Empty } from 'ant-design-vue'; import { Empty } from 'jetlinks-ui-components';
import { useSlots } from 'vue'; import { useSlots } from 'vue';
import NoData from './assets/nodata.svg'; import NoData from './assets/nodata.svg';
import { omit } from 'lodash-es'; import { omit } from 'lodash-es';
import type { PropType, CSSProperties } from 'vue'; import type { PropType, CSSProperties } from 'vue';
const slots = useSlots(); const slots = useSlots();
const renderArr = Object.keys(slots); const renderArr = Object.keys(slots);
console.log(renderArr);
const props = defineProps({ const props = defineProps({
description: { description: {

View File

@ -73,7 +73,7 @@
import { PropType } from 'vue'; import { PropType } from 'vue';
import { DeleteOutlined, PlusOutlined } from '@ant-design/icons-vue'; import { DeleteOutlined, PlusOutlined } from '@ant-design/icons-vue';
import { useProductStore } from '@/store/product'; import { useProductStore } from '@/store/product';
import { message } from 'ant-design-vue'; import { message } from 'jetlinks-ui-components';
import { useRuleEditorStore } from '@/store/ruleEditor'; import { useRuleEditorStore } from '@/store/ruleEditor';
import moment from 'moment'; import moment from 'moment';
import { getWebSocket } from '@/utils/websocket'; import { getWebSocket } from '@/utils/websocket';

View File

@ -1,8 +1,7 @@
<template> <template>
<a-select v-model:value="_value" mode="tags" :options="options" :size="size" @change="change" placeholder="请选择单位"></a-select> <j-select v-model:value="_value" mode="tags" :options="options" :size="size" @change="change" placeholder="请选择单位"></j-select>
</template> </template>
<script setup lang="ts" name="InputSelect"> <script setup lang="ts" name="InputSelect">
import { SizeType } from 'ant-design-vue/es/config-provider';
import { DefaultOptionType, SelectValue } from 'ant-design-vue/es/select'; import { DefaultOptionType, SelectValue } from 'ant-design-vue/es/select';
import { PropType } from 'vue'; import { PropType } from 'vue';
type valueType = string | number type valueType = string | number
@ -10,6 +9,8 @@ type Emits = {
(e: 'update:value', data: valueType | undefined): void; (e: 'update:value', data: valueType | undefined): void;
(e: 'change'): void; (e: 'change'): void;
}; };
type SizeType = 'small' | 'middle' | 'large' | undefined;
const emit = defineEmits<Emits>(); const emit = defineEmits<Emits>();
const props = defineProps({ const props = defineProps({
value: [String, Number], value: [String, Number],

View File

@ -149,7 +149,7 @@ import {
getSearchHistory, getSearchHistory,
saveSearchHistory, saveSearchHistory,
} from '@/api/comm'; } from '@/api/comm';
import { message } from 'ant-design-vue'; import { message } from 'jetlinks-ui-components';
import LivePlayer from '@/components/Player/index.vue'; import LivePlayer from '@/components/Player/index.vue';
import MediaTool from '@/components/Player/mediaTool.vue'; import MediaTool from '@/components/Player/mediaTool.vue';

View File

@ -55,7 +55,8 @@
</template> </template>
<script lang="ts" setup name='JProUpload'> <script lang="ts" setup name='JProUpload'>
import { message, UploadChangeParam, UploadProps } from 'ant-design-vue'; import { UploadChangeParam, UploadProps } from 'ant-design-vue';
import { message } from 'jetlinks-ui-components';
import { FILE_UPLOAD } from '@/api/comm'; import { FILE_UPLOAD } from '@/api/comm';
import { TOKEN_KEY } from '@/utils/variable'; import { TOKEN_KEY } from '@/utils/variable';
import { LocalStore } from '@/utils/comm'; import { LocalStore } from '@/utils/comm';

View File

@ -1,6 +1,6 @@
import axios from 'axios' import axios from 'axios'
import { BASE_API_PATH, TOKEN_KEY } from '@/utils/variable' import { BASE_API_PATH, TOKEN_KEY } from '@/utils/variable'
import { notification as Notification } from 'ant-design-vue' import { notification as Notification } from 'jetlinks-ui-components'
import router from '@/router' import router from '@/router'
import { LoginPath } from '@/router/menu' import { LoginPath } from '@/router/menu'
import { cleanToken, getToken, LocalStore } from '@/utils/comm' import { cleanToken, getToken, LocalStore } from '@/utils/comm'

View File

@ -34,7 +34,7 @@ import { TOKEN_KEY } from '@/utils/variable';
import { FIRMWARE_UPLOAD } from '@/api/device/firmware'; import { FIRMWARE_UPLOAD } from '@/api/device/firmware';
import { onlyMessage } from '@/utils/comm'; import { onlyMessage } from '@/utils/comm';
import type { UploadChangeParam } from 'ant-design-vue'; import type { UploadChangeParam } from 'ant-design-vue';
import { notification as Notification } from 'ant-design-vue'; import { notification as Notification } from 'jetlinks-ui-components';
import { useSystem } from '@/store/system'; import { useSystem } from '@/store/system';
const emit = defineEmits(['update:modelValue', 'update:extraValue', 'change']); const emit = defineEmits(['update:modelValue', 'update:extraValue', 'change']);

View File

@ -190,7 +190,7 @@
</j-modal> </j-modal>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { message, Form } from 'ant-design-vue'; import { message, Form } from 'jetlinks-ui-components';
import { getImage } from '@/utils/comm'; import { getImage } from '@/utils/comm';
import FileUpload from './FileUpload.vue'; import FileUpload from './FileUpload.vue';
import { import {

View File

@ -131,7 +131,6 @@ import {
startTask, startTask,
startOneTask, startOneTask,
} from '@/api/device/firmware'; } from '@/api/device/firmware';
import { message } from 'ant-design-vue';
import { getImage } from '@/utils/comm'; import { getImage } from '@/utils/comm';
import moment from 'moment'; import moment from 'moment';
import { cloneDeep } from 'lodash-es'; import { cloneDeep } from 'lodash-es';

View File

@ -108,8 +108,6 @@
</j-modal> </j-modal>
</template> </template>
<script lang="ts" setup name="TaskPage"> <script lang="ts" setup name="TaskPage">
import { message } from 'ant-design-vue';
import { getImage } from '@/utils/comm';
import { queryProduct, saveTask } from '@/api/device/firmware'; import { queryProduct, saveTask } from '@/api/device/firmware';
import type { FormInstance } from 'ant-design-vue'; import type { FormInstance } from 'ant-design-vue';
import SelectDevices from './SelectDevices.vue'; import SelectDevices from './SelectDevices.vue';

View File

@ -91,7 +91,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { query, bindDevice } from '@/api/device/instance'; import { query, bindDevice } from '@/api/device/instance';
import moment from 'moment'; import moment from 'moment';
import { message } from 'ant-design-vue'; import { message } from 'jetlinks-ui-components';
import { useInstanceStore } from '@/store/instance'; import { useInstanceStore } from '@/store/instance';
import { storeToRefs } from 'pinia'; import { storeToRefs } from 'pinia';

View File

@ -57,7 +57,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { treeEdgeMap, saveEdgeMap, addDevice } from '@/api/device/instance'; import { treeEdgeMap, saveEdgeMap, addDevice } from '@/api/device/instance';
import { message } from 'ant-design-vue/es'; import { message } from 'jetlinks-ui-components';
const _props = defineProps({ const _props = defineProps({
metaData: { metaData: {
type: Array, type: Array,

View File

@ -132,7 +132,7 @@ import {
} from '@/api/device/instance'; } from '@/api/device/instance';
import MSelect from './MSelect.vue'; import MSelect from './MSelect.vue';
import PatchMapping from './PatchMapping.vue'; import PatchMapping from './PatchMapping.vue';
import { message } from 'ant-design-vue/es'; import { message } from 'jetlinks-ui-components';
import { inject } from 'vue'; import { inject } from 'vue';
const columns = [ const columns = [
{ {

View File

@ -49,7 +49,7 @@ import type { ActionsType } from '@/components/Table';
import { queryLog, queryLogsType } from '@/api/device/instance'; import { queryLog, queryLogsType } from '@/api/device/instance';
import { useInstanceStore } from '@/store/instance'; import { useInstanceStore } from '@/store/instance';
import moment from 'moment'; import moment from 'moment';
import { Modal, Textarea } from 'ant-design-vue'; import { Modal, Textarea } from 'jetlinks-ui-components';
const params = ref<Record<string, any>>({}); const params = ref<Record<string, any>>({});
const instanceStore = useInstanceStore(); const instanceStore = useInstanceStore();

View File

@ -57,7 +57,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { treeMapping, saveMapping } from '@/api/device/instance'; import { treeMapping, saveMapping } from '@/api/device/instance';
import { message } from 'ant-design-vue/es'; import { message } from 'jetlinks-ui-components';
const _props = defineProps({ const _props = defineProps({
type: { type: {
type: String, type: String,

View File

@ -115,7 +115,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { category } from '@/api/device/product'; import { category } from '@/api/device/product';
import { Form } from 'ant-design-vue'; import { Form } from 'jetlinks-ui-components';
import { getImage } from '@/utils/comm.ts'; import { getImage } from '@/utils/comm.ts';
import { message } from 'jetlinks-ui-components'; import { message } from 'jetlinks-ui-components';
import DialogTips from '../DialogTips/index.vue'; import DialogTips from '../DialogTips/index.vue';

View File

@ -14,7 +14,7 @@ import { useInstanceStore } from '@/store/instance';
import { useMetadataStore } from '@/store/metadata'; import { useMetadataStore } from '@/store/metadata';
import { useProductStore } from '@/store/product'; import { useProductStore } from '@/store/product';
import { ProductItem } from '@/views/device/Product/typings'; import { ProductItem } from '@/views/device/Product/typings';
import { message } from 'ant-design-vue/es'; import { message } from 'jetlinks-ui-components';
import type { FormInstance } from 'ant-design-vue/es'; import type { FormInstance } from 'ant-design-vue/es';
import { updateMetadata, asyncUpdateMetadata } from '../../metadata' import { updateMetadata, asyncUpdateMetadata } from '../../metadata'
import { detail } from '@/api/device/instance'; import { detail } from '@/api/device/instance';

View File

@ -1,5 +1,5 @@
// import './index.less'; // import './index.less';
import { Image } from 'ant-design-vue'; import { Image } from 'jetlinks-ui-components';
import { getImage } from '@/utils/comm'; import { getImage } from '@/utils/comm';
const AliyunSms = () => { const AliyunSms = () => {

View File

@ -1,5 +1,5 @@
// import './index.less'; // import './index.less';
import { Image } from 'ant-design-vue'; import { Image } from 'jetlinks-ui-components';
import { getImage } from '@/utils/comm'; import { getImage } from '@/utils/comm';
const AliyunVoice = () => { const AliyunVoice = () => {

View File

@ -1,5 +1,5 @@
// import './index.less'; // import './index.less';
import { Image } from 'ant-design-vue'; import { Image } from 'jetlinks-ui-components';
import { getImage } from '@/utils/comm'; import { getImage } from '@/utils/comm';
const DingTalk = () => { const DingTalk = () => {

View File

@ -322,7 +322,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { getImage } from '@/utils/comm'; import { getImage } from '@/utils/comm';
import { Form } from 'ant-design-vue'; import { Form } from 'jetlinks-ui-components';
import { message } from 'jetlinks-ui-components'; import { message } from 'jetlinks-ui-components';
import type { ConfigFormData } from '../types'; import type { ConfigFormData } from '../types';
import { import {

View File

@ -1,6 +1,6 @@
// import './index.less'; // import './index.less';
import { Image } from 'ant-design-vue'; import { Image } from 'jetlinks-ui-components';
import { getImage } from '@/utils/comm'; import { getImage } from '@/utils/comm';
const DingTalk = () => { const DingTalk = () => {

View File

@ -759,8 +759,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { getImage } from '@/utils/comm'; import { getImage } from '@/utils/comm';
import { Form, UploadChangeParam } from 'ant-design-vue'; import { UploadChangeParam } from 'ant-design-vue';
import { message } from 'jetlinks-ui-components'; import { message, Form } from 'jetlinks-ui-components';
import type { IVariableDefinitions, TemplateFormData } from '../types'; import type { IVariableDefinitions, TemplateFormData } from '../types';
import { import {
NOTICE_METHOD, NOTICE_METHOD,

View File

@ -50,7 +50,7 @@
import templateApi from '@/api/notice/template'; import templateApi from '@/api/notice/template';
import { PropType } from 'vue'; import { PropType } from 'vue';
import moment from 'moment'; import moment from 'moment';
import { Modal } from 'ant-design-vue'; import { Modal } from 'jetlinks-ui-components';
type Emits = { type Emits = {
(e: 'update:visible', data: boolean): void; (e: 'update:visible', data: boolean): void;

View File

@ -97,7 +97,7 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { Empty } from 'ant-design-vue'; import { Empty } from 'jetlinks-ui-components';
import { getImage } from '@/utils/comm'; import { getImage } from '@/utils/comm';
import Charts from './components/Charts.vue'; import Charts from './components/Charts.vue';
import TopCard from './components/TopCard.vue'; import TopCard from './components/TopCard.vue';

View File

@ -137,7 +137,7 @@ import SaveModal from './Save/save.vue';
import type { SceneItem } from './typings'; import type { SceneItem } from './typings';
import { useMenuStore } from 'store/menu'; import { useMenuStore } from 'store/menu';
import { query, _delete, _action, _execute } from '@/api/rule-engine/scene'; import { query, _delete, _action, _execute } from '@/api/rule-engine/scene';
import { message } from 'ant-design-vue'; import { message } from 'jetlinks-ui-components';
import type { ActionsType } from '@/components/Table'; import type { ActionsType } from '@/components/Table';
import { getImage } from '@/utils/comm'; import { getImage } from '@/utils/comm';
import BadgeStatus from '@/components/BadgeStatus/index.vue'; import BadgeStatus from '@/components/BadgeStatus/index.vue';

View File

@ -1456,10 +1456,10 @@ import type { formType, dictType, optionsType } from '../typing';
import { getRoleList_api } from '@/api/system/user'; import { getRoleList_api } from '@/api/system/user';
import { import {
FormInstance, FormInstance,
message,
UploadChangeParam, UploadChangeParam,
UploadFile, UploadFile,
} from 'ant-design-vue'; } from 'ant-design-vue';
import { message } from 'jetlinks-ui-components'
import { randomString } from '@/utils/utils'; import { randomString } from '@/utils/utils';
import { cloneDeep, difference } from 'lodash'; import { cloneDeep, difference } from 'lodash';
import { useMenuStore } from '@/store/menu'; import { useMenuStore } from '@/store/menu';

View File

@ -225,7 +225,8 @@ import {
} from '@/api/system/dataSource'; } from '@/api/system/dataSource';
import { onlyMessage } from '@/utils/comm'; import { onlyMessage } from '@/utils/comm';
import { randomString } from '@/utils/utils'; import { randomString } from '@/utils/utils';
import { FormInstance, message } from 'ant-design-vue'; import { FormInstance } from 'ant-design-vue';
import { message } from 'jetlinks-ui-components';
import { DataNode } from 'ant-design-vue/lib/tree'; import { DataNode } from 'ant-design-vue/lib/tree';
import _ from 'lodash'; import _ from 'lodash';
import { cloneDeep } from 'lodash'; import { cloneDeep } from 'lodash';

View File

@ -195,7 +195,8 @@ import {
getDataTypeDict_api, getDataTypeDict_api,
saveDataSource_api, saveDataSource_api,
} from '@/api/system/dataSource'; } from '@/api/system/dataSource';
import { FormInstance, message } from 'ant-design-vue'; import { FormInstance } from 'ant-design-vue';
import { message } from 'jetlinks-ui-components';
import { Rule } from 'ant-design-vue/lib/form'; import { Rule } from 'ant-design-vue/lib/form';
import type { dictItemType, optionItemType, sourceItemType } from '../typing'; import type { dictItemType, optionItemType, sourceItemType } from '../typing';

View File

@ -258,7 +258,8 @@
<script setup lang="ts"> <script setup lang="ts">
import PermissionButton from '@/components/PermissionButton/index.vue'; import PermissionButton from '@/components/PermissionButton/index.vue';
import { FormInstance, message } from 'ant-design-vue'; import { FormInstance } from 'ant-design-vue';
import { message } from 'jetlinks-ui-components';
import ChooseIconDialog from '../components/ChooseIconDialog.vue'; import ChooseIconDialog from '../components/ChooseIconDialog.vue';
import PermissChoose from '../components/PermissChoose.vue'; import PermissChoose from '../components/PermissChoose.vue';

View File

@ -46,7 +46,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { exportPermission_api } from '@/api/system/permission'; import { exportPermission_api } from '@/api/system/permission';
import { Form } from 'ant-design-vue'; import { Form } from 'jetlinks-ui-components';
Form.useInjectFormItemContext(); Form.useInjectFormItemContext();
const props = defineProps<{ const props = defineProps<{

View File

@ -35,7 +35,7 @@ import {
delOperations_api, delOperations_api,
updateOperations_api, updateOperations_api,
} from '@/api/system/apiPage'; } from '@/api/system/apiPage';
import { message } from 'ant-design-vue'; import { message } from 'jetlinks-ui-components';
import { modeType } from '../typing'; import { modeType } from '../typing';
import { useDepartmentStore } from '@/store/department'; import { useDepartmentStore } from '@/store/department';

View File

@ -96,7 +96,8 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { FormInstance, message } from 'ant-design-vue'; import { FormInstance } from 'ant-design-vue';
import { message } from 'jetlinks-ui-components';
import { Rule } from 'ant-design-vue/es/form'; import { Rule } from 'ant-design-vue/es/form';
import { import {

View File

@ -36,7 +36,8 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { FormInstance, message } from 'ant-design-vue'; import { FormInstance } from 'ant-design-vue';
import { message } from 'jetlinks-ui-components';
import { saveRole_api } from '@/api/system/role'; import { saveRole_api } from '@/api/system/role';
import { useMenuStore } from '@/store/menu'; import { useMenuStore } from '@/store/menu';
const route = useRoute(); const route = useRoute();

View File

@ -184,7 +184,8 @@
<script setup lang="ts"> <script setup lang="ts">
import PermissionButton from '@/components/PermissionButton/index.vue'; import PermissionButton from '@/components/PermissionButton/index.vue';
import { FormInstance, message } from 'ant-design-vue'; import { FormInstance } from 'ant-design-vue';
import { message } from 'jetlinks-ui-components';
import { import {
validateField_api, validateField_api,
getRoleList_api, getRoleList_api,