简柏林 / thingskit-front · Commits

  • Merge branch 'main_dev' ...
    eff0f447 
    # Conflicts:
#	src/components/Form/src/types/index.ts
#	src/enums/dictEnum.ts
#	src/views/device/list/config/data.ts
#	src/views/device/list/cpns/step/DeviceStep1.vue
#	src/views/device/list/cpns/tabs/ModelOfMatter.vue
#	src/views/device/list/cpns/tabs/ObjectModelCommandDeliveryModal/index.vue
#	src/views/rule/dataFlow/components/dataflowmodal/DataFlowModal.vue
#	src/views/visual/dataSourceBindPanel/index.vue
#	src/views/visual/packages/components/Alarm/DeviceAlarm/config.ts
#	src/views/visual/packages/components/Alarm/DeviceAlarm/config.vue
#	src/views/visual/packages/components/Alarm/DeviceAlarm/index.vue
#	src/views/visual/packages/components/Alarm/DeviceAlarmHistory/index.vue
#	src/views/visual/packages/components/Control/ControlComponentSlidingSwitch/index.vue
#	src/views/visual/packages/components/Control/ControlComponentSwitchWithIcon/index.vue
#	src/views/visual/packages/components/Control/ControlComponentToggleSwitch/index.vue
#	src/views/visual/packages/components/Control/LateralNumericalControl/config.ts
#	src/views/visual/packages/components/Control/LateralNumericalControl/config.vue
#	src/views/visual/packages/components/Control/LateralNumericalControl/index.vue
#	src/views/visual/packages/components/Control/SwitchList/index.vue
#	src/views/visual/packages/components/Flowmeter/CircleFlowmeter/config.ts
#	src/views/visual/packages/components/Flowmeter/CircleFlowmeter/config.vue
#	src/views/visual/packages/components/Flowmeter/CircleFlowmeter/index.vue
#	src/views/visual/packages/components/Flowmeter/RectFlowmeter/config.ts
#	src/views/visual/packages/components/Flowmeter/RectFlowmeter/config.vue
#	src/views/visual/packages/components/Flowmeter/RectFlowmeter/index.vue
#	src/views/visual/packages/components/Instrument/HumidityComponent/config.vue
#	src/views/visual/packages/components/Instrument/HumidityComponent/index.vue
#	src/views/visual/packages/components/Instrument/HumidityComponent1/config.ts
#	src/views/visual/packages/components/Instrument/HumidityComponent1/config.vue
#	src/views/visual/packages/components/Instrument/HumidityComponent1/index.vue
#	src/views/visual/packages/components/Instrument/HumidityComponent3/config.ts
#	src/views/visual/packages/components/Instrument/HumidityComponent3/config.vue
#	src/views/visual/packages/components/Instrument/HumidityComponent3/index.vue
#	src/views/visual/packages/components/Instrument/InstrumentComponent1/config.vue
#	src/views/visual/packages/components/Instrument/InstrumentComponent1/index.vue
#	src/views/visual/packages/components/Instrument/InstrumentComponent2/config.ts
#	src/views/visual/packages/components/Instrument/InstrumentComponent2/config.vue
#	src/views/visual/packages/components/Instrument/InstrumentComponent2/index.vue
#	src/views/visual/packages/components/Other/SwitchSignalLight/config.ts
#	src/views/visual/packages/components/Other/SwitchSignalLight/config.vue
#	src/views/visual/packages/components/Other/SwitchSignalLight/index.vue
#	src/views/visual/packages/components/Other/SwitchStatus/config.ts
#	src/views/visual/packages/components/Other/SwitchStatus/index.vue
#	src/views/visual/packages/components/Text/ValueList1/index.vue
#	src/views/visual/packages/components/Text/ValueList2/index.vue
#	src/views/visual/palette/components/alarmTimeModal/config.ts
#	src/views/visual/palette/types/index.ts
    xp.Huang authored
     
    Browse Files »
  • Merge branch 'fix/device-things-model-send-command' into 'main_dev' ...
    6fdcb5ca 
    fix: 修复自定义TCP设备物模型界面下发命令不正确

See merge request yunteng/thingskit-front!904
    xp.Huang authored
     
    Browse Files »
  • fix: 修复自定义TCP设备物模型界面下发命令不正确
    0dc9a7e5
    ww authored
     
    Browse File »
  • Merge branch 'fix/rule-linkedge-fix' into 'main_dev' ...
    229a0fe3 
    fix: 修复场景联动字段必选项没填也新增起了

See merge request yunteng/thingskit-front!903
    xp.Huang authored
     
    Browse Files »
  • Merge branch 'fix/assign-device-auth' into 'main_dev' ...
    50ea3d04 
    fix: 修复分配设备未绑定权限

See merge request yunteng/thingskit-front!902
    xp.Huang authored
     
    Browse Files »
  • fix: 修复场景联动字段必选项没填也新增起了
    3ec7ac23
    loveumiko authored
     
    Browse Directory »
  • fix: 修复分配设备未绑定权限
    f020a137
    ww authored
     
    Browse Files »